zzkj/smart_storage_java
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

海外平台-数据全英文化

Browse Source
This commit is contained in:
root
2025-09-18 14:05:01 +08:00
parent e6b6ccd804
commit 83eff7d1ee
112 changed files with 2151 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
file-center/src/main/java/com/ho/filecenter/controller/FileController.java
View File

@ -15,6 +15,7 @@ import com.ho.common.tools.service.RedisService;
import com.ho.common.tools.util.CommonBytesUtil;
import com.ho.common.tools.util.MqttUtil;
import com.ho.common.tools.util.PageResult;
import com.ho.common.tools.util.TranslateUtils;
import com.ho.filecenter.entity.MediaFile;
import com.ho.filecenter.service.AnotherFileService;
import com.ho.filecenter.service.FileService;
@ -147,6 +148,7 @@ public class FileController {
@PostMapping("readFileAttribute")
@ApiOperation(value = "读取文件属性")
public DataResult<FileAttributeResp> readFileAttribute(@RequestBody FileAttributeReqVO vo, HttpServletRequest request) {
String lang = request.getHeader(RedisKeyConstant.User.LANG);
FileAttributeResp fileAttributeResp = null;
String msg = CommonConstant.Heartbeat.MSG + vo.getSerialNo();
if (fileService.checkHeartbeat(vo.getSerialNo())) {
@ -164,13 +166,17 @@ public class FileController {
// }else{
// fileAttributeResp = anotherFileService.getFileAttribute(vo);
// }
if(RedisKeyConstant.User.EN_US.equals(lang)){
fileAttributeResp.setMsg(TranslateUtils.translate(fileAttributeResp.getMsg()));
}
return DataResult.success(fileAttributeResp);
}
@PostMapping("deleteDeviceFiles")
@ApiOperation(value = "删除文件(删除边端文件)")
@LogAnnotation(title = "文件服务", action = "删除文件(删除边端文件)")
public DataResult<FileDeleteResp> deleteDeviceFiles(@RequestBody FileForDeviceReqVO fileDeleteReqVO) {
public DataResult<FileDeleteResp> deleteDeviceFiles(@RequestBody FileForDeviceReqVO fileDeleteReqVO, HttpServletRequest request) {
String lang = request.getHeader(RedisKeyConstant.User.LANG);
FileDeleteResp fileDeleteResp = null;
String msg = CommonConstant.Heartbeat.MSG + fileDeleteReqVO.getSerialNo();
if (fileService.checkHeartbeat(fileDeleteReqVO.getSerialNo())) {
@ -179,13 +185,12 @@ public class FileController {
fileDeleteResp.setMsg(msg + CommonConstant.Heartbeat.FAIL);
return DataResult.success(fileDeleteResp);
}
// String serialNo = fileDeleteReqVO.getSerialNo();
// List<String> snList = MqttConfigUtil.getSnList();
// if(snList.stream().anyMatch(s -> s.contains(serialNo))){
fileDeleteResp = fileService.deleteDeviceFiles(fileDeleteReqVO);
// }else{
// fileDeleteResp = anotherFileService.deleteDeviceFiles(fileDeleteReqVO);
// }
fileDeleteResp = fileService.deleteDeviceFiles(fileDeleteReqVO);
if(RedisKeyConstant.User.EN_US.equals(lang)){
fileDeleteResp.setMsg(TranslateUtils.translate(fileDeleteResp.getMsg()));
}
return DataResult.success(fileDeleteResp);
}
@ -193,7 +198,8 @@ public class FileController {
@ApiOperation(value = "文件上传(向边端上传)")
//@HzPermission(value = PermissionConstant.REMOTECONTROL_FILE_UPLOAD)
@LogAnnotation(title = "文件服务", action = "文件上传(向边端上传)")
public DataResult<HeartbeatResp> fileUploadForDevice(@RequestPart("file") MultipartFile file, @RequestParam("stationId") Integer stationId, @RequestParam("serialNo") String serialNo, @RequestParam("filePath") String filePath) {
public DataResult<HeartbeatResp> fileUploadForDevice(HttpServletRequest request,@RequestPart("file") MultipartFile file, @RequestParam("stationId") Integer stationId, @RequestParam("serialNo") String serialNo, @RequestParam("filePath") String filePath) {
String lang = request.getHeader(RedisKeyConstant.User.LANG);
HeartbeatResp resp = fileService.checkHeartAndFileUsing(stationId, serialNo);
if (null == resp) {
resp = new HeartbeatResp();
@ -217,6 +223,9 @@ public class FileController {
// anotherFileService.fileUploadForDevice(file, stationId, serialNo, filePath);
// }
}
if(RedisKeyConstant.User.EN_US.equals(lang)){
resp.setMsg(TranslateUtils.translate(resp.getMsg()));
}
return DataResult.success(resp);
}
@ -224,7 +233,7 @@ public class FileController {
@PostMapping("downloadFromDevice")
@ApiOperation(value = "文件下载(从边端下载到浏览器)")
@LogAnnotation(title = "文件服务", action = "文件下载")
public DataResult<HeartbeatResp> downloadFromDevice(@RequestBody FileForDeviceReqVO fileForDeviceReqVO) {
public DataResult<HeartbeatResp> downloadFromDevice(@RequestBody FileForDeviceReqVO fileForDeviceReqVO,HttpServletRequest request) {
//todo 测试模拟返回成功
/*if(true){
HeartbeatResp heart = new HeartbeatResp();
@ -232,6 +241,7 @@ public class FileController {
return DataResult.success(heart);
}*/
String lang = request.getHeader(RedisKeyConstant.User.LANG);
HeartbeatResp resp = fileService.checkHeartAndFileUsing(fileForDeviceReqVO.getStationId(), fileForDeviceReqVO.getSerialNo());
if (null == resp) {
resp = new HeartbeatResp();
@ -247,12 +257,15 @@ public class FileController {
// anotherFileService.downloadFromDevice(fileForDeviceReqVO);
// }
}
if(RedisKeyConstant.User.EN_US.equals(lang)){
resp.setMsg(TranslateUtils.translate(resp.getMsg()));
}
return DataResult.success(resp);
}
@PostMapping("downloadProgressBar")
@ApiOperation(value = "文件下载进度(从边端下载到浏览器)")
public DataResult<FileProcessRespVO> downloadProgressBar(@RequestBody FileProcessReqVO vo, HttpServletResponse response) {
public DataResult<FileProcessRespVO> downloadProgressBar(@RequestBody FileProcessReqVO vo, HttpServletResponse response,HttpServletRequest request) {
//todo 测试模拟返回成功
/*if(true){
FileProcessRespVO file =new FileProcessRespVO();
@ -260,7 +273,11 @@ public class FileController {
file.setFileStatus(1);
return DataResult.success(file);
}*/
String lang = request.getHeader(RedisKeyConstant.User.LANG);
FileProcessRespVO fileProcessRespVO = fileService.getDownloadProgress(vo);
if(RedisKeyConstant.User.EN_US.equals(lang)){
fileProcessRespVO.setMsg(TranslateUtils.translate(fileProcessRespVO.getMsg()));
}
return DataResult.success(fileProcessRespVO);
}

22
file-center/src/main/java/com/ho/filecenter/controller/HeartbeatCheckController.java
View File

@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -46,7 +47,8 @@ public class HeartbeatCheckController {
@PostMapping("getHeartbeat")
@ApiOperation(value = "心跳检测")
public DataResult<HeartbeatResp> getHeartbeat(@RequestBody HeartbeatReq vo) {
public DataResult<HeartbeatResp> getHeartbeat(@RequestBody HeartbeatReq vo, HttpServletRequest request) {
String lang = request.getHeader(RedisKeyConstant.User.LANG);
HeartbeatResp heartbeatResp = new HeartbeatResp();
//检测心跳
DeviceReqVO deviceReqVO = new DeviceReqVO();
@ -57,11 +59,18 @@ public class HeartbeatCheckController {
log.info("getHeartbeat 当前设备没有配置SN");
heartbeatResp.setHeartbeatStatus(CommonConstant.ZERO);
heartbeatResp.setMsg(CommonConstant.DEVICE_NO_SN);
if(RedisKeyConstant.User.EN_US.equals(lang)){
heartbeatResp.setMsg(CommonConstant.DEVICE_NO_SN_EN);
}
return DataResult.success(heartbeatResp);
}
String sn = deviceList.get(0).getSerialNo();
String heartbeatKey = RedisKeyConstant.HEARTBEAT + sn;
String msg = CommonConstant.Heartbeat.MSG + sn;
if(RedisKeyConstant.User.EN_US.equals(lang)){
msg = CommonConstant.Heartbeat.MSG_EN + sn;
}
if (redisService.hasKey(heartbeatKey)) {
Map<Object, Object> hgetall = redisService.hgetall(heartbeatKey);
Date updateTime = (Date) hgetall.get(CommonConstant.UPDATE_TIME);
@ -70,16 +79,25 @@ public class HeartbeatCheckController {
if (between >= 5) {
heartbeatResp.setHeartbeatStatus(CommonConstant.ZERO);
heartbeatResp.setMsg(msg + CommonConstant.Heartbeat.FAIL);
if(RedisKeyConstant.User.EN_US.equals(lang)){
heartbeatResp.setMsg(msg + CommonConstant.Heartbeat.FAIL_EN);
}
log.info("getHeartbeat 超过5分钟没有检测到心跳：{}", between);
return DataResult.success(heartbeatResp);
}
heartbeatResp.setMsg(msg + CommonConstant.Heartbeat.SUCCESS);
if(RedisKeyConstant.User.EN_US.equals(lang)){
heartbeatResp.setMsg(msg + CommonConstant.Heartbeat.SUCCESS_EN);
}
heartbeatResp.setHeartbeatStatus(CommonConstant.ONE);
return DataResult.success(heartbeatResp);
} else {
log.info("getHeartbeat 没有检测到心跳{}", heartbeatKey);
heartbeatResp.setHeartbeatStatus(CommonConstant.ZERO);
heartbeatResp.setMsg(msg + sn + CommonConstant.Heartbeat.FAIL);
heartbeatResp.setMsg(msg + CommonConstant.Heartbeat.FAIL);
if(RedisKeyConstant.User.EN_US.equals(lang)){
heartbeatResp.setMsg(msg + CommonConstant.Heartbeat.FAIL_EN);
}
return DataResult.success(heartbeatResp);
}
}

48
file-center/src/main/java/com/ho/filecenter/controller/OrderSendController.java
View File

@ -16,6 +16,7 @@ import com.ho.common.tools.exception.BusinessException;
import com.ho.common.tools.exception.DataResult;
import com.ho.common.tools.service.RedisService;
import com.ho.common.tools.util.PageResult;
import com.ho.common.tools.util.TranslateUtils;
import com.ho.filecenter.feignclient.BusinessFeignClient;
import com.ho.filecenter.feignclient.UserFeignClient;
import com.ho.filecenter.service.AnotherOrderSendService;
@ -36,6 +37,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.*;
import java.util.concurrent.TimeUnit;
@ -71,13 +73,19 @@ public class OrderSendController {
@ApiOperation(value = "指令下发")
//@HzPermission(value = {PermissionConstant.REMOTECONTROL_COMMAND_BATCHDISTRIBUTION,PermissionConstant.STRATEGY_PLANCURVEDIS_COMMANDISSUANCE,PermissionConstant.REMOTECONTROL_COMMAND_SINGLEREFRESH})
// @LogAnnotation(title = "命令下发", action = "指令下发")
public DataResult<HeartbeatResp> orderIssued(@RequestBody OrderIssuedReqVO vo) {
public DataResult<HeartbeatResp> orderIssued(@RequestBody OrderIssuedReqVO vo, HttpServletRequest request) {
// String token = request.getHeader(RedisKeyConstant.User.ACCESS_TOKEN);
// UserDetailRespVO userDetailRespVO = redisService.getUserDetailByToken(token);
// String userName = userDetailRespVO.getUsername();
// String userNameKey = redisService.getUserNameKey(userDetailRespVO, userName);
// SimpleUser user = (SimpleUser) redisService.get(userNameKey);
return getDataResult(vo);
String lang = request.getHeader(RedisKeyConstant.User.LANG);
DataResult result = getDataResult(vo);
if(RedisKeyConstant.User.EN_US.equals(lang)){
HeartbeatResp heartbeatResp= (HeartbeatResp)result.getData();
heartbeatResp.setMsg(TranslateUtils.translate(heartbeatResp.getMsg()));
}
return result;
}
@NotNull
@ -227,7 +235,8 @@ public class OrderSendController {
@PostMapping("progressBar")
@ApiOperation(value = "指令下发进度")
@TokenIgnore
public DataResult<OrderProcessResp> progressBar(@RequestBody OrderProgressReqVO vo) {
public DataResult<OrderProcessResp> progressBar(@RequestBody OrderProgressReqVO vo, HttpServletRequest request) {
String lang = request.getHeader(RedisKeyConstant.User.LANG);
String key = vo.getStationId() + ":" + vo.getSrcId();
log.info("指令下发进度 key:{}", key);
OrderProcessResp orderProcessResp = new OrderProcessResp();
@ -280,13 +289,16 @@ public class OrderSendController {
}
}
orderProcessResp.setProcessList(processDetailRespList);
if(RedisKeyConstant.User.EN_US.equals(lang)){
orderProcessResp.setMsg(TranslateUtils.translate(orderProcessResp.getMsg()));
}
return DataResult.success(orderProcessResp);
}
@PostMapping("apiOrderIssued")
@ApiOperation(value = "指令下发(对外提供)")
@TokenIgnore
public DataResult<HeartbeatResp> apiOrderIssued(@RequestBody ApiOrderIssuedReqVO vo) {
public DataResult<HeartbeatResp> apiOrderIssued(@RequestBody ApiOrderIssuedReqVO vo, HttpServletRequest request) {
SysSubDictVO sysSubDictVO = new SysSubDictVO();
sysSubDictVO.setType(CommonConstant.PUSH_DATA);
Map<String, String> sysSubDict = userFeignClient.getSysSubDict(sysSubDictVO);
@ -297,7 +309,7 @@ public class OrderSendController {
for (OrderIssuedVO orderIssuedVO : list) {
orderIssuedVO.setStationId(Integer.valueOf(stationId));
}
DataResult<HeartbeatResp> heartbeatRespDataResult = orderIssued(vo);
DataResult<HeartbeatResp> heartbeatRespDataResult = orderIssued(vo,request);
heartbeatResp = heartbeatRespDataResult.getData();
}
return DataResult.success(heartbeatResp);
@ -306,7 +318,7 @@ public class OrderSendController {
@PostMapping("apiProgressBar")
@ApiOperation(value = "指令下发进度(对外提供)")
@TokenIgnore
public DataResult<OrderProcessResp> apiProgressBar(@RequestBody ApiOrderProgressReqVO apiVo) {
public DataResult<OrderProcessResp> apiProgressBar(@RequestBody ApiOrderProgressReqVO apiVo, HttpServletRequest request) {
SysSubDictVO sysSubDictVO = new SysSubDictVO();
sysSubDictVO.setType(CommonConstant.PUSH_DATA);
Map<String, String> sysSubDict = userFeignClient.getSysSubDict(sysSubDictVO);
@ -316,7 +328,7 @@ public class OrderSendController {
OrderProgressReqVO vo = new OrderProgressReqVO();
vo.setStationId(Integer.valueOf(stationId));
vo.setSrcId(apiVo.getSrcId());
DataResult<OrderProcessResp> orderProcessRespDataResult = progressBar(vo);
DataResult<OrderProcessResp> orderProcessRespDataResult = progressBar(vo,request);
orderProcessResp = orderProcessRespDataResult.getData();
}
return DataResult.success(orderProcessResp);
@ -326,16 +338,24 @@ public class OrderSendController {
@ApiOperation(value = "命令下发曲线")
// @LogAnnotation(title = "命令下发曲线", action = "命令下发曲线")
@TokenIgnore
public DataResult<HeartbeatResp> sendPlanPowerOrder(@RequestBody OrderPlanPowerReq vo) {
public DataResult<HeartbeatResp> sendPlanPowerOrder(@RequestBody OrderPlanPowerReq vo, HttpServletRequest request) {
String lang = request.getHeader(RedisKeyConstant.User.LANG);
HeartbeatResp heartbeatResp = orderSendService.sendPlanPowerOrder(vo);
if(RedisKeyConstant.User.EN_US.equals(lang)){
heartbeatResp.setMsg(TranslateUtils.translate(heartbeatResp.getMsg()));
}
return DataResult.success(heartbeatResp);
}
@PostMapping("planPowerProgressBar")
@ApiOperation(value = "指令下发进度")
@TokenIgnore
public DataResult<OrderProcessResp> planPowerProgressBar(@RequestBody OrderPlanPowerReq vo) {
public DataResult<OrderProcessResp> planPowerProgressBar(@RequestBody OrderPlanPowerReq vo, HttpServletRequest request) {
String lang = request.getHeader(RedisKeyConstant.User.LANG);
OrderProcessResp orderProcessResp = orderSendService.planPowerProgressBar(vo);
if(RedisKeyConstant.User.EN_US.equals(lang)){
orderProcessResp.setMsg(TranslateUtils.translate(orderProcessResp.getMsg()));
}
return DataResult.success(orderProcessResp);
}
@ -343,7 +363,13 @@ public class OrderSendController {
@PostMapping("orderIssued4plan")
@ApiOperation(value = "指令下发")
@TokenIgnore
public DataResult<HeartbeatResp> orderIssued4plan(@RequestBody OrderIssuedReqVO vo) {
return this.getDataResult(vo);
public DataResult<HeartbeatResp> orderIssued4plan(@RequestBody OrderIssuedReqVO vo, HttpServletRequest request) {
String lang = request.getHeader(RedisKeyConstant.User.LANG);
DataResult result = getDataResult(vo);
if(RedisKeyConstant.User.EN_US.equals(lang)){
HeartbeatResp heartbeatResp= (HeartbeatResp)result.getData();
heartbeatResp.setMsg(TranslateUtils.translate(heartbeatResp.getMsg()));
}
return result;
}
}

BIN
file-center/src/main/resources/template/template.xls
View File

Binary file not shown.