diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppLineTopologyDiagramParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppLineTopologyDiagramParm.java new file mode 100644 index 0000000..2098c59 --- /dev/null +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppLineTopologyDiagramParm.java @@ -0,0 +1,46 @@ +package com.njcn.csdevice.pojo.param; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.bo.BaseEntity; +import lombok.Data; + +/** + * + * Description: + * 接口文档访问地址:http://serverIP:port/swagger-ui.html + * Date: 2023/3/27 10:18【需求编号】 + * + * @author clam + * @version V1.0.0 + */ + +/** + * 项目拓扑图关系表 + */ +@Data +public class AppLineTopologyDiagramParm extends BaseEntity { + /** + * 拓扑图Id + */ + private String id; + + + + /** + * 监测点ID + */ + private String lineId; + private String name; + + /** + * 0:删除 1:正常 + */ + private String status; + + private Double lng; + + private Double lat; + + +} \ No newline at end of file diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/LinePostionParam.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/LinePostionParam.java index ee1bb6b..2c0a337 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/LinePostionParam.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/LinePostionParam.java @@ -16,5 +16,5 @@ import java.util.List; public class LinePostionParam { /*拓扑图id*/ private String id; - private List pointList; + private List pointList; } diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/AppLineTopologyDiagramPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/AppLineTopologyDiagramPO.java index d724979..4343fe3 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/AppLineTopologyDiagramPO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/AppLineTopologyDiagramPO.java @@ -26,6 +26,7 @@ public class AppLineTopologyDiagramPO extends BaseEntity { @TableField(value = "id") private String id; + /** * 监测点ID */ diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/AppLineTopologyDiagramVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/AppLineTopologyDiagramVO.java index 7728776..506c7d7 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/AppLineTopologyDiagramVO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/AppLineTopologyDiagramVO.java @@ -30,6 +30,8 @@ public class AppLineTopologyDiagramVO { */ private String lineId; + private String name ; + /** * 0:删除 1:正常 */ diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java index 90fcc04..1445a6d 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java @@ -88,10 +88,10 @@ public class DeviceUserController extends BaseController { @ApiOperation("设备转移(直接扫码不用申请)") @ApiImplicitParam(name = "ids", value = "设备Id集合", required = true) @DeviceLog(operateType = DeviceOperate.TRANSFER) - public HttpResult transfer(@RequestParam("ids") List ids){ + public HttpResult transfer(@RequestParam("ids") List ids,@RequestParam("useId") String useId){ String methodDescribe = getMethodDescribe("transfer"); - Boolean flag = csDeviceUserPOService.transfer (ids); + Boolean flag = csDeviceUserPOService.transfer (ids,useId); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppLineTopologyDiagramMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppLineTopologyDiagramMapper.xml index eb6938a..1d6c5d1 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppLineTopologyDiagramMapper.xml +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppLineTopologyDiagramMapper.xml @@ -22,7 +22,7 @@