修改权限bug

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnergyEnvDeviceServiceImpl.java

@@ -55,21 +55,20 @@ public class EnergyEnvDeviceServiceImpl extends ServiceImpl<EnergyEnvDeviceMappe
         queryWrapper.eq("device_name", energyEnvDevice.getDeviceName()).eq("farm_id",energyEnvDevice.getFarmId());
         Integer count = energyEnvDeviceMapper.selectCount(queryWrapper);
         if (count>0) {
-            return new Result(ResultCode.FAIL, "设备名称已存在");
+            return new Result(10001,"设备名称已存在",false);
         }
         queryWrapper.clear();
         queryWrapper.eq("device_code", energyEnvDevice.getDeviceCode()).eq("farm_id",energyEnvDevice.getFarmId());
         Integer count1= energyEnvDeviceMapper.selectCount(queryWrapper);
         if (count1>0) {
-            return new Result(ResultCode.FAIL, "设备id已存在");
+            return new Result(10001,"设备id已存在",false);
         }
         queryWrapper.clear();
         queryWrapper.eq("unit_id", energyEnvDevice.getUnitId()).eq("farm_id",energyEnvDevice.getFarmId());
         Integer count2= energyEnvDeviceMapper.selectCount(queryWrapper);
         if (count2>0) {
-            return new Result(ResultCode.FAIL, "该单元已绑定栋舍");
+            return new Result(10001,"该单元已绑定设备",false);
         }
-
         energyEnvDeviceMapper.insert(energyEnvDevice);
         return new Result(ResultCode.SUCCESS,"添加成功");
     }
@@ -83,19 +82,19 @@ public class EnergyEnvDeviceServiceImpl extends ServiceImpl<EnergyEnvDeviceMappe
 
         Integer count = energyEnvDeviceMapper.selectCount(queryWrapper1);
         if (count>0) {
-            return new Result(ResultCode.FAIL, "设备名称已存在");
+            return new Result(10001,"设备名称已存在",false);
         }
         queryWrapper1.clear();
         queryWrapper1.eq("device_code", energyEnvDevice.getDeviceCode()).eq("farm_id",energyEnvDevice.getFarmId()).ne("id",energyEnvDevice.getId());
         Integer count1= energyEnvDeviceMapper.selectCount(queryWrapper1);
         if (count1>0) {
-            return new Result(ResultCode.FAIL, "设备id已存在");
+            return new Result(10001,"设备id已存在",false);
         }
         queryWrapper1.clear();
         queryWrapper1.eq("unit_id", energyEnvDevice.getUnitId()).eq("farm_id",energyEnvDevice.getFarmId()).ne("id",energyEnvDevice.getId());
         Integer count2= energyEnvDeviceMapper.selectCount(queryWrapper1);
         if (count2>0) {
-            return new Result(ResultCode.FAIL, "该单元已绑定栋舍");
+            return new Result(10001,"该单元已绑定设备",false);
         }
          energyEnvDeviceMapper.updateById(energyEnvDevice);
         return new Result(ResultCode.SUCCESS);

huimv-admin/src/main/java/com/huimv/admin/service/impl/ProdStockServiceImpl.java

@@ -2,6 +2,7 @@ package com.huimv.admin.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -71,25 +72,41 @@ public class ProdStockServiceImpl extends ServiceImpl<ProdStockMapper, ProdStock
         QueryWrapper<ProdStock> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("farm_id", farmId).orderByDesc("creat_time").last(" limit 1");
         ProdStock prodStock = prodStockMapper.selectOne(queryWrapper1);
-        Integer count = prodStock.getMzcl() + prodStock.getGzcl() + prodStock.getBrzcl() + prodStock.getByzcl() + prodStock.getYfzcl() +
-                prodStock.getHbzcl() + prodStock.getRszcl() + prodStock.getBrmzcl() + prodStock.getKhzcl() + prodStock.getSpzcl();
-        NumberFormat nt = NumberFormat.getPercentInstance();
-        nt.setMinimumFractionDigits(2);
-
         ProdStockVo prodStockVo = new ProdStockVo();
-        prodStockVo.setCount(count);
+        prodStockVo.setCount(0);
         prodStockVo.setProdStock(prodStock);
         prodStockVo.setProdStocks(prodStocks);
-        prodStockVo.setMzclTRate(nt.format((double)prodStock.getMzcl()/count));
-        prodStockVo.setGzclTRate(nt.format((double) prodStock.getGzcl() / count));
-        prodStockVo.setBrzclTRate(nt.format((double) prodStock.getBrzcl() / count));
-        prodStockVo.setByzclTRate(nt.format((double) prodStock.getByzcl() / count));
-        prodStockVo.setYfzclRate(nt.format((double) prodStock.getYfzcl() / count));
-        prodStockVo.setHbzclRate(nt.format((double) prodStock.getHbzcl() / count));
-        prodStockVo.setRczclTRate(nt.format((double) prodStock.getRszcl() / count));
-        prodStockVo.setBrmzclRate(nt.format((double) prodStock.getBrmzcl() / count));
-        prodStockVo.setKhzclRate(nt.format((double) prodStock.getKhzcl() / count));
-        prodStockVo.setSpzclRate(nt.format((double) prodStock.getSpzcl() / count));
+        prodStockVo.setMzclTRate("0");
+        prodStockVo.setGzclTRate("0");
+        prodStockVo.setBrzclTRate("0");
+        prodStockVo.setByzclTRate("0");
+        prodStockVo.setYfzclRate("0");
+        prodStockVo.setHbzclRate("0");
+        prodStockVo.setRczclTRate("0");
+        prodStockVo.setBrmzclRate("0");
+        prodStockVo.setKhzclRate("0");
+        prodStockVo.setSpzclRate("0");
+        Integer count = 0;
+        if (ObjectUtil.isNotEmpty(prodStock)){
+            count =prodStock.getMzcl() + prodStock.getGzcl() + prodStock.getBrzcl() + prodStock.getByzcl() + prodStock.getYfzcl() +
+                    prodStock.getHbzcl() + prodStock.getRszcl() + prodStock.getBrmzcl() + prodStock.getKhzcl() + prodStock.getSpzcl();
+            NumberFormat nt = NumberFormat.getPercentInstance();
+            nt.setMinimumFractionDigits(2);
+            prodStockVo.setCount(count);
+            prodStockVo.setProdStock(prodStock);
+            prodStockVo.setProdStocks(prodStocks);
+            prodStockVo.setMzclTRate(nt.format((double)prodStock.getMzcl()/count));
+            prodStockVo.setGzclTRate(nt.format((double) prodStock.getGzcl() / count));
+            prodStockVo.setBrzclTRate(nt.format((double) prodStock.getBrzcl() / count));
+            prodStockVo.setByzclTRate(nt.format((double) prodStock.getByzcl() / count));
+            prodStockVo.setYfzclRate(nt.format((double) prodStock.getYfzcl() / count));
+            prodStockVo.setHbzclRate(nt.format((double) prodStock.getHbzcl() / count));
+            prodStockVo.setRczclTRate(nt.format((double) prodStock.getRszcl() / count));
+            prodStockVo.setBrmzclRate(nt.format((double) prodStock.getBrmzcl() / count));
+            prodStockVo.setKhzclRate(nt.format((double) prodStock.getKhzcl() / count));
+            prodStockVo.setSpzclRate(nt.format((double) prodStock.getSpzcl() / count));
+        }
+
         return new Result(ResultCode.SUCCESS,prodStockVo);
     }