修改bug

@@ -51,7 +51,6 @@ public class UserTerminalGroupRelationController extends BaseController
      * 查询终端分组关系列表
      * 查询终端分组关系列表
      */
      */
     @ApiOperation("查询终端分组关系列表")
     @ApiOperation("查询终端分组关系列表")
-    @PreAuthorize("@ss.hasPermi('user:UserTerminalGroupRelation:list')")
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(UserTerminalGroupRelation userTerminalGroupRelation)
     public TableDataInfo list(UserTerminalGroupRelation userTerminalGroupRelation)
     {
     {
@@ -62,30 +61,17 @@ public class UserTerminalGroupRelationController extends BaseController
     }
     }
 
 
     @ApiOperation("查询未分组终端")
     @ApiOperation("查询未分组终端")
-    @PreAuthorize("@ss.hasPermi('user:UserTerminalGroupRelation:unGrouplist')")
-    @GetMapping("/unGrouplist")
-    public AjaxResult unGrouplist()
+    @GetMapping("/unGrouplist/{product_id}")
+    public AjaxResult unGrouplist(@PathVariable Integer product_id)
     {
     {
-        List<Map<String,Object>> list = publicService.getObjectListBySQL("SELECT * FROM `user_terminal_group_relation` WHERE user_info_id="+getUserId().intValue()+" AND iot_terminal_group_id IS NULL");
-        if(null != list && list.size() != 0)
-        {
-            List<UserTerminalGroupRelation> rlist = new ArrayList<>();
-
-            for (Map<String,Object> map:list)
-            {
-                UserTerminalGroupRelation userTerminalGroupRelation = JSON.parseObject(JSON.toJSONString(map),UserTerminalGroupRelation.class);
-                rlist.add(userTerminalGroupRelation);
-            }
-            return AjaxResult.success(rlist);
-        }
-        return AjaxResult.success("");
+        List<Map<String,Object>> list = publicService.getObjectListBySQL("SELECT a.*,b.`name` FROM `user_terminal_group_relation` a LEFT JOIN `iot_terminal` b ON a.`iot_terminal_id`=b.`id` WHERE a.user_info_id="+getUserId().intValue()+" AND a.iot_terminal_group_id IS NULL AND b.`product_id`="+product_id);
+        return AjaxResult.success(list);
     }
     }
 
 
     /**
     /**
      * 导出终端分组关系列表
      * 导出终端分组关系列表
      */
      */
     @ApiOperation("导出终端分组关系列表")
     @ApiOperation("导出终端分组关系列表")
-    @PreAuthorize("@ss.hasPermi('user:UserTerminalGroupRelation:export')")
     @Log(title = "终端分组关系", businessType = BusinessType.EXPORT)
     @Log(title = "终端分组关系", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, UserTerminalGroupRelation userTerminalGroupRelation)
     public void export(HttpServletResponse response, UserTerminalGroupRelation userTerminalGroupRelation)
@@ -99,7 +85,6 @@ public class UserTerminalGroupRelationController extends BaseController
      * 获取终端分组关系详细信息
      * 获取终端分组关系详细信息
      */
      */
     @ApiOperation("获取终端分组关系详细信息")
     @ApiOperation("获取终端分组关系详细信息")
-    @PreAuthorize("@ss.hasPermi('user:UserTerminalGroupRelation:query')")
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Integer id)
     public AjaxResult getInfo(@PathVariable("id") Integer id)
     {
     {
@@ -110,7 +95,6 @@ public class UserTerminalGroupRelationController extends BaseController
      * 新增终端分组关系
      * 新增终端分组关系
      */
      */
     @ApiOperation("新增终端分组关系")
     @ApiOperation("新增终端分组关系")
-    @PreAuthorize("@ss.hasPermi('user:UserTerminalGroupRelation:add')")
     @Log(title = "终端分组关系", businessType = BusinessType.INSERT)
     @Log(title = "终端分组关系", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody UserTerminalGroupRelation userTerminalGroupRelation)
     public AjaxResult add(@RequestBody UserTerminalGroupRelation userTerminalGroupRelation)
@@ -136,7 +120,6 @@ public class UserTerminalGroupRelationController extends BaseController
      * 修改终端分组关系
      * 修改终端分组关系
      */
      */
     @ApiOperation("修改终端分组关系")
     @ApiOperation("修改终端分组关系")
-    @PreAuthorize("@ss.hasPermi('user:UserTerminalGroupRelation:edit')")
     @Log(title = "终端分组关系", businessType = BusinessType.UPDATE)
     @Log(title = "终端分组关系", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody UserTerminalGroupRelation userTerminalGroupRelation)
     public AjaxResult edit(@RequestBody UserTerminalGroupRelation userTerminalGroupRelation)
@@ -148,7 +131,6 @@ public class UserTerminalGroupRelationController extends BaseController
      * 删除终端分组关系
      * 删除终端分组关系
      */
      */
     @ApiOperation("删除终端分组关系")
     @ApiOperation("删除终端分组关系")
-    @PreAuthorize("@ss.hasPermi('user:UserTerminalGroupRelation:remove')")
     @Log(title = "终端分组关系", businessType = BusinessType.DELETE)
     @Log(title = "终端分组关系", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Integer[] ids)
     public AjaxResult remove(@PathVariable Integer[] ids)