sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

下控返回修改

Browse Source
This commit is contained in:
huguanghan 2024-11-07 09:44:10 +08:00
parent 691996c849
commit 1495adbad9
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
das/src/main/java/com/das/modules/operation/controller/ManualOperatorController.java
View File

@ -31,7 +31,7 @@ public class ManualOperatorController {
* @param cmdInfo 遥控信息 * @param cmdInfo 遥控信息
*/ */
@PostMapping("/command") @PostMapping("/command")
public R<Void> deviceCommand(HttpServletRequest request, @RequestBody CommandInfoDto cmdInfo) { public R<String> deviceCommand(HttpServletRequest request, @RequestBody CommandInfoDto cmdInfo) {
cmdInfo.setMeasType(MeasType.TYPE_PSR_CONTROL); cmdInfo.setMeasType(MeasType.TYPE_PSR_CONTROL);
//判断是否有权限 //判断是否有权限
@ -40,8 +40,8 @@ public class ManualOperatorController {
return R.fail("没有设备遥控权限"); return R.fail("没有设备遥控权限");
} }
optService.executeOperation(request,cmdInfo); String deviceId = optService.executeOperation(request, cmdInfo);
return R.success(); return R.success(deviceId);
} }
/** /**
@ -49,7 +49,7 @@ public class ManualOperatorController {
* @param cmdInfo 遥控信息 * @param cmdInfo 遥控信息
*/ */
@PostMapping("/setPoint") @PostMapping("/setPoint")
public R<Void> deviceSetPoint(HttpServletRequest request,@RequestBody CommandInfoDto cmdInfo) { public R<String> deviceSetPoint(HttpServletRequest request,@RequestBody CommandInfoDto cmdInfo) {
cmdInfo.setMeasType(MeasType.TYPE_PSR_SET_POINT); cmdInfo.setMeasType(MeasType.TYPE_PSR_SET_POINT);
//判断是否有权限 //判断是否有权限
boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_CTRL.toString()); boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_CTRL.toString());
@ -57,15 +57,15 @@ public class ManualOperatorController {
return R.fail("没有设备遥控权限"); return R.fail("没有设备遥控权限");
} }
optService.executeOperation(request,cmdInfo); String deviceId = optService.executeOperation(request, cmdInfo);
return R.success(); return R.success(deviceId);
} }
/** /**
* 设备手工至位 不下令 * 设备手工至位 不下令
*/ */
@PostMapping("/manualCommand") @PostMapping("/manualCommand")
public R<Void> deviceSetPointByMrid(HttpServletRequest request,@RequestBody CommandInfoDto cmdInfo) { public R<String> deviceSetPointByMrid(HttpServletRequest request,@RequestBody CommandInfoDto cmdInfo) {
cmdInfo.setMeasType(MeasType.TYPE_PSR_CALCULATED_VALUE); cmdInfo.setMeasType(MeasType.TYPE_PSR_CALCULATED_VALUE);
//判断是否有权限 //判断是否有权限
boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_CTRL.toString()); boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_CTRL.toString());
@ -75,7 +75,7 @@ public class ManualOperatorController {
if (cmdInfo.getDeviceId() ==null || StringUtils.isBlank(cmdInfo.getServiceCode())){ if (cmdInfo.getDeviceId() ==null || StringUtils.isBlank(cmdInfo.getServiceCode())){
throw new ServiceException("参数缺失"); throw new ServiceException("参数缺失");
} }
optService.executeOperation(request,cmdInfo); String deviceId = optService.executeOperation(request, cmdInfo);
return R.success(); return R.success(deviceId);
} }
} }

3
das/src/main/java/com/das/modules/operation/service/OperationService.java
View File

@ -62,7 +62,7 @@ public class OperationService {
* @param request HttpServletRequest * @param request HttpServletRequest
* @param cmdInfo 命令信息 * @param cmdInfo 命令信息
*/ */
public void executeOperation(HttpServletRequest request, CommandInfoDto cmdInfo) { public String executeOperation(HttpServletRequest request, CommandInfoDto cmdInfo) {
SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY); SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY);
if (cmdInfo.getMeasType().equals(MeasType.TYPE_PSR_CALCULATED_VALUE)) { if (cmdInfo.getMeasType().equals(MeasType.TYPE_PSR_CALCULATED_VALUE)) {
//人工置位，不需要下令 //人工置位，不需要下令
@ -94,6 +94,7 @@ public class OperationService {
log.error("获取客户端ip地址失败 ", e); log.error("获取客户端ip地址失败 ", e);
} }
sysOperationLogMapper.insert(sysOperationLog); sysOperationLogMapper.insert(sysOperationLog);
return cmdInfo.getDeviceId().toString();
} }
/** /**