xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改返回提示语句中文改为英文

Browse Source
This commit is contained in:
qiaoqinzheng 2023-10-23 15:24:01 +08:00
parent 28878e942a
commit 8045c3fc37
9 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
View File

@ -67,7 +67,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
//连接ftp
FTPClient ftpClient = ftpUtil.LoginFTP();
if (Objects.isNull(ftpClient)){
result.error500("ftp连接失败");
result.error500("ftp connection failed！");
return false;
}
InputStream inputStream = null;
@ -280,7 +280,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
//连接ftp
FTPClient ftpClient = ftpUtil.LoginFTP();
if (Objects.isNull(ftpClient)){
String warning = "ftp连接失败";
String warning = "ftp connection failed！";
}
InputStream inputStream = null;
File file = null;
@ -328,7 +328,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
//连接ftp
FTPClient ftpClient = ftpUtil.LoginFTP();
if (Objects.isNull(ftpClient)){
String warning = "ftp连接失败";
String warning = "ftp connection failed！";
}
InputStream inputStream = null;
File file = null;
@ -376,7 +376,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
//连接ftp
FTPClient ftpClient = ftpUtil.LoginFTP();
if (Objects.isNull(ftpClient)){
String warning = "ftp连接失败";
String warning = "ftp connection failed！";
}
InputStream inputStream = null;
try {
@ -4064,7 +4064,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
//连接ftp
FTPClient ftpClient = ftpUtil.LoginFTP();
if (Objects.isNull(ftpClient)){
result.error500("ftp连接失败");
result.error500("ftp connection failed！");
return m_vecCompare;
}
InputStream inputStream = null;

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java
View File

@ -265,7 +265,7 @@ public class PHDFileUtil {
FTPClient ftpClient = ftpUtil.LoginFTP();
//判断ftp是否连接成功
if (Objects.isNull(ftpClient)){
throw new RuntimeException("ftp连接失败!");
throw new RuntimeException("ftp connection failed!");
}
InputStream iStream= null;
File file = null;

18
jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java
View File

@ -134,7 +134,7 @@ public class StationOperationServiceImpl extends ServiceImpl<StationOperationMap
result.setResult(stations);
result.setSuccess(true);
}else {
result.error500("台站下对应信息不存在");
result.error500("The corresponding information under the station does not exist");
}
}else if(type.equals("Nuclear Facility")){
HashMap<String, GardsNuclearfacility> nuclearFacilityMap = (HashMap<String, GardsNuclearfacility>) redisUtil.get("nuclearFacilityMap");
@ -148,10 +148,10 @@ public class StationOperationServiceImpl extends ServiceImpl<StationOperationMap
result.setResult(nuclearfacility);
result.setSuccess(true);
}else {
result.error500("核设施下对应信息不存在");
result.error500("The corresponding information does not exist in the nuclear facility");
}
}else {
result.error500("当前类型不存在");
result.error500("The current type does not exist");
}
return result;
}
@ -233,7 +233,7 @@ public class StationOperationServiceImpl extends ServiceImpl<StationOperationMap
//获取传递的半径数据
Double radius = pointVo.getRadius();
if (Objects.isNull(radius)) {
result.error500("请传入半径");
result.error500("Please pass in radius");
}
try {
if (CollectionUtils.isNotEmpty(stationIds)){
@ -273,16 +273,16 @@ public class StationOperationServiceImpl extends ServiceImpl<StationOperationMap
//获取当前查询的纬度 即 圆心位置纬度信息
Double latitudeD = point.getLat();
if (Objects.isNull(longitudeD)) {
result.error500("请传入经度");
result.error500("Pass in longitude, please");
}
if (Objects.isNull(latitudeD)) {
result.error500("请传入纬度");
result.error500("Please pass in latitude");
}
if (!(longitudeD >= -180 && longitudeD <= 180)) {
result.error500("经度不合法");
result.error500("Longitude is not legal");
}
if (!(latitudeD >= -85.05112878 && latitudeD <= 85.05112878)) {
result.error500("纬度不合法");
result.error500("Latitude illegality");
}
// 1.获取外接正方形
Rectangle rectangle = getRectangle(radius, longitudeD, latitudeD);
@ -383,7 +383,7 @@ public class StationOperationServiceImpl extends ServiceImpl<StationOperationMap
}
}
if (StringUtils.isBlank(cacheTime)){
result.error500("缓存时间不能为空");
result.error500("The cache time cannot be empty");
return result;
}
//根据用户id查询出当前用户关注的台站信息

4
jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/SysUserFocusStationServiceImpl.java
View File

@ -84,7 +84,7 @@ public class SysUserFocusStationServiceImpl extends ServiceImpl<SysUserFocusStat
//根据用户名称查询对应的用户信息
SysUser sysUser = cacheTimeService.findUserByName(username);
if (Objects.isNull(sysUser)){
result.error500("当前用户不存在!");
result.error500("The current user does not exist!");
return result;
}
//判断传递参数信息是否为空
@ -145,7 +145,7 @@ public class SysUserFocusStationServiceImpl extends ServiceImpl<SysUserFocusStat
//根据用户名称查询对应的用户信息
SysUser sysUser = cacheTimeService.findUserByName(username);
if (Objects.isNull(sysUser)){
result.error500("当前用户不存在!");
result.error500("The current user does not exist!");
return result;
}
LambdaQueryWrapper<SysUserFocusStationStation> queryWrapper = new LambdaQueryWrapper<>();

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTaskServiceImpl.java
View File

@ -322,7 +322,7 @@ public class SysTaskServiceImpl extends ServiceImpl<SysTaskMapper, SysTaskSystem
this.baseMapper.deleteById(fromSysTask);
}
result.setSuccess(true);
result.success("交接完成");
result.success("Handover completed");
} catch (ParseException e) {
throw new RuntimeException(e);
}

4
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java
View File

@ -49,12 +49,12 @@ public class AutoServiceImpl extends ServiceImpl<GardsAnalysesAutoMapper, GardsA
//获取redis中缓存的台站信息
Map<Integer, String> stationMap = (Map<Integer, String>)redisUtil.get("stationMap");
if (Objects.isNull(startTime)){
result.error500("开始时间不能为空");
result.error500("The start time cannot be empty");
return result;
}
String startDate = DateUtils.formatDate(startTime, "yyyy-MM-dd") + " 00:00:00";
if (Objects.isNull(endTime)){
result.error500("结束时间不能为空");
result.error500("The end time cannot be empty");
return result;
}
String endDate = DateUtils.formatDate(endTime, "yyyy-MM-dd") + " 23:59:59";

4
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java
View File

@ -40,11 +40,11 @@ public class GardsMetDataServiceImpl extends ServiceImpl<GardsMetDataMapper, Gar
return result;
}
if (Objects.isNull(startTime)){
result.error500("开始时间不能为空");
result.error500("The start time cannot be empty");
return result;
}
if (Objects.isNull(endTime)){
result.error500("结束时间不能为空");
result.error500("The end time cannot be empty");
return result;
}
Date startDate = DateUtils.parseDate(DateUtils.formatDate(startTime, "yyyy-MM-dd") + " 00:00:00", "yyyy-MM-dd HH:mm:ss");

8
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java
View File

@ -47,11 +47,11 @@ public class GardsSohDataServiceImpl extends ServiceImpl<GardsSohDataMapper, Gar
return result;
}
if (Objects.isNull(startTime)){
result.error500("开始时间不能为空");
result.error500("The start time cannot be empty");
return result;
}
if (Objects.isNull(endTime)){
result.error500("结束时间不能为空");
result.error500("The end time cannot be empty");
return result;
}
Date startDate = DateUtils.parseDate(DateUtils.formatDate(startTime, "yyyy-MM-dd") + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
@ -94,11 +94,11 @@ public class GardsSohDataServiceImpl extends ServiceImpl<GardsSohDataMapper, Gar
return result;
}
if (Objects.isNull(startTime)){
result.error500("开始时间不能为空");
result.error500("The start time cannot be empty");
return result;
}
if (Objects.isNull(endTime)){
result.error500("结束时间不能为空");
result.error500("The end time cannot be empty");
return result;
}
Date startDate = DateUtils.parseDate(DateUtils.formatDate(startTime, "yyyy-MM-dd") + " 00:00:00", "yyyy-MM-dd HH:mm:ss");

4
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/ReviewedServiceImpl.java
View File

@ -49,12 +49,12 @@ public class ReviewedServiceImpl extends ServiceImpl<GardsAnalysesManMapper, Gar
//获取redis中缓存的台站信息
Map<Integer, String> stationMap = (Map<Integer, String>)redisUtil.get("stationMap");
if (Objects.isNull(startTime)){
result.error500("开始时间不能为空");
result.error500("The start time cannot be empty");
return result;
}
String startDate = DateUtils.formatDate(startTime, "yyyy-MM-dd") + " 00:00:00";
if (Objects.isNull(endTime)){
result.error500("结束时间不能为空");
result.error500("The end time cannot be empty");
return result;
}
String endDate = DateUtils.formatDate(endTime, "yyyy-MM-dd") + " 23:59:59";