【feat】 设置领养人

huimv-eartag2-platform/gateway/src/main/resources/application-dev.yml

@@ -16,7 +16,7 @@ spring:
             - StripPrefix=1
 
         - id: manage2
-          uri: http://127.0.0.1:8099
+          uri: httsetPigpen8099
           predicates:
             - Path=/manage2/**
           filters:

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/BaseFarmerController.java

@@ -2,6 +2,7 @@ package com.huimv.eartag2.manage2.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.common.utils.ResultCode;
 import com.huimv.eartag2.manage2.service.BaseFarmerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -46,6 +47,11 @@ public class BaseFarmerController {
     public Result listByFarmCode(@RequestBody Map<String, Object> paramsMap) throws ParseException {
         return baseFarmerService.list(paramsMap);
     }
+    @PostMapping("/listAll")
+    public Result listAll() {
+        return new Result(ResultCode.SUCCESS, baseFarmerService.list());
+    }
+
 
 //    @PostMapping("/getLastAdoptByFarmCode")
 //    public Result getLastAdoptByFarmCode(@RequestBody Map<String, Object> paramsMap) throws ParseException {

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagDeviceRegisterController.java

@@ -35,6 +35,11 @@ public class EartagDeviceRegisterController {
         return eartagDeviceRegisterService.set(maps);
     }
 
+
+    @PostMapping("/setFarmer")
+    public Result setFarmer(@RequestBody List<Map<String, Integer>> maps){
+        return eartagDeviceRegisterService.setFarmer(maps);
+    }
     /**
      * @description: 【删除】
      * @author: 静静

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/OpenController.java

@@ -0,0 +1,32 @@
+package com.huimv.eartag2.manage2.controller;
+
+
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.manage2.service.IEartagEartagRegisterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("/pig")
+public class OpenController {
+
+
+
+    @Autowired
+    private IEartagEartagRegisterService eartagEartagRegisterService;
+
+    @PostMapping
+    public Result getNewPig(@RequestBody Map<String,String> map){
+        String areaId = map.get("areaId");
+
+        return null;
+    }
+
+
+
+}

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/EartagDeviceRegister.java

@@ -77,5 +77,6 @@ public class EartagDeviceRegister implements Serializable {
 
 
     private Integer upgrade;
+    private Integer farmerId;
 
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/EartagDeviceRegisterService.java

@@ -30,4 +30,6 @@ public interface EartagDeviceRegisterService extends IService<EartagDeviceRegist
     Result cancel(String ids);
 
     Result getDeviceCode(String farmCode);
+
+    Result setFarmer(List<Map<String, Integer>> maps);
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagDeviceRegisterServiceImpl.java

@@ -71,6 +71,21 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
     }
 
     @Override
+    public Result setFarmer(List<Map<String, Integer>> mapList) {
+        ArrayList<Integer> ids = new ArrayList<>();
+        for (Map<String, Integer> map : mapList) {
+            Integer id = map.get("id");
+            Integer farmerId = map.get("farmerId");
+            EartagDeviceRegister deviceRegister = new EartagDeviceRegister();
+            deviceRegister.setId(id);
+            deviceRegister.setFarmerId(farmerId);
+            eartagDeviceRegisterMapper.updateById(deviceRegister);
+        }
+
+        return resultUtil.result(1);
+    }
+
+    @Override
     public Result remove(String ids) {
         List<Integer> convert = idUtil.convert(ids);
         return resultUtil.result(eartagDeviceRegisterMapper.deleteBatchIds(convert));

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/SysBaseConfigServiceImpl.java

@@ -285,11 +285,9 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
             sysBaseConfigEntity.setRowId(rowId);
             sysBaseConfigMapper.insert(sysBaseConfigEntity);
         }else {
-            rowId  =baseConfig.getRowId();
+            rowId  = baseConfig.getRowId();
         }
 
-
-
         wrapper.clear();
         wrapper.eq("config_key","eartagMaxTem");
         wrapper.eq("row_id",rowId);