Browse Source

后台修改2

wwh 1 year ago
parent
commit
f5b6299fab

+ 10 - 0
huimv-receive/src/main/java/com/huimv/receive/controller/BaseDeviceController.java

@@ -67,4 +67,14 @@ public class BaseDeviceController {
         return deviceService.listCount(httpServletRequest, paramsMap);
     }
 
+    @PostMapping("/delete")
+    public Result delete(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+        String ids = paramsMap.get("ids");
+        String[] split = ids.split(",");
+        for (String s : split) {
+            deviceService.removeById(s);
+        }
+        return new Result(10000,"删除成功!",true);
+    }
+
 }

+ 6 - 1
huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseDeviceServiceImpl.java

@@ -66,7 +66,12 @@ public class BaseDeviceServiceImpl extends ServiceImpl<BaseDeviceMapper, BaseDev
         queryWrapper1.eq("device_status", 1);
         Integer count1 = deviceMapper.selectCount(queryWrapper1);//离线
         Integer allCount = count + count1;
-        Double rank = (Double.valueOf(count.toString()) / Double.valueOf(allCount.toString())) * 100;
+        Double rank;
+        if (allCount == 0 || allCount == null) {
+            rank  = Double.valueOf("0");
+        } else {
+            rank = (Double.valueOf(count.toString()) / Double.valueOf(allCount.toString())) * 100;
+        }
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("count", allCount);
         jsonObject.put("count1", count);

+ 7 - 1
huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanServiceImpl.java

@@ -952,7 +952,13 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         queryWrapper1.eq("bill_status", 2);
         Integer count1 = billCleanMapper.selectCount(queryWrapper1);//异常
         Integer allCount = count + count1;
-        Double rank = (Double.valueOf(count.toString()) / Double.valueOf(allCount.toString())) * 100;
+        Double rank;
+        if (allCount == 0 || allCount == null) {
+            rank = Double.valueOf("0");
+        } else {
+            rank = (Double.valueOf(count.toString()) / Double.valueOf(allCount.toString())) * 100;
+        }
+
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("count", allCount);
         jsonObject.put("count1", count);