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

Merge branch 'main' of https://git.jsspisoft.com/ry-das

Browse Source
This commit is contained in:
高云鹏 2024-11-07 10:26:47 +08:00
commit 5bd381559f
3 changed files with 16 additions and 15 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 遥控信息
*/
@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);
//判断是否有权限
@ -40,8 +40,8 @@ public class ManualOperatorController {
return R.fail("没有设备遥控权限");
}
optService.executeOperation(request,cmdInfo);
return R.success();
String deviceId = optService.executeOperation(request, cmdInfo);
return R.success(deviceId);
}
/**
@ -49,7 +49,7 @@ public class ManualOperatorController {
* @param cmdInfo 遥控信息
*/
@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);
//判断是否有权限
boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_CTRL.toString());
@ -57,15 +57,15 @@ public class ManualOperatorController {
return R.fail("没有设备遥控权限");
}
optService.executeOperation(request,cmdInfo);
return R.success();
String deviceId = optService.executeOperation(request, cmdInfo);
return R.success(deviceId);
}
/**
* 设备手工至位 不下令
*/
@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);
//判断是否有权限
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())){
throw new ServiceException("参数缺失");
}
optService.executeOperation(request,cmdInfo);
return R.success();
String deviceId = optService.executeOperation(request, cmdInfo);
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 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);
if (cmdInfo.getMeasType().equals(MeasType.TYPE_PSR_CALCULATED_VALUE)) {
//人工置位，不需要下令
@ -94,6 +94,7 @@ public class OperationService {
log.error("获取客户端ip地址失败 ", e);
}
sysOperationLogMapper.insert(sysOperationLog);
return cmdInfo.getDeviceId().toString();
}
/**

10
ui/dasadmin/src/views/backend/auth/Enumeration/index.vue
View File

@ -74,8 +74,8 @@
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="onSubmitType">保存</el-button>
<el-button @click="visibleTypeAdd = false">取消</el-button>
<el-button type="primary" @click="onSubmitType">提交</el-button>
</div>
</template>
</el-dialog>
@ -99,8 +99,8 @@
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="onSubmitTypeEdit">保存</el-button>
<el-button @click="visibleTypeEdit = false">取消</el-button>
<el-button type="primary" @click="onSubmitTypeEdit">提交</el-button>
</div>
</template>
</el-dialog>
@ -133,8 +133,8 @@
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="onSubmitvalue">保存</el-button>
<el-button @click="visibleValueAdd = false">取消</el-button>
<el-button type="primary" @click="onSubmitvalue">提交</el-button>
</div>
</template>
</el-dialog>
@ -143,8 +143,8 @@
<span>确定是否删除?</span>
<template #footer>
<div class="dialog-footer">
<el-button @click="dialogVisibleDelete = false">取消</el-button>
<el-button type="primary" @click="dialogVisibleDelete1"> 确定 </el-button>
<el-button @click="dialogVisibleDelete = false">取消</el-button>
</div>
</template>
</el-dialog>
@ -176,8 +176,8 @@
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="EditonSubmitvalue">保存</el-button>
<el-button @click="visibleValueEdit = false"> 取消 </el-button>
<el-button type="primary" @click="EditonSubmitvalue">提交</el-button>
</div>
</template>
</el-dialog>