优化牧场管理

huimv-cattle/src/main/java/com/huimv/cattle/service/impl/SysFarmServiceImpl.java

@@ -267,14 +267,21 @@ public class SysFarmServiceImpl extends ServiceImpl<SysFarmMapper, SysFarm> impl
         }
         //读取模式切换
         DataSource dataSource = dataSourceService.getDataSourceStatus();
-        //view=2,显示镇汇总数据
-        if (dataSource.getDsStatus() == 1) {
-            //status=1,显示镇（手填）数据
-            return stockService.getAllTownStock(request, allTownsJa);
-        } else {
-            //status=2,显示镇汇总（养殖云）数据
+        if (dataSource.getDsStatus() == 2){
             return getStockFromBreedCloud(allTownsJa);
+        }else if (dataSource.getViewType() == 3){
+            return null;
+        }else {
+            return stockService.getAllTownStock(request, allTownsJa);
         }
+//        //view=2,显示镇汇总数据
+//        if (dataSource.getDsStatus() == 1) {
+//            //status=1,显示镇（手填）数据
+//            return stockService.getAllTownStock(request, allTownsJa);
+//        } else {
+//            //status=2,显示镇汇总（养殖云）数据
+//            return getStockFromBreedCloud(allTownsJa);
+//        }
     }
 
     @Override

huimv-cattle/src/main/java/com/huimv/cattle/service/impl/SysUserAccountServiceImpl.java

@@ -496,6 +496,9 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             //牧场状态不能为注销状态(2)
             return new Result(ConstUtil.ERR_FARM_CANCEL_CODE, ConstUtil.ERR_FARM_CANCEL_INFO, false);
         }
+        if (!"jingning".equals(accountName)){
+            return Result.ERROR();
+        }
 
         //判断服务状态
         Integer accountClass = resultSysUserAccount.getAccountClass();