栋舍修改

huimv-admin/src/main/java/com/huimv/admin/controller/BasePigpenController.java

@@ -45,6 +45,7 @@ public class BasePigpenController {
         String parentIds = byId.getOther2() + "," + basePigpen.getParentId();
         basePigpen.setFType(3);
         basePigpen.setOther2(parentIds);
+        basePigpen.setOther3("0");
         if ( basePigpenService.save(basePigpen)){
             return ResultUtil.addResult(1);
         }
@@ -77,6 +78,8 @@ public class BasePigpenController {
     @RequestMapping(value = "/list",method = RequestMethod.POST)
     public Result list(@RequestBody Map<String, Object> paramsMap) {
         System.out.println("paramsMap>>"+paramsMap.toString());
+        String type = paramsMap.get("type").toString();
+
         String farmCode = "";
         if (paramsMap.get("farmId") != null) {
             farmCode = paramsMap.get("farmId")+"";
@@ -89,6 +92,6 @@ public class BasePigpenController {
         if (paramsMap.get("buildName") != null) {
             buildName = paramsMap.get("buildName")+"";
         }
-        return basePigpenService.list(farmCode,buildName,stageCode);
+        return basePigpenService.list(farmCode,buildName,stageCode,type);
     }
 }

huimv-admin/src/main/java/com/huimv/admin/service/IBasePigpenService.java

@@ -17,7 +17,7 @@ import java.util.Map;
  */
 public interface IBasePigpenService extends IService<BasePigpen> {
 
-    Result list(String farmCode, String buildName, String stageCode);
+    Result list(String farmCode, String buildName, String stageCode,String type);
 
     Result addPigpen(BasePigpenDto basePigpenDto);
 

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

@@ -127,11 +127,12 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
     }
 
     @Override
-    public Result list(String farmCode, String buildName, String stageCode) {
+    public Result list(String farmCode, String buildName, String stageCode, String type) {
         QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(buildName), "build_name", buildName);
         queryWrapper.like(StringUtils.isNotBlank(stageCode), "stage_code", stageCode);
         queryWrapper.eq(StringUtils.isNotBlank(farmCode), "farm_id", farmCode);
+        queryWrapper.eq("other3", type);
         queryWrapper.orderByAsc("sort");
         //创建排序
         List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);

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

@@ -266,7 +266,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         JSONArray jsonArray = new JSONArray();
 
         QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq("f_type", 2);
+        queryWrapper.eq("farm_id", farmId).eq("f_type", 2).eq("other3",1);
         List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
         for (BasePigpen pigpen : pigpens) {
             Float value = 0.00f;
@@ -405,7 +405,8 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         if (energyFeedDataVos.size() != 0) {
             for (EnergyAllDataVo energyFeedDataVo : energyFeedDataVos) {
                 Double feed = Double.valueOf(energyFeedDataVo.getValue());
-                energyFeedDataVo.setValue(String.valueOf(feed/1000));
+                DecimalFormat def = new DecimalFormat("0.00");
+                energyFeedDataVo.setValue(def.format(feed/1000));
             }
         }
         jsonObject.put("feed", energyFeedDataVos);
@@ -427,7 +428,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         JSONArray jsonArray = new JSONArray();
 
         QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
-        basePigpenQueryWrapper.eq("farm_id", farmId).eq("f_type", 2);
+        basePigpenQueryWrapper.eq("farm_id", farmId).eq("f_type", 2).eq("other3",1);
         List<BasePigpen> basePigpenList = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的楼层
         Float value = 0.00f;
         for (BasePigpen basePigpen : basePigpenList) {

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

@@ -78,7 +78,7 @@ public class EnergyEnvDeviceServiceImpl extends ServiceImpl<EnergyEnvDeviceMappe
         String deviceName = energyEnvDevice.getDeviceName();
 
         QueryWrapper<EnergyEnvDevice> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq(StringUtils.isNotBlank(deviceName),"device_name", deviceName).ne("id",energyEnvDevice.getId());
+        queryWrapper1.eq(StringUtils.isNotBlank(deviceName),"device_name", deviceName).ne("id",energyEnvDevice.getId()) .eq("farm_id",energyEnvDevice.getFarmId());
 
         Integer count = energyEnvDeviceMapper.selectCount(queryWrapper1);
         if (count>0) {

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

@@ -57,7 +57,7 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
 
         JSONArray jsonArray = new JSONArray();
         QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
-        basePigpenQueryWrapper.eq("farm_id", farmId).like("other2", id);
+        basePigpenQueryWrapper.eq("farm_id", farmId).like("other2", id).eq("other3",1);
         List<BasePigpen> basePigpenList = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的单元
         for (BasePigpen basePigpen : basePigpenList) {
             JSONObject jsonObject = new JSONObject();

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

@@ -181,7 +181,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         }
         JSONArray jsonArray = new JSONArray();
         QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId);
+        queryWrapper.eq("farm_id", farmId).eq("other3", 1);
         if (id == null || id == "") {
             queryWrapper.eq("parent_id", 3);
         } else {
@@ -480,7 +480,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         List objects = new ArrayList<>();
         if ("0".equals(displayType)) {
             QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("farm_id", farmId).eq("f_type", 3);
+            queryWrapper1.eq("farm_id", farmId).eq("f_type", 3).eq("other3",0);
             List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper1);
             for (BasePigpen basePigpen : basePigpens) {
                 JSONObject jsonObject = new JSONObject();