添加设备时可以设置名称

@@ -7,7 +7,9 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.user.UserTerminalGroupRelation;
 import com.ruoyi.system.domain.user.UserTerminalGroupRelation;
 import com.zhonglai.luhui.action.BaseController;
 import com.zhonglai.luhui.action.BaseController;
+import com.zhonglai.luhui.api.controller.iot.dto.GroupTerminalRequest;
 import com.zhonglai.luhui.api.controller.test.TestDto;
 import com.zhonglai.luhui.api.controller.test.TestDto;
+import com.zhonglai.luhui.dao.service.PublicService;
 import com.zhonglai.luhui.device.domain.IotTerminal;
 import com.zhonglai.luhui.device.domain.IotTerminal;
 import com.zhonglai.luhui.device.service.IIotTerminalService;
 import com.zhonglai.luhui.device.service.IIotTerminalService;
 import com.zhonglai.luhui.device.service.IUserTerminalGroupRelationService;
 import com.zhonglai.luhui.device.service.IUserTerminalGroupRelationService;
@@ -17,6 +19,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import java.util.List;
 import java.util.List;
@@ -34,7 +37,6 @@ public class IotTerminalController extends BaseController
 {
 {
     @Autowired
     @Autowired
     private IIotTerminalService iotTerminalService;
     private IIotTerminalService iotTerminalService;
-
     @Autowired
     @Autowired
     private IUserTerminalGroupRelationService userTerminalGroupRelationService;
     private IUserTerminalGroupRelationService userTerminalGroupRelationService;
     @ApiOperation("查询终端列表")
     @ApiOperation("查询终端列表")
@@ -91,13 +93,15 @@ public class IotTerminalController extends BaseController
 
 
     @ApiOperation("分组终端")
     @ApiOperation("分组终端")
     @ApiImplicitParams({
     @ApiImplicitParams({
-            @ApiImplicitParam(value = "终端id集合",name = "ids"),
             @ApiImplicitParam(value = "分组id",name = "iot_terminal_group_id"),
             @ApiImplicitParam(value = "分组id",name = "iot_terminal_group_id"),
     })
     })
     @Log(title = "终端", businessType = BusinessType.UPDATE)
     @Log(title = "终端", businessType = BusinessType.UPDATE)
     @PostMapping("/groupTerminal")
     @PostMapping("/groupTerminal")
-    public AjaxResult groupTerminal(Integer iot_terminal_group_id,@RequestBody List<String> ids)
+    @Transactional
+    public AjaxResult groupTerminal(Integer iot_terminal_group_id, @RequestBody GroupTerminalRequest groupTerminalRequest)
     {
     {
+        List<String> names = groupTerminalRequest.getNames();
+        List<String> ids = groupTerminalRequest.getIds();
         Integer userid= SecurityUtils.getUserId().intValue();
         Integer userid= SecurityUtils.getUserId().intValue();
 
 
         List<UserTerminalGroupRelation> list = userTerminalGroupRelationService.selectListByTerminalIds(ids.toArray(new String[ids.size()]));
         List<UserTerminalGroupRelation> list = userTerminalGroupRelationService.selectListByTerminalIds(ids.toArray(new String[ids.size()]));
@@ -116,6 +120,11 @@ public class IotTerminalController extends BaseController
                 return AjaxResult.error("无权操作设备"+iot_terminal_ids.toString());
                 return AjaxResult.error("无权操作设备"+iot_terminal_ids.toString());
             }
             }
         }
         }
+        if(null != names && names.size() != ids.size())
+        {
+            return AjaxResult.error("请给所有设备都设置名称");
+        }
+        iotTerminalService.batchUpName(ids,names);
         return toAjax(  userTerminalGroupRelationService.groupTerminal(iot_terminal_group_id,ids,userid));
         return toAjax(  userTerminalGroupRelationService.groupTerminal(iot_terminal_group_id,ids,userid));
     }
     }
 }
 }

+package com.zhonglai.luhui.api.controller.iot.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+@ApiModel
+public class GroupTerminalRequest {
+    @ApiModelProperty("终端id集合")
+    private List<String> ids;
+    @ApiModelProperty("终端名称集合，如果有值长度必须和ids一致")
+    private List<String> names;
+
+    // Getters and Setters
+
+    public List<String> getIds() {
+        return ids;
+    }
+
+    public void setIds(List<String> ids) {
+        this.ids = ids;
+    }
+
+    public List<String> getNames() {
+        return names;
+    }
+
+    public void setNames(List<String> names) {
+        this.names = names;
+    }
+}