001001

beeboxs/src/main/java/com/huimv/beeboxs/dahuaVideo/controller/SetDahuaAccountToFarmInfoController.java

@@ -3,8 +3,10 @@ package com.huimv.beeboxs.dahuaVideo.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.beeboxs.common.utils.Result;
 import com.huimv.beeboxs.common.utils.ResultCode;
+import com.huimv.beeboxs.entity.BaseHiveFarm;
 import com.huimv.beeboxs.entity.FarmVideoAccount;
 import com.huimv.beeboxs.entity.HiveBaseStation;
+import com.huimv.beeboxs.mapper.BaseHiveFarmMapper;
 import com.huimv.beeboxs.mapper.FarmVideoAccountMapper;
 import com.huimv.beeboxs.mapper.HiveBaseStationMapper;
 import com.huimv.beeboxs.service.FarmVideoAccountService;
@@ -35,7 +37,12 @@ public class SetDahuaAccountToFarmInfoController {
     @Autowired
     private IBaseHiveFarmService  iBaseHiveFarmService;
 
- 
+    @Autowired
+    private BaseHiveFarmMapper baseHiveFarmMapper;
+
+
+    @Autowired
+    private IBaseHiveFarmService farmService;
 
     @Autowired
     private IHiveBaseStationService baseStationService;
@@ -49,11 +56,11 @@ public class SetDahuaAccountToFarmInfoController {
     @Autowired
     private FarmVideoAccountService   farmVideoAccountService;
 
-    /**
+   /* *//**
      * 给牧场绑定大华账户
      * @param map
      * @return
-     */
+     *//*
     @PostMapping("/showDahuaaccount")
     public Result changeDirection(@RequestBody Map map) {
 
@@ -64,33 +71,31 @@ public class SetDahuaAccountToFarmInfoController {
         return new Result(ResultCode.SUCCESS, farmVideoAccounts);
 
     }
-
+*/
 
         /**
          * 给牧场绑定大华账户  账号唯一
          * @param map
          * @return
          */
-        @PostMapping("/addDahuaAccount")
+        @PostMapping("/addOrUpdateDahuaAccount")
         public Result addDahuaaccount(@RequestBody Map map){
 
-            QueryWrapper<FarmVideoAccount> FarmVideoAccountQueryWrapper = new QueryWrapper<>();
-            FarmVideoAccountQueryWrapper.eq("farm_id",map.get("farmId"));
-            FarmVideoAccount farmVideoAccounts = farmVideoAccountMapper.selectOne(FarmVideoAccountQueryWrapper);
-            if(farmVideoAccounts!=null){
-                return new Result(ResultCode.FAIL,"一个牧场只能绑定一个账号, 请勿重复添加");
-            }
-            FarmVideoAccount farmVideoAccount = new FarmVideoAccount();
-            farmVideoAccount.setFarmId((Integer)map.get("farmId"));
-            farmVideoAccount.setDahuaAppid((String) map.get("DahuaAppid"));
-            farmVideoAccount.setDahuaSecret((String) map.get("DahuaSecret"));
-            farmVideoAccount.setFarmName( iBaseHiveFarmService.getById((Integer)map.get("farmId")).getFarmName());
-            farmVideoAccount.setRemark((String) map.get("Remark"));
-            farmVideoAccountService.save(farmVideoAccount);
+              //直接找到
+            QueryWrapper<BaseHiveFarm> BaseHiveFarmQueryWrapper = new QueryWrapper<>();
+            BaseHiveFarmQueryWrapper.eq("id",map.get("farmId"));
+            BaseHiveFarm baseHiveFarm = baseHiveFarmMapper.selectOne(BaseHiveFarmQueryWrapper);
+            baseHiveFarm.setDahuaAppid((String) map.get("DahuaAppid"));
+            baseHiveFarm.setDahuaSecret((String) map.get("DahuaSecret"));
+            iBaseHiveFarmService.updateById(baseHiveFarm);
             return new Result(ResultCode.SUCCESS  );
-
 }
 
+
+
+
+
+
     /**
      * 给牧场绑定大华账户
      * @param

beeboxs/src/main/java/com/huimv/beeboxs/entity/BaseHiveFarm.java

@@ -35,6 +35,15 @@ public class BaseHiveFarm implements Serializable {
     private String frontLocation;
 
     private Boolean rowStatus;
-
+    
+    /**
+     * 账户Id
+     */
+    private String dahuaAppid;
+
+    /**
+     * 密码
+     */
+    private String  dahuaSecret ;
 
 }