数据大屏代码修正

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TDataDisplayController.java

@@ -284,25 +284,14 @@ public class TDataDisplayController extends BaseController {
         return result;
     }
 
-<<<<<<< HEAD
-    public String checkDeviceType(Integer device_model){
+    public String checkDeviceType(Integer device_model) {
         SysDictData date = new SysDictData();
         date.setDictType("sys_device_type");
         List<SysDictData> selectDictDataList = sysDictDataService.selectDictDataList(date);
-        for (SysDictData sysDictData : selectDictDataList){
-            if (device_model == Integer.parseInt(sysDictData.getDictValue())){
+        for (SysDictData sysDictData : selectDictDataList) {
+            if (device_model == Integer.parseInt(sysDictData.getDictValue())) {
                 return sysDictData.getDictLabel();
             }
-=======
-    public String checkDeviceType(Integer device_model) {
-        switch (device_model) {
-            case 0:
-                return "S8";
-            case 1:
-                return "X5";
-            default:
-                return "无效";
->>>>>>> c9056a51da1e5d78b74d6e682c7c9dfe7371603f
         }
         return "null";
     }