1-21 ------

xinda-open-api/src/main/java/com/xinda/data/controller/DeviceModelController.java

@@ -2,6 +2,7 @@ package com.xinda.data.controller;
 
 import com.xinda.common.core.controller.BaseController;
 import com.xinda.common.core.domain.AjaxResult;
+import com.xinda.common.core.domain.R;
 import com.xinda.common.core.page.TableDataInfo;
 import com.xinda.common.utils.poi.ExcelUtil;
 import com.xinda.iot.domain.DeviceModel;
@@ -25,19 +26,30 @@ import java.util.List;
 @RestController
 @RequestMapping("/iot/deviceModel")
 @Api(tags = "产品型号")
-public class DeviceModelController extends BaseController
-{
+public class DeviceModelController extends BaseController {
     @Autowired
     private IDeviceModelService deviceModelService;
 
-/**
- * 查询产品型号列表
- */
-@PreAuthorize("@ss.hasPermi('iot:model:list')")
-@GetMapping("/list")
-@ApiOperation("查询产品型号列表")
-    public TableDataInfo list(DeviceModel deviceModel)
+
+    /**
+     * 查询全部产品下拉框
+     * @return
+     */
+    @GetMapping("/getAllModel")
+    public R getAllModel()
     {
+        return R.ok(deviceModelService.selectDeviceModelList(new DeviceModel()));
+    }
+
+
+
+    /**
+     * 查询产品型号列表
+     */
+    @PreAuthorize("@ss.hasPermi('iot:model:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询产品型号列表")
+    public TableDataInfo list(DeviceModel deviceModel) {
         startPage();
         List<DeviceModel> list = deviceModelService.selectDeviceModelList(deviceModel);
         return getDataTable(list);
@@ -49,8 +61,7 @@ public class DeviceModelController extends BaseController
     @ApiOperation("导出产品型号列表")
     @PreAuthorize("@ss.hasPermi('iot:model:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, DeviceModel deviceModel)
-    {
+    public void export(HttpServletResponse response, DeviceModel deviceModel) {
         List<DeviceModel> list = deviceModelService.selectDeviceModelList(deviceModel);
         ExcelUtil<DeviceModel> util = new ExcelUtil<DeviceModel>(DeviceModel.class);
         util.exportExcel(response, list, "产品型号数据");
@@ -62,8 +73,7 @@ public class DeviceModelController extends BaseController
     @PreAuthorize("@ss.hasPermi('iot:model:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取产品型号详细信息")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(deviceModelService.selectDeviceModelById(id));
     }
 
@@ -73,8 +83,7 @@ public class DeviceModelController extends BaseController
     @PreAuthorize("@ss.hasPermi('iot:model:add')")
     @PostMapping
     @ApiOperation("新增产品型号")
-    public AjaxResult add(@RequestBody DeviceModel deviceModel)
-    {
+    public AjaxResult add(@RequestBody DeviceModel deviceModel) {
         deviceModel.setCreateTime(new Date());
         return toAjax(deviceModelService.insertDeviceModel(deviceModel));
     }
@@ -85,8 +94,7 @@ public class DeviceModelController extends BaseController
     @PreAuthorize("@ss.hasPermi('iot:model:edit')")
     @PutMapping
     @ApiOperation("修改产品型号")
-    public AjaxResult edit(@RequestBody DeviceModel deviceModel)
-    {
+    public AjaxResult edit(@RequestBody DeviceModel deviceModel) {
         return toAjax(deviceModelService.updateDeviceModel(deviceModel));
     }
 
@@ -96,8 +104,7 @@ public class DeviceModelController extends BaseController
     @PreAuthorize("@ss.hasPermi('iot:model:remove')")
     @DeleteMapping("/{ids}")
     @ApiOperation("删除产品型号")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(deviceModelService.deleteDeviceModelByIds(ids));
     }
 }

xinda-open-api/src/main/java/com/xinda/data/controller/GroupController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.xinda.common.core.domain.R;
 import com.xinda.iot.domain.DeviceGroup;
 import com.xinda.iot.model.DeviceGroupInput;
 import io.swagger.annotations.Api;
@@ -29,7 +30,7 @@ import com.xinda.common.core.page.TableDataInfo;
 
 /**
  * 设备分组Controller
- * 
+ *
  * @author kerwincui
  * @date 2021-12-16
  */
@@ -41,6 +42,16 @@ public class GroupController extends BaseController
     @Autowired
     private IGroupService groupService;
 
+
+    /**
+     * 所属项目下拉框数据
+     */
+    @GetMapping("/getAllGroupList")
+    public R getAllGroupList()
+    {
+        return R.ok(groupService.selectGroupList(new Group()));
+    }
+
     /**
      * 查询设备分组列表
      */