Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
huangzj
2023-08-03 14:03:46 +08:00
parent ab360ed348
commit 448af492d6
29 changed files with 457 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsEquipmentTransferPOController.java
View File

@@ -29,6 +29,7 @@ import java.util.List;
@RequestMapping("/EquipmentTransfer")
@Api(tags = " 设备转移、恢复")
@AllArgsConstructor
@Deprecated
public class CsEquipmentTransferPOController extends BaseController {
private final CsEquipmentTransferPOService csEquipmentTransferPOService;

12
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java
View File

@@ -45,11 +45,11 @@ public class DeviceUserController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/share")
@ApiOperation("设备扫码分享")
@ApiImplicitParam(name = "id", value = "设备id", required = true)
public HttpResult<Boolean> share(@RequestParam("id") String id){
@ApiImplicitParam(name = "ids", value = "设备id集合", required = true)
public HttpResult<Boolean> share(@RequestParam("ids") List<String> ids){
String methodDescribe = getMethodDescribe("share");
Boolean flag = csDeviceUserPOService.share (id);
Boolean flag = csDeviceUserPOService.share (ids);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
@@ -83,11 +83,11 @@ public class DeviceUserController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/transfer")
@ApiOperation("设备转移(直接扫码不用申请)")
@ApiImplicitParam(name = "eid", value = "设备Id", required = true)
public HttpResult<Boolean> transfer(@RequestParam("eid") String eid){
@ApiImplicitParam(name = "ids", value = "设备Id集合", required = true)
public HttpResult<Boolean> transfer(@RequestParam("ids") List<String> ids){
String methodDescribe = getMethodDescribe("transfer");
Boolean flag = csDeviceUserPOService.transfer (eid);
Boolean flag = csDeviceUserPOService.transfer (ids);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}

11
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java
View File

@@ -6,6 +6,7 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.csdevice.pojo.dto.LineParamDTO;
import com.njcn.csdevice.pojo.param.CsLedgerParam;
import com.njcn.csdevice.pojo.po.CsLedger;
import com.njcn.csdevice.pojo.vo.CsLedgerVO;
@@ -114,5 +115,15 @@ public class CsLedgerController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryLine")
@ApiOperation("按条件查询监测点")
@ApiImplicitParam(name = "lineParamdto", value = "查询条件", required = true)
public HttpResult<List<CsLedger>> queryLine(@RequestBody @Validated LineParamDTO lineParamdto){
String methodDescribe = getMethodDescribe("queryLine");
List<CsLedger> list = csLedgerService.queryLine(lineParamdto);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
}

13
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/LineTopologyDiagramController.java
View File

@@ -7,6 +7,7 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.csdevice.pojo.param.AppLineTopologyDiagramAddParm;
import com.njcn.csdevice.pojo.param.AppLineTopologyDiagramAuditParm;
import com.njcn.csdevice.pojo.param.LinePostionParam;
import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO;
import com.njcn.csdevice.service.AppLineTopologyDiagramService;
@@ -33,7 +34,7 @@ import java.util.List;
@Slf4j
@RestController
@RequestMapping("/lineTopologyDiagram")
@Api(tags = " 拓扑图-监测点")
@Api(tags = "拓扑图-监测点")
@AllArgsConstructor
public class LineTopologyDiagramController extends BaseController {
@@ -83,4 +84,14 @@ public class LineTopologyDiagramController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/auditList")
@ApiOperation("批量修改监测点拓扑图关系")
@ApiImplicitParam(name = "list", value = "监测点拓扑图数据集", required = true)
public HttpResult<String> auditList(@RequestBody LinePostionParam linePostionParam){
String methodDescribe = getMethodDescribe("auditList");
appLineTopologyDiagramService.auditList(linePostionParam.getPointList());
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
}