提交

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;
+
+
+}

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<AppLineTopologyDiagramPO> pointList;
+    private List<AppLineTopologyDiagramParm> pointList;
 }

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
      */

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：正常
      */

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<Boolean> transfer(@RequestParam("ids") List<String> ids){
+    public HttpResult<Boolean> transfer(@RequestParam("ids") List<String> 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);
     }
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppLineTopologyDiagramMapper.xml

@@ -22,7 +22,7 @@
   </select>
 
   <select id="queryByLineIds" resultType="com.njcn.csdevice.pojo.vo.AppLineTopologyDiagramVO">
-    select a.*,b.position linePostion  from cs_line_topology_diagram a LEFT JOIN cs_line  b on a.line_id=b.line_id where a.line_id in
+    select a.*,b.position linePostion,b.name name  from cs_line_topology_diagram a LEFT JOIN cs_line  b on a.line_id=b.line_id where a.line_id in
     <foreach collection='lineIds' item='item' index="index" open='(' separator=',' close=')'>
       #{item}
     </foreach>

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDeviceUserPOService.java

@@ -25,7 +25,7 @@ public interface CsDeviceUserPOService extends IService<CsDeviceUserPO>{
 
         String isPrimaryUser(String deviceId);
 
-    Boolean transfer( List<String> ids);
+    Boolean transfer( List<String> ids,String useId);
 
     Boolean delete(String eid);
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppLineTopologyDiagramServiceImpl.java

@@ -86,6 +86,7 @@ public class AppLineTopologyDiagramServiceImpl extends ServiceImpl<AppLineTopolo
 
 
         linePostionParam.getPointList().forEach(temp->{
+            csLinePOService.lambdaUpdate().eq(CsLinePO::getLineId,temp.getLineId()).set(CsLinePO::getName,temp.getName()).update();
         this.lambdaUpdate().eq(AppLineTopologyDiagramPO::getId,temp.getId()).
                 eq(AppLineTopologyDiagramPO::getLineId,temp.getLineId()).set(AppLineTopologyDiagramPO::getLat,temp.getLat()).
                 set(AppLineTopologyDiagramPO::getLng,temp.getLng()).set(AppLineTopologyDiagramPO::getId,linePostionParam.getId()).update();

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java

@@ -209,8 +209,8 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl<CsDeviceUserPOMapper,
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    public Boolean transfer(List<String> ids) {
+    public Boolean transfer(List<String> ids,String useId) {
-        String userIndex = RequestUtil.getUserIndex();
+        String userIndex = useId;
         ids.forEach(eid->{
             List<CsDeviceUserPO> list = this.lambdaQuery().eq(CsDeviceUserPO::getDeviceId, eid).eq(CsDeviceUserPO::getStatus,"1" ).list();
             if(CollectionUtils.isEmpty(list)){