joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

迁移 util

Browse Source
This commit is contained in:
tiger_zhou 2023-02-20 13:11:33 +08:00
parent 9dcaeba9ca
commit 822e908562
239 changed files with 491 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
common/src/main/java/club/joylink/constants/Client.java Normal file
View File

@ -0,0 +1,54 @@
package club.joylink.constants;
import club.joylink.exception.BusinessExceptionAssertEnum;
import lombok.Getter;
import org.springframework.util.StringUtils;
/**
* 客户端枚举
*/
@Getter
public enum Client {
Joylink("1", "joylink", "实训平台"),
Design("2", "design", "设计平台"),
Assistant("4", "linkassistant", "琏课堂助手"),
WeiAngU3d("5", "unitywa5", "Unity3D"),
Rate("6", "rate", "竞赛平台"),
Referee("7", "referee", "裁判平台"),
;
private String id;
private String secret;
private String name;
Client(String id, String secret, String name) {
this.id = id;
this.secret = secret;
this.name = name;
}
/**
* 根据客户端id查询客户端对象
*
* @param clientId
* @return
*/
public static Client getByIdAndSecret(String clientId, String secret) {
// 传入为空时，设置默认客户端
if (StringUtils.isEmpty(clientId) && StringUtils.isEmpty(secret)) {
return Client.Joylink;
}
Client[] values = Client.values();
for (Client value : values) {
if (value.getId().equals(clientId)
&& value.getSecret().equals(secret)) {
return value;
}
}
throw BusinessExceptionAssertEnum.INVALID_CLIENT.exception(String.format("未找到id为[%s]的客户端", clientId));
}
}

2
rtss/src/main/java/club/joylink/rtss/util/AESUtil.java → common/src/main/java/club/joylink/util/AESUtil.java
View File

@ -1,4 +1,4 @@
package club.joylink.rtss.util;
package club.joylink.util;
import javax.crypto.Cipher;
import javax.crypto.KeyGenerator;

2
rtss/src/main/java/club/joylink/rtss/util/DateTimeUtil.java → common/src/main/java/club/joylink/util/DateTimeUtil.java
View File

@ -1,4 +1,4 @@
package club.joylink.rtss.util;
package club.joylink.util;
import java.text.ParseException;
import java.text.SimpleDateFormat;

2
rtss/src/main/java/club/joylink/rtss/util/EncryptUtil.java → common/src/main/java/club/joylink/util/EncryptUtil.java
View File

@ -1,4 +1,4 @@
package club.joylink.rtss.util;
package club.joylink.util;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;

2
rtss/src/main/java/club/joylink/rtss/util/JsonUtils.java → common/src/main/java/club/joylink/util/JsonUtils.java
View File

@ -1,4 +1,4 @@
package club.joylink.rtss.util;
package club.joylink.util;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonProcessingException;

2
rtss/src/main/java/club/joylink/rtss/util/RandomGenerator.java → common/src/main/java/club/joylink/util/RandomGenerator.java
View File

@ -1,4 +1,4 @@
package club.joylink.rtss.util;
package club.joylink.util;
import java.util.Random;
import java.util.UUID;

2
rtss/src/main/java/club/joylink/rtss/util/ReflectionUtils.java → common/src/main/java/club/joylink/util/ReflectionUtils.java
View File

@ -1,4 +1,4 @@
package club.joylink.rtss.util;
package club.joylink.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

10
rtss/src/main/java/club/joylink/rtss/util/StorageGenerateUtil.java → common/src/main/java/club/joylink/util/StorageGenerateUtil.java
View File

@ -1,4 +1,5 @@
package club.joylink.rtss.util;
/*
package club.joylink.util;
import club.joylink.rtss.simulation.cbtc.Simulation;
import club.joylink.rtss.simulation.cbtc.data.SimulationDataRepository;
@ -28,13 +29,15 @@ public class StorageGenerateUtil {
generate(VirtualRealityTrain.class, "club.joylink.rtss.simulation.cbtc.data.storage.vr", "noCommunicateDevice");
}
/**
*/
/**
* 生成Storage类文件
*
* @param aClass 要生成文件的类
* @param packageName 生成的文件要放入的包
* @param startFieldName 从这个字段开始是要存的字段
*/
*//*
public static void generate(Class<?> aClass, String packageName, String startFieldName) {
String sourceClassName = aClass.getSimpleName();
String targetClassName = String.format("Storage%s", sourceClassName);
@ -241,3 +244,4 @@ public class StorageGenerateUtil {
}
}
}
*/

2
rtss/src/main/java/club/joylink/rtss/util/StrUtils.java → common/src/main/java/club/joylink/util/StrUtils.java
View File

@ -1,4 +1,4 @@
package club.joylink.rtss.util;
package club.joylink.util;
public class StrUtils {

2
rtss/src/main/java/club/joylink/rtss/util/VersionUtil.java → common/src/main/java/club/joylink/util/VersionUtil.java
View File

@ -1,4 +1,4 @@
package club.joylink.rtss.util;
package club.joylink.util;
import club.joylink.exception.BusinessExceptionAssertEnum;
import org.springframework.util.StringUtils;

4
rtss/src/main/java/club/joylink/rtss/util/VoiceFileUtils.java → common/src/main/java/club/joylink/util/VoiceFileUtils.java
View File

@ -1,7 +1,7 @@
package club.joylink.rtss.util;
package club.joylink.util;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.vo.CommonJsonResponse;
import club.joylink.vo.CommonJsonResponse;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;

2
rtss/src/main/java/club/joylink/rtss/util/jsonSerialize/Boolean2NumDeserializer.java → common/src/main/java/club/joylink/util/jsonSerialize/Boolean2NumDeserializer.java
View File

@ -1,4 +1,4 @@
package club.joylink.rtss.util.jsonSerialize;
package club.joylink.util.jsonSerialize;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;

2
rtss/src/main/java/club/joylink/rtss/util/jsonSerialize/Boolean2NumSerializer.java → common/src/main/java/club/joylink/util/jsonSerialize/Boolean2NumSerializer.java
View File

@ -1,4 +1,4 @@
package club.joylink.rtss.util.jsonSerialize;
package club.joylink.util.jsonSerialize;
import com.fasterxml.jackson.core.JsonGenerator;

110
common/src/main/java/club/joylink/vo/CommonJsonResponse.java Normal file
View File

@ -0,0 +1,110 @@
package club.joylink.vo;
import com.fasterxml.jackson.annotation.JsonView;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Objects;
@SuppressWarnings("serial")
@NoArgsConstructor
@JsonView(View.class)
public class CommonJsonResponse<T> implements Serializable {
private Integer code;
private String message;
private T data;
/**
* 构造一个没有数据的消息
*/
private CommonJsonResponse(ResponseConsts respConst) {
this.code = respConst.getCode();
this.message = respConst.getMsg();
}
/**
* 构造成功返回数据对象
*/
private CommonJsonResponse(T data) {
this.code = ResponseConsts.SUCCESS.getCode();
this.message = ResponseConsts.SUCCESS.getMsg();
this.data = data;
}
public CommonJsonResponse(int code, String msg) {
this.code = code;
this.message = msg;
}
/**
* 返回通用成功对象
*/
public static CommonJsonResponse newSuccessResponse() {
return new CommonJsonResponse(ResponseConsts.SUCCESS);
}
/**
* 成功返回数据对象
*/
public static <T> CommonJsonResponse<T> newSuccessResponse(T data) {
return new CommonJsonResponse<>(data);
}
/**
* 返回失败对象
*/
public static CommonJsonResponse newFaildResponse(ResponseConsts respConst) {
return new CommonJsonResponse(respConst);
}
/**
* 返回通用异常对象
*/
public static CommonJsonResponse newErrorResponse() {
return new CommonJsonResponse(ResponseConsts.ERROR);
}
public static CommonJsonResponse newErrorResponse(int code, String msg) {
return new CommonJsonResponse(code, msg);
}
public Integer getCode() {
return code;
}
public void setCode(Integer code) {
this.code = code;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public Object getData() {
return data;
}
public void setData(T data) {
this.data = data;
}
@Override
public String toString() {
return "CommonJsonResponse [code=" + code + ", message=" + message + ", data=" + data + "]";
}
public String toJSONString() {
if(Objects.isNull(data)) {
return "{\"code\":" + code + ", \"message\":\"" + message + "\"}";
} else {
return "{\"code\":" + code + ", \"message\":\"" + message + "\", \"data\":\"" + data + "\"}";
}
}
}

26
common/src/main/java/club/joylink/vo/ResponseConsts.java Normal file
View File

@ -0,0 +1,26 @@
package club.joylink.vo;
public enum ResponseConsts {
SUCCESS(200, "成功"),
FAILD(300, "失败"),
ERROR(500, "未知错误"),
VALIDATE_ERROR(501, "");
private ResponseConsts(Integer code, String msg) {
this.code = code;
this.msg = msg;
}
private Integer code;
private String msg;
public Integer getCode() {
return code;
}
public String getMsg() {
return msg;
}
}

4
common/src/main/java/club/joylink/vo/View.java Normal file
View File

@ -0,0 +1,4 @@
package club.joylink.vo;
public interface View {
}

11
ncc/pom.xml
View File

@ -11,11 +11,7 @@
<artifactId>ncc</artifactId>
<dependencies>
<dependency>
<groupId>club.joylink</groupId>
<artifactId>jl-ecs</artifactId>
<version>0.1</version>
</dependency>
<dependency>
<artifactId>common</artifactId>
<groupId>club.joylink</groupId>
@ -26,6 +22,11 @@
<artifactId>protobuf-java</artifactId>
<version>3.19.3</version>
</dependency>
<dependency>
<groupId>club.joylink</groupId>
<artifactId>jl-ecs</artifactId>
<version>0.1</version>
</dependency>
</dependencies>
<build>
<resources>

2
pom.xml
View File

@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<modules>
<module>rtss</module>
<module>ncc</module>
<module>rtss</module>
<module>common</module>
</modules>
<parent>

2
rtss/src/main/java/club/joylink/rtss/controller/SmsController.java
View File

@ -2,7 +2,7 @@ package club.joylink.rtss.controller;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.services.ISmsService;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.SmsResponse;
import club.joylink.rtss.vo.sms.SmsSendRecordVo;
import club.joylink.rtss.vo.sms.ZzjAlertSmsParamVo;

2
rtss/src/main/java/club/joylink/rtss/controller/user/UserController.java
View File

@ -6,7 +6,7 @@ import club.joylink.rtss.services.ISysUserService;
import club.joylink.rtss.services.local.UserGenerateService;
import club.joylink.rtss.services.permission.OldPermissionDataSyncService;
import club.joylink.rtss.services.student.IDepartUserStatisticService;
import club.joylink.rtss.util.VoiceFileUtils;
import club.joylink.util.VoiceFileUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.LoginUserInfoVO;
import club.joylink.rtss.vo.UserQueryVO;

18
rtss/src/main/java/club/joylink/rtss/entity/SysAccountLogin.java
View File

@ -1,9 +1,11 @@
package club.joylink.rtss.entity;
import club.joylink.rtss.vo.LoginUserInfoVO;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Objects;
/**
* @author
@ -39,4 +41,18 @@ public class SysAccountLogin implements Serializable {
private LocalDateTime loginTime;
private static final long serialVersionUID = 1L;
}
/*public static SysAccountLogin convert2DB(LoginUserInfoVO loginUserInfoVO) {
SysAccountLogin accountLogin = new SysAccountLogin();
accountLogin.setUserId(loginUserInfoVO.getAccountVO().getId());
accountLogin.setClient(loginUserInfoVO.getClient().getName());
accountLogin.setProject(loginUserInfoVO.getProject());
if (Objects.nonNull(loginUserInfoVO.deviceVO)) {
accountLogin.setDevice(String.format("%s-%s-%s",
loginUserInfoVO.deviceVO.getProject(), loginUserInfoVO.deviceVO.getType(), loginUserInfoVO.deviceVO.getCode()));
}
accountLogin.setLoginTime(this.getLoginTime());
return accountLogin;
}*/
}

2
rtss/src/main/java/club/joylink/rtss/services/DraftMapService.java
View File

@ -8,7 +8,7 @@ import club.joylink.rtss.services.draftData.*;
import club.joylink.rtss.simulation.cbtc.build.SimulationBuilder;
import club.joylink.rtss.simulation.cbtc.data.CalculateService;
import club.joylink.rtss.simulation.cbtc.data.map.Section;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.client.PageQueryVO;
import club.joylink.rtss.vo.client.PageVO;

2
rtss/src/main/java/club/joylink/rtss/services/LessonService.java
View File

@ -10,7 +10,7 @@ import club.joylink.rtss.services.org.IOrgLessonService;
import club.joylink.rtss.services.org.IOrgService;
import club.joylink.rtss.services.training.ITrainingV1Service;
import club.joylink.rtss.simulation.cbtc.GroupSimulationService;
import club.joylink.rtss.util.VersionUtil;
import club.joylink.util.VersionUtil;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.LoginUserInfoVO;
import club.joylink.rtss.vo.client.*;

2
rtss/src/main/java/club/joylink/rtss/services/MapGroupService.java
View File

@ -5,7 +5,7 @@ import club.joylink.rtss.dao.MapGroupDAO;
import club.joylink.rtss.entity.MapGroup;
import club.joylink.rtss.entity.MapGroupExample;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.client.ReleaseVO;

4
rtss/src/main/java/club/joylink/rtss/services/MapService.java
View File

@ -18,8 +18,8 @@ import club.joylink.rtss.simulation.cbtc.GroupSimulationService;
import club.joylink.rtss.simulation.cbtc.Simulation;
import club.joylink.rtss.simulation.cbtc.build.SimulationBuildParams;
import club.joylink.rtss.simulation.cbtc.build.SimulationBuilder;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.rtss.util.VersionUtil;
import club.joylink.util.JsonUtils;
import club.joylink.util.VersionUtil;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.LoginUserInfoVO;
import club.joylink.rtss.vo.client.*;

2
rtss/src/main/java/club/joylink/rtss/services/RealLineService.java
View File

@ -4,7 +4,7 @@ import club.joylink.rtss.dao.RealLineDAO;
import club.joylink.rtss.entity.RealLine;
import club.joylink.rtss.entity.RealLineExample;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.client.map.RealLineListVO;

2
rtss/src/main/java/club/joylink/rtss/services/ReleaseService.java
View File

@ -7,7 +7,7 @@ import club.joylink.rtss.entity.*;
import club.joylink.rtss.entity.training2.PublishedTraining2Example;
import club.joylink.rtss.entity.training2.PublishedTraining2WithBLOBs;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.util.VersionUtil;
import club.joylink.util.VersionUtil;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.client.ReleaseConfigVO;
import club.joylink.rtss.vo.client.ReleaseVO;

2
rtss/src/main/java/club/joylink/rtss/services/RunPlanDraftService.java
View File

@ -14,7 +14,7 @@ import club.joylink.rtss.services.runplan.importReal.IRunPlanStrategyNew;
import club.joylink.rtss.services.runplan.importReal.RunPlanImportStrategyEnum;
import club.joylink.rtss.simulation.cbtc.GroupSimulationService;
import club.joylink.rtss.simulation.cbtc.constant.SimulationConstants;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.LoginUserInfoVO;
import club.joylink.rtss.vo.client.PageVO;

4
rtss/src/main/java/club/joylink/rtss/services/RunPlanTemplateService.java
View File

@ -10,8 +10,8 @@ import club.joylink.rtss.entity.*;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.services.cache.ICacheService;
import club.joylink.rtss.services.simulation.SchedulingService;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.rtss.util.VersionUtil;
import club.joylink.util.JsonUtils;
import club.joylink.util.VersionUtil;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.client.runplan.*;

4
rtss/src/main/java/club/joylink/rtss/services/SysUserService.java
View File

@ -12,8 +12,8 @@ import club.joylink.rtss.services.cache.ICacheService;
import club.joylink.rtss.services.org.IOrgProjectService;
import club.joylink.rtss.services.org.IOrgService;
import club.joylink.rtss.services.org.IOrgUserService;
import club.joylink.rtss.util.EncryptUtil;
import club.joylink.rtss.util.RandomGenerator;
import club.joylink.util.EncryptUtil;
import club.joylink.util.RandomGenerator;
import club.joylink.rtss.vo.*;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.client.org.OrgVO;

6
rtss/src/main/java/club/joylink/rtss/services/TcSmsService.java
View File

@ -3,9 +3,9 @@ package club.joylink.rtss.services;
import club.joylink.rtss.configuration.configProp.TencentCloudConfig;
import club.joylink.rtss.constants.TencentSMSTemplate;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.util.EncryptUtil;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.rtss.util.RandomGenerator;
import club.joylink.util.EncryptUtil;
import club.joylink.util.JsonUtils;
import club.joylink.util.RandomGenerator;
import club.joylink.rtss.vo.InternationalMobile;
import club.joylink.rtss.vo.SmsResponse;
import club.joylink.rtss.vo.tc.TcMultiSmsReq;

2
rtss/src/main/java/club/joylink/rtss/services/auth/AuthenticateService.java
View File

@ -13,7 +13,7 @@ import club.joylink.rtss.services.project.ProjectService;
import club.joylink.rtss.services.simulation.ProjectSimulationService;
import club.joylink.rtss.simulation.cbtc.ProjectJointSimulationService;
import club.joylink.rtss.simulation.cbtc.Simulation;
import club.joylink.rtss.util.RandomGenerator;
import club.joylink.util.RandomGenerator;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.LoginUserInfoVO;
import club.joylink.rtss.vo.client.LoginStatusVO;

2
rtss/src/main/java/club/joylink/rtss/services/completition/CompetitionPracticalService.java
View File

@ -27,7 +27,7 @@ import club.joylink.rtss.simulation.cbtc.exception.SimulationException;
import club.joylink.rtss.simulation.cbtc.exception.SimulationExceptionType;
import club.joylink.rtss.simulation.cbtc.script.ScriptActionBO;
import club.joylink.rtss.simulation.cbtc.script.ScriptBO;
import club.joylink.rtss.util.VoiceFileUtils;
import club.joylink.util.VoiceFileUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.LoginUserInfoVO;
import club.joylink.rtss.vo.client.PageVO;

2
rtss/src/main/java/club/joylink/rtss/services/completition/CompetitionUserLikeManager.java
View File

@ -3,7 +3,7 @@ package club.joylink.rtss.services.completition;
import club.joylink.rtss.dao.RaceQuestionMocksLikesDAO;
import club.joylink.rtss.entity.RaceQuestionMocksLikes;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.client.competition.CompetitionUserLikesVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

2
rtss/src/main/java/club/joylink/rtss/services/completition/RaceTheoryService.java
View File

@ -9,7 +9,7 @@ import club.joylink.rtss.entity.RaceResultExample;
import club.joylink.rtss.entity.project.Project;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.services.completition.question.IQuestionBankService;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.client.competition.ProjectTheoryAnswerVO;
import club.joylink.rtss.vo.client.competition.RaceQuestionProgressVO;

2
rtss/src/main/java/club/joylink/rtss/services/draftData/DraftMapCiDataGeneratorImpl.java
View File

@ -9,7 +9,7 @@ import club.joylink.rtss.simulation.cbtc.data.map.*;
import club.joylink.rtss.simulation.cbtc.data.support.RoutePath;
import club.joylink.rtss.simulation.cbtc.exception.SimulationException;
import club.joylink.rtss.simulation.cbtc.exception.SimulationExceptionType;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.map.CiGenerateResultVO;
import club.joylink.rtss.vo.map.MapCiGenerateConfig;
import club.joylink.rtss.vo.map.MapRoutingSectionNewVO;

2
rtss/src/main/java/club/joylink/rtss/services/draftData/DraftMapDataHandleServiceImpl.java
View File

@ -13,7 +13,7 @@ import club.joylink.rtss.simulation.cbtc.constant.SignalModel;
import club.joylink.rtss.simulation.cbtc.data.map.*;
import club.joylink.rtss.simulation.rt.repo.CommonRepository;
import club.joylink.rtss.simulation.rt.repo.CommonRepositoryBuilder;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.map.*;
import club.joylink.rtss.vo.map.graph.MapSectionNewVO;
import club.joylink.rtss.vo.map.graph.MapSignalNewVO;

2
rtss/src/main/java/club/joylink/rtss/services/draftData/DraftMapDisStationService.java
View File

@ -5,7 +5,7 @@ import club.joylink.rtss.dao.DraftMapDisStationDAO;
import club.joylink.rtss.entity.DraftMapDisStation;
import club.joylink.rtss.entity.DraftMapDisStationExample;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.map.logic.MapDisStationNewVO;
import club.joylink.rtss.vo.paper.PaperUserInfoVo;

2
rtss/src/main/java/club/joylink/rtss/services/draftData/DraftMapServiceImpl.java
View File

@ -2,7 +2,7 @@ package club.joylink.rtss.services.draftData;
import club.joylink.rtss.dao.*;
import club.joylink.rtss.entity.*;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.map.MapLogicDataNewVO;
import club.joylink.rtss.vo.map.MapVO;
import club.joylink.rtss.vo.map.logic.*;

2
rtss/src/main/java/club/joylink/rtss/services/draftData/ParkTimeService.java
View File

@ -6,7 +6,7 @@ import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.simulation.cbtc.build.SimulationBuilder;
import club.joylink.rtss.simulation.cbtc.data.map.MapElement;
import club.joylink.rtss.simulation.cbtc.data.map.Section;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.map.logic.MapStationParkingTimeVO;
import club.joylink.rtss.vo.map.MapVO;
import lombok.extern.slf4j.Slf4j;

2
rtss/src/main/java/club/joylink/rtss/services/file/FileBindingService.java
View File

@ -4,7 +4,7 @@ import club.joylink.rtss.dao.FileBindingDAO;
import club.joylink.rtss.entity.FileBinding;
import club.joylink.rtss.entity.FileBindingExample;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.client.file.FileBindingVO;
import club.joylink.rtss.vo.client.file.FileQueryVO;

2
rtss/src/main/java/club/joylink/rtss/services/license/LicenseServiceImpl.java
View File

@ -5,7 +5,7 @@ import club.joylink.rtss.dao.LicenseDAO;
import club.joylink.rtss.entity.License;
import club.joylink.rtss.entity.LicenseExample;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.util.AESUtil;
import club.joylink.util.AESUtil;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.license.LicenseQueryVO;
import club.joylink.rtss.vo.license.LicenseVO;

2
rtss/src/main/java/club/joylink/rtss/services/local/UserGenerateServiceImpl.java
View File

@ -10,7 +10,7 @@ import club.joylink.rtss.entity.SysAccount;
import club.joylink.rtss.entity.SysAccountExample;
import club.joylink.rtss.services.IPermissionService;
import club.joylink.rtss.services.IUserPermissionService;
import club.joylink.rtss.util.EncryptUtil;
import club.joylink.util.EncryptUtil;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.user.UserGenerateConfigVO;
import org.springframework.beans.factory.annotation.Autowired;

2
rtss/src/main/java/club/joylink/rtss/services/notice/SystemNoticeService.java
View File

@ -9,7 +9,7 @@ import club.joylink.rtss.entity.UserSysnoticeUnread;
import club.joylink.rtss.entity.UserSysnoticeUnreadExample;
import club.joylink.rtss.services.EmailService;
import club.joylink.rtss.services.ISysUserService;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.client.notice.SysNoticePageQueryVO;

2
rtss/src/main/java/club/joylink/rtss/services/paper/PaperUserCreateService.java
View File

@ -10,7 +10,7 @@ import club.joylink.rtss.entity.training2.PublishedTraining2Example;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.exception.PaperExceptionAssert;
import club.joylink.rtss.services.training2.Training2PublishService;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.client.pager.question.QuestionQueryVO;
import club.joylink.rtss.vo.paper.*;

2
rtss/src/main/java/club/joylink/rtss/services/paper/PaperUserLoadQuestionService.java
View File

@ -8,7 +8,7 @@ import club.joylink.rtss.entity.paper.PaperUserQuestionExample;
import club.joylink.rtss.entity.paper.question.PaperQuestionWithBLOBs;
import club.joylink.rtss.entity.training2.PublishedTraining2;
import club.joylink.rtss.entity.training2.PublishedTraining2Example;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.paper.PaperCommonQuestionVo;
import club.joylink.rtss.vo.paper.PaperQType;

2
rtss/src/main/java/club/joylink/rtss/services/paper/PaperUserService.java
View File

@ -11,7 +11,7 @@ import club.joylink.rtss.entity.training2.PublishedTraining2Example;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.exception.PaperExceptionAssert;
import club.joylink.rtss.services.training2.Training2PublishService;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.paper.*;
import club.joylink.rtss.vo.paper.convertor.PaperCompositionConvertor;

2
rtss/src/main/java/club/joylink/rtss/services/paper/PaperUserSubmitAnswerService.java
View File

@ -13,7 +13,7 @@ import club.joylink.rtss.entity.paper.question.PaperQuestionExample;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.exception.PaperExceptionAssert;
import club.joylink.rtss.services.training2.Training2PublishService;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.client.training2.ScoringRuleVO;
import club.joylink.rtss.vo.client.training2.Step2VO;

2
rtss/src/main/java/club/joylink/rtss/services/pay/wechat/WechatPayService.java
View File

@ -10,7 +10,7 @@ import club.joylink.rtss.services.*;
import club.joylink.rtss.services.pay.bean.OrderPay;
import club.joylink.rtss.services.pay.wechat.bean.WxUnifiedOrder;
import club.joylink.rtss.services.project.ProjectService;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.client.goods.GoodsVO;
import club.joylink.rtss.vo.client.order.OrderDetailVO;

2
rtss/src/main/java/club/joylink/rtss/services/pay/wechat/util/SignUtil.java
View File

@ -1,6 +1,6 @@
package club.joylink.rtss.services.pay.wechat.util;
import club.joylink.rtss.util.EncryptUtil;
import club.joylink.util.EncryptUtil;
import java.util.Arrays;
import java.util.Map;

2
rtss/src/main/java/club/joylink/rtss/services/project/DeviceServiceImpl.java
View File

@ -7,7 +7,7 @@ import club.joylink.rtss.entity.ProjectDevice;
import club.joylink.rtss.entity.ProjectDeviceExample;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.services.IMapService;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.LoginUserInfoVO;
import club.joylink.rtss.vo.client.PageVO;

4
rtss/src/main/java/club/joylink/rtss/services/publishData/FuZhouLineOne1PassengerFlowDataServiceImpl.java
View File

@ -17,8 +17,8 @@ import club.joylink.rtss.simulation.cbtc.data.map.Station;
import club.joylink.rtss.simulation.cbtc.passenger.data.PassengerFlowData;
import club.joylink.rtss.simulation.cbtc.passenger.data.StandTimePassengerFlowData;
import club.joylink.rtss.simulation.cbtc.passenger.data.TripStationPassengerFlowData;
import club.joylink.rtss.util.DateTimeUtil;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.DateTimeUtil;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.client.passenger.MapPassengerFlowVO;
import club.joylink.rtss.vo.map.MapVO;
import lombok.Getter;

4
rtss/src/main/java/club/joylink/rtss/services/publishData/PublishMapDataHandler.java
View File

@ -12,8 +12,8 @@ import club.joylink.rtss.services.cache.ICacheService;
import club.joylink.rtss.simulation.cbtc.constant.SignalAspect;
import club.joylink.rtss.simulation.cbtc.constant.SignalModel;
import club.joylink.rtss.simulation.cbtc.data.map.Signal;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.rtss.util.VersionUtil;
import club.joylink.util.JsonUtils;
import club.joylink.util.VersionUtil;
import club.joylink.rtss.vo.map.MapCheckConfig;
import club.joylink.rtss.vo.map.MapGraphDataNewVO;
import club.joylink.rtss.vo.map.MapLogicDataNewVO;

2
rtss/src/main/java/club/joylink/rtss/services/rpTools/RunPlanToolsServiceImpl.java
View File

@ -3,7 +3,7 @@ package club.joylink.rtss.services.rpTools;
import club.joylink.rtss.dao.*;
import club.joylink.rtss.entity.*;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.client.rpTools.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

2
rtss/src/main/java/club/joylink/rtss/services/runplan/RunPlanRoutingService.java
View File

@ -13,7 +13,7 @@ import club.joylink.rtss.simulation.cbtc.data.CalculateService;
import club.joylink.rtss.simulation.cbtc.data.map.MapElement;
import club.joylink.rtss.simulation.cbtc.data.map.Section;
import club.joylink.rtss.simulation.cbtc.exception.SimulationException;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.client.runplan.RunPlanTripVO;

2
rtss/src/main/java/club/joylink/rtss/services/runplan/RunPlanUserConfigService.java
View File

@ -3,7 +3,7 @@ package club.joylink.rtss.services.runplan;
import club.joylink.rtss.dao.RunPlanUserConfigDAO;
import club.joylink.rtss.entity.RunPlanUserConfig;
import club.joylink.rtss.entity.RunPlanUserConfigExample;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.client.runplan.user.RunPlanUserConfigVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

2
rtss/src/main/java/club/joylink/rtss/services/thridAccount/ThirdAccountDataSyncService.java
View File

@ -6,7 +6,7 @@ import club.joylink.rtss.event.UserExamRecordEvent;
import club.joylink.rtss.event.UserSimulationRecordEvent;
import club.joylink.rtss.services.ISysUserService;
import club.joylink.rtss.services.LoginSessionManager;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.LoginUserInfoVO;
import club.joylink.rtss.vo.thirdAccount.ThirdInterfaceConfig;

2
rtss/src/main/java/club/joylink/rtss/services/training/TrainingV1Service.java
View File

@ -16,7 +16,7 @@ import club.joylink.rtss.simulation.cbtc.data.map.*;
import club.joylink.rtss.simulation.cbtc.data.storage.StorageSimulation;
import club.joylink.rtss.simulation.cbtc.member.MemberManager;
import club.joylink.rtss.simulation.cbtc.member.SimulationMember;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.client.training.*;

2
rtss/src/main/java/club/joylink/rtss/services/training/generatornew/GeneratorNew.java
View File

@ -7,7 +7,7 @@ import club.joylink.rtss.services.training.data.GenerateConfig;
import club.joylink.rtss.simulation.cbtc.Simulation;
import club.joylink.rtss.simulation.cbtc.data.map.*;
import club.joylink.rtss.simulation.cbtc.data.storage.StorageSimulation;
import club.joylink.rtss.util.ReflectionUtils;
import club.joylink.util.ReflectionUtils;
import club.joylink.rtss.vo.client.training.TrainingNewVO;
import club.joylink.rtss.vo.client.training.TrainingStepVO;
import club.joylink.rtss.vo.client.training.definition.OperateDefinitionVO;

2
rtss/src/main/java/club/joylink/rtss/services/training2/Training2DraftProgressService.java
View File

@ -12,7 +12,7 @@ import club.joylink.rtss.simulation.cbtc.data.storage.StorageSimulation;
import club.joylink.rtss.simulation.cbtc.exception.SimulationException;
import club.joylink.rtss.simulation.cbtc.exception.SimulationExceptionType;
import club.joylink.rtss.simulation.cbtc.member.SimulationMemberPO;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.client.simulationv1.SimulationMemberVO;

4
rtss/src/main/java/club/joylink/rtss/services/training2/Training2DraftService.java
View File

@ -4,7 +4,7 @@ import club.joylink.rtss.dao.DraftTraining2DAO;
import club.joylink.rtss.entity.training2.DraftTraining2;
import club.joylink.rtss.entity.training2.DraftTraining2Example;
import club.joylink.rtss.entity.training2.DraftTraining2WithBLOBs;
import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.simulation.cbtc.GroupSimulationService;
import club.joylink.rtss.simulation.cbtc.Simulation;
import club.joylink.rtss.simulation.cbtc.SimulationService;
@ -13,7 +13,7 @@ import club.joylink.rtss.simulation.cbtc.exception.SimulationException;
import club.joylink.rtss.simulation.cbtc.exception.SimulationExceptionType;
import club.joylink.rtss.simulation.cbtc.member.SimulationMemberPO;
import club.joylink.rtss.simulation.cbtc.training2.Training2;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.client.simulationv1.SimulationMemberVO;

2
rtss/src/main/java/club/joylink/rtss/services/training2/Training2PublishService.java
View File

@ -8,7 +8,7 @@ import club.joylink.rtss.entity.training2.PublishedTraining2;
import club.joylink.rtss.entity.training2.PublishedTraining2Example;
import club.joylink.rtss.entity.training2.PublishedTraining2WithBLOBs;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.client.PageVO;
import club.joylink.rtss.vo.paper.PaperQType;
import club.joylink.rtss.vo.training2.publish.*;

4
rtss/src/main/java/club/joylink/rtss/services/training2/Training2Service.java
View File

@ -29,8 +29,8 @@ import club.joylink.rtss.simulation.cbtc.training2.ScoringRule2;
import club.joylink.rtss.simulation.cbtc.training2.Step2;
import club.joylink.rtss.simulation.cbtc.training2.Training2;
import club.joylink.rtss.simulation.cbtc.training2.index.Index;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.rtss.util.StrUtils;
import club.joylink.util.JsonUtils;
import club.joylink.util.StrUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.LoginUserInfoVO;
import club.joylink.rtss.vo.client.SocketMessageVO;

2
rtss/src/main/java/club/joylink/rtss/services/voice/baidu/AsrService.java
View File

@ -1,6 +1,6 @@
package club.joylink.rtss.services.voice.baidu;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import org.springframework.stereotype.Component;
import java.io.File;

2
rtss/src/main/java/club/joylink/rtss/services/voice/baidu/BaiduVoiceServiceImpl.java
View File

@ -2,7 +2,7 @@ package club.joylink.rtss.services.voice.baidu;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.services.voice.IVoiceService;
import club.joylink.rtss.util.VoiceFileUtils;
import club.joylink.util.VoiceFileUtils;
import club.joylink.rtss.vo.client.voice.VoiceRecognitionResult;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

2
rtss/src/main/java/club/joylink/rtss/services/voice/baidu/TokenHolder.java
View File

@ -1,6 +1,6 @@
package club.joylink.rtss.services.voice.baidu;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import lombok.extern.slf4j.Slf4j;
import java.io.IOException;

2
rtss/src/main/java/club/joylink/rtss/services/voice/baidu/VoiceAsrResult.java
View File

@ -1,6 +1,6 @@
package club.joylink.rtss.services.voice.baidu;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import lombok.Getter;
import lombok.Setter;

2
rtss/src/main/java/club/joylink/rtss/services/voice/xunfei/WebIATWS.java
View File

@ -1,7 +1,7 @@
package club.joylink.rtss.services.voice.xunfei;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;

2
rtss/src/main/java/club/joylink/rtss/services/voice/xunfei/XunFeiVoiceService.java
View File

@ -2,7 +2,7 @@ package club.joylink.rtss.services.voice.xunfei;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.services.voice.IVoiceService;
import club.joylink.rtss.util.VoiceFileUtils;
import club.joylink.util.VoiceFileUtils;
import club.joylink.rtss.vo.client.voice.VoiceRecognitionResult;
import okhttp3.OkHttpClient;
import okhttp3.Request;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/AtsApiServiceImpl.java
View File

@ -6,7 +6,7 @@ import club.joylink.rtss.simulation.cbtc.Simulation;
import club.joylink.rtss.simulation.cbtc.build.RunPlanBuilder;
import club.joylink.rtss.simulation.cbtc.data.plan.TripPlan;
import club.joylink.rtss.simulation.cbtc.event.SimulationTripPlanChangeEvent;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.client.runplan.RunPlanServiceConfigVO;
import club.joylink.rtss.vo.client.runplan.RunPlanTripConfigVO;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/OperateMethod.java
View File

@ -2,7 +2,7 @@ package club.joylink.rtss.simulation.cbtc.ATS.operation;
import club.joylink.rtss.simulation.cbtc.Simulation;
import club.joylink.rtss.simulation.cbtc.member.SimulationMember;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import lombok.Getter;
import lombok.Setter;
import org.springframework.util.ReflectionUtils;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/TrainPositionService.java
View File

@ -1,7 +1,7 @@
package club.joylink.rtss.simulation.cbtc.ATS.service;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.client.SocketMessageVO;
import club.joylink.rtss.vo.client.WebSocketMessageType;
import club.joylink.rtss.vo.client.factory.SocketMessageFactory;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/CI/device/CiRouteService.java
View File

@ -1,6 +1,6 @@
package club.joylink.rtss.simulation.cbtc.CI.device;
import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.simulation.cbtc.Simulation;
import club.joylink.rtss.simulation.cbtc.constant.SignalAspect;
import club.joylink.rtss.simulation.cbtc.constant.SimulationConstants;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/service/RailTicketService.java
View File

@ -5,7 +5,7 @@ import club.joylink.rtss.simulation.cbtc.CTC.data.CtcRepository;
import club.joylink.rtss.simulation.cbtc.CTC.data.Ticket;
import club.joylink.rtss.simulation.cbtc.Simulation;
import club.joylink.rtss.simulation.cbtc.member.SimulationMember;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.client.SocketMessageVO;
import club.joylink.rtss.vo.client.factory.SocketMessageFactory;
import club.joylink.rtss.websocket.StompMessageService;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/GroupSimulationServiceImpl.java
View File

@ -53,7 +53,7 @@ import club.joylink.rtss.simulation.cbtc.member.SimulationUser;
import club.joylink.rtss.simulation.cbtc.passenger.PassengerFlowSimulateService;
import club.joylink.rtss.simulation.cbtc.script.ScriptBO;
import club.joylink.rtss.simulation.cbtc.vo.SimulationWorkParamVO;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.LoginUserInfoVO;
import club.joylink.rtss.vo.client.*;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/build/SimulationBuilder.java
View File

@ -18,7 +18,7 @@ import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityAudio;
import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityDevice;
import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityIbp;
import club.joylink.rtss.simulation.cbtc.member.SimulationMember;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.client.ibp.IbpData;
import club.joylink.rtss.vo.client.iscs.device.IscsDeviceVO;
import club.joylink.rtss.vo.client.iscs.systemRes.IscsSystemResourcesVO;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/command/Command.java
View File

@ -2,7 +2,7 @@ package club.joylink.rtss.simulation.cbtc.command;
import club.joylink.rtss.simulation.cbtc.ATS.operation.Operation;
import club.joylink.rtss.simulation.cbtc.member.SimulationMember;
import club.joylink.rtss.util.RandomGenerator;
import club.joylink.util.RandomGenerator;
import lombok.Getter;
import lombok.Setter;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/command/VoiceCommandBO.java
View File

@ -5,7 +5,7 @@ import club.joylink.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.simulation.cbtc.Simulation;
import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityTrain;
import club.joylink.rtss.simulation.cbtc.member.SimulationMember;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/communication/vo/TrainHmiDisplay.java
View File

@ -5,7 +5,7 @@ import club.joylink.rtss.simulation.cbtc.constant.RunLevel;
import club.joylink.rtss.simulation.cbtc.constant.TrainTBControl;
import club.joylink.rtss.simulation.cbtc.data.support.MovementAuthority;
import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityTrain;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumSerializer;
import club.joylink.util.jsonSerialize.Boolean2NumSerializer;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Getter;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/communication/vo/TrainLoadDestroy.java
View File

@ -5,7 +5,7 @@ import club.joylink.rtss.simulation.cbtc.data.map.MapElement;
import club.joylink.rtss.simulation.cbtc.data.map.Section;
import club.joylink.rtss.simulation.cbtc.data.support.SectionPosition;
import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityTrain;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumSerializer;
import club.joylink.util.jsonSerialize.Boolean2NumSerializer;
import lombok.Getter;
/**

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/communication/vo/TrainPosition.java
View File

@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import club.joylink.rtss.simulation.cbtc.data.map.Section;
import club.joylink.rtss.simulation.cbtc.data.support.SectionPosition;
import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityTrain;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumSerializer;
import club.joylink.util.jsonSerialize.Boolean2NumSerializer;
import lombok.Getter;
@Getter

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/communication/vo/TrainSpeed.java
View File

@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import club.joylink.rtss.simulation.cbtc.data.map.Section;
import club.joylink.rtss.simulation.cbtc.data.support.SectionPosition;
import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityTrain;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumSerializer;
import club.joylink.util.jsonSerialize.Boolean2NumSerializer;
import lombok.Getter;
import java.util.Objects;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/competition/CompetitionAndScriptManager.java
View File

@ -21,7 +21,7 @@ import club.joylink.rtss.simulation.cbtc.exception.SimulationExceptionType;
import club.joylink.rtss.simulation.cbtc.member.SimulationMember;
import club.joylink.rtss.simulation.cbtc.script.ScriptActionBO;
import club.joylink.rtss.simulation.cbtc.script.ScriptBO;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.client.competition.OperationIndexStatistic;
import club.joylink.rtss.vo.client.competition.OperationStatisticVO;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/competition/CompetitionBO.java
View File

@ -3,7 +3,7 @@ package club.joylink.rtss.simulation.cbtc.competition;
import club.joylink.rtss.constants.Client;
import club.joylink.rtss.entity.CompetitionWithBLOBs;
import club.joylink.rtss.simulation.cbtc.script.ScriptBO;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import club.joylink.rtss.vo.client.competition.*;
import lombok.Getter;
import org.springframework.util.CollectionUtils;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/competition/ScriptExecuteService.java
View File

@ -19,7 +19,7 @@ import club.joylink.rtss.simulation.cbtc.exception.SimulationExceptionType;
import club.joylink.rtss.simulation.cbtc.member.SimulationMember;
import club.joylink.rtss.simulation.cbtc.script.ScriptActionBO;
import club.joylink.rtss.simulation.cbtc.script.ScriptBO;
import club.joylink.rtss.util.StrUtils;
import club.joylink.util.StrUtils;
import club.joylink.rtss.vo.client.voice.BaseVoiceSynthesisVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/data/SimulationDataRepository.java
View File

@ -22,7 +22,7 @@ import club.joylink.rtss.simulation.cbtc.data.vr.*;
import club.joylink.rtss.simulation.cbtc.depot.DepotService;
import club.joylink.rtss.simulation.cbtc.exception.SimulationException;
import club.joylink.rtss.simulation.cbtc.exception.SimulationExceptionType;
import club.joylink.rtss.util.StrUtils;
import club.joylink.util.StrUtils;
import club.joylink.rtss.vo.client.iscs.device.IscsDeviceVO;
import club.joylink.rtss.vo.client.psl.PslStatus;
import club.joylink.rtss.vo.client.runplan.RunPlanTripVO;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Route.java
View File

@ -8,7 +8,7 @@ import club.joylink.rtss.simulation.cbtc.exception.SimulationException;
import club.joylink.rtss.simulation.cbtc.exception.SimulationExceptionType;
import club.joylink.rtss.simulation.cbtc.training2.ecm.anno.ExpConditionMaterialAnno;
import club.joylink.rtss.simulation.cbtc.training2.ecm.anno.ExpConditionMaterialSrcAnno;
import club.joylink.rtss.util.JsonUtils;
import club.joylink.util.JsonUtils;
import lombok.Getter;
import lombok.Setter;
import org.springframework.util.CollectionUtils;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/data/plan/RealRun.java
View File

@ -1,6 +1,6 @@
package club.joylink.rtss.simulation.cbtc.data.plan;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumSerializer;
import club.joylink.util.jsonSerialize.Boolean2NumSerializer;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Builder;
import lombok.Getter;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/CatenaryStatus.java
View File

@ -5,7 +5,7 @@ import club.joylink.rtss.simulation.cbtc.data.map.Catenary;
import club.joylink.rtss.simulation.cbtc.data.map.MapElement;
import club.joylink.rtss.simulation.cbtc.data.vo.CatenaryStatusVO;
import club.joylink.rtss.simulation.cbtc.data.vo.DeviceStatusVO;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumSerializer;
import club.joylink.util.jsonSerialize.Boolean2NumSerializer;
import lombok.Getter;
/**

4
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/CycleStatus.java
View File

@ -6,8 +6,8 @@ import club.joylink.rtss.simulation.cbtc.data.map.Cycle;
import club.joylink.rtss.simulation.cbtc.data.map.MapElement;
import club.joylink.rtss.simulation.cbtc.data.vo.CycleStatusVO;
import club.joylink.rtss.simulation.cbtc.data.vo.DeviceStatusVO;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumDeserializer;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumSerializer;
import club.joylink.util.jsonSerialize.Boolean2NumDeserializer;
import club.joylink.util.jsonSerialize.Boolean2NumSerializer;
import lombok.Getter;
import java.util.Objects;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/OnboardPisStatus.java
View File

@ -2,7 +2,7 @@ package club.joylink.rtss.simulation.cbtc.data.status;
import club.joylink.rtss.simulation.Watchable;
import club.joylink.rtss.simulation.cbtc.data.info.OnboardPis;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumSerializer;
import club.joylink.util.jsonSerialize.Boolean2NumSerializer;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Getter;
import lombok.NoArgsConstructor;

4
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/PSDStatus.java
View File

@ -4,8 +4,8 @@ import club.joylink.rtss.simulation.cbtc.data.map.MapElement;
import club.joylink.rtss.simulation.cbtc.data.map.PSD;
import club.joylink.rtss.simulation.cbtc.data.vo.DeviceStatusVO;
import club.joylink.rtss.simulation.cbtc.data.vo.PSDStatusVO;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumDeserializer;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumSerializer;
import club.joylink.util.jsonSerialize.Boolean2NumDeserializer;
import club.joylink.util.jsonSerialize.Boolean2NumSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Getter;

4
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/RouteStatus.java
View File

@ -4,8 +4,8 @@ import club.joylink.rtss.simulation.cbtc.data.map.MapElement;
import club.joylink.rtss.simulation.cbtc.data.map.Route;
import club.joylink.rtss.simulation.cbtc.data.vo.DeviceStatusVO;
import club.joylink.rtss.simulation.cbtc.data.vo.RouteStatusVO;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumDeserializer;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumSerializer;
import club.joylink.util.jsonSerialize.Boolean2NumDeserializer;
import club.joylink.util.jsonSerialize.Boolean2NumSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Getter;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SectionStatus.java
View File

@ -4,7 +4,7 @@ import club.joylink.rtss.simulation.cbtc.data.map.MapElement;
import club.joylink.rtss.simulation.cbtc.data.map.Section;
import club.joylink.rtss.simulation.cbtc.data.vo.DeviceStatusVO;
import club.joylink.rtss.simulation.cbtc.data.vo.SectionStatusVO;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumSerializer;
import club.joylink.util.jsonSerialize.Boolean2NumSerializer;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Getter;

4
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SignalStatus.java
View File

@ -6,8 +6,8 @@ import club.joylink.rtss.simulation.cbtc.data.map.MayOutOfOrderDevice;
import club.joylink.rtss.simulation.cbtc.data.map.Signal;
import club.joylink.rtss.simulation.cbtc.data.vo.DeviceStatusVO;
import club.joylink.rtss.simulation.cbtc.data.vo.SignalStatusVO;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumDeserializer;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumSerializer;
import club.joylink.util.jsonSerialize.Boolean2NumDeserializer;
import club.joylink.util.jsonSerialize.Boolean2NumSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Getter;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/StandStatus.java
View File

@ -5,7 +5,7 @@ import club.joylink.rtss.simulation.cbtc.data.map.MayOutOfOrderDevice;
import club.joylink.rtss.simulation.cbtc.data.map.Stand;
import club.joylink.rtss.simulation.cbtc.data.vo.DeviceStatusVO;
import club.joylink.rtss.simulation.cbtc.data.vo.StandStatusVO;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumSerializer;
import club.joylink.util.jsonSerialize.Boolean2NumSerializer;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Getter;
import org.springframework.util.CollectionUtils;

4
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/StationStatus.java
View File

@ -4,8 +4,8 @@ import club.joylink.rtss.simulation.cbtc.data.map.MapElement;
import club.joylink.rtss.simulation.cbtc.data.map.Station;
import club.joylink.rtss.simulation.cbtc.data.vo.DeviceStatusVO;
import club.joylink.rtss.simulation.cbtc.data.vo.StationStatusVO;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumDeserializer;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumSerializer;
import club.joylink.util.jsonSerialize.Boolean2NumDeserializer;
import club.joylink.util.jsonSerialize.Boolean2NumSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Getter;

4
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/SwitchStatus.java
View File

@ -5,8 +5,8 @@ import club.joylink.rtss.simulation.cbtc.data.map.MapElement;
import club.joylink.rtss.simulation.cbtc.data.map.Switch;
import club.joylink.rtss.simulation.cbtc.data.vo.DeviceStatusVO;
import club.joylink.rtss.simulation.cbtc.data.vo.SwitchStatusVO;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumDeserializer;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumSerializer;
import club.joylink.util.jsonSerialize.Boolean2NumDeserializer;
import club.joylink.util.jsonSerialize.Boolean2NumSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Getter;

2
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/TrainStatus.java
View File

@ -9,7 +9,7 @@ import club.joylink.rtss.simulation.cbtc.data.vo.DeviceStatusVO;
import club.joylink.rtss.simulation.cbtc.data.vo.TrainInfo;
import club.joylink.rtss.simulation.cbtc.data.vo.TrainStatusVO;
import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityTrain;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumSerializer;
import club.joylink.util.jsonSerialize.Boolean2NumSerializer;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Getter;
import lombok.Setter;

4
rtss/src/main/java/club/joylink/rtss/simulation/cbtc/data/storage/StorageSimulation.java
View File

@ -4,8 +4,8 @@ import club.joylink.rtss.simulation.cbtc.Simulation;
import club.joylink.rtss.simulation.cbtc.conversation.Conversation;
import club.joylink.rtss.simulation.cbtc.data.storage.ctc.StorageSimulationCtcDataRepository;
import club.joylink.rtss.simulation.cbtc.data.storage.vo.StorageConversation;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumDeserializer;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumSerializer;
import club.joylink.util.jsonSerialize.Boolean2NumDeserializer;
import club.joylink.util.jsonSerialize.Boolean2NumSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Getter;

Some files were not shown because too many files have changed in this diff Show More