采集器添加修改2

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/controller/LoginController.java

@@ -104,7 +104,7 @@ public class LoginController {
             accessToken.setCode(result.getCode());
             accessToken.setMessage(result.getMessage());
             accessToken.setFarmId(accountEntity.getFarmIds());
-            String token = TokenSign.sign(accountName,id,accountEntity.getFarmIds(),accountEntity.getOrgId()+"");
+            String token = TokenSign.sign(accountName,id,accountEntity.getFarmIds(),accountEntity.getPids()+"");
             accessToken.setToken(token);
 
             accessToken.setId(id);

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

@@ -6,6 +6,7 @@ import com.huimv.eartag2.manage2.service.BaseFarmService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -28,8 +29,8 @@ public class BaseFarmController {
      * @param: maps
      **/
     @PostMapping("/add")
-    public Result addConfig(@RequestBody Map<String, String> maps){
-        return baseFarmService.add(maps);
+    public Result addConfig(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> maps){
+        return baseFarmService.add(httpServletRequest,maps);
     }
 
     /**

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

@@ -4,6 +4,7 @@ import com.huimv.eartag2.manage2.pojo.BaseFarm;
 import com.huimv.eartag2.common.utils.Result;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -15,13 +16,13 @@ import java.util.Map;
  * @since 2022-07-27
  */
 public interface BaseFarmService extends IService<BaseFarm> {
-    Result add(Map<String, String> mapList);
+    Result add(HttpServletRequest httpServletRequest,Map<String, String> mapList);
 
     Result remove(String id);
 
     Result update(Map<String, String> maps);
 
-    Result list(Map<String,String> paramsMap);
+    Result list(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 
 
 }

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

@@ -2,6 +2,7 @@ package com.huimv.eartag2.manage2.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.eartag2.common.common.token.TokenSign;
 import com.huimv.eartag2.manage2.pojo.BaseFarm;
 import com.huimv.eartag2.manage2.utils.IDUtil;
 import com.huimv.eartag2.manage2.utils.ResultUtil;
@@ -16,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -44,7 +46,7 @@ public class BaseFarmServiceImpl extends ServiceImpl<BaseFarmMapper, BaseFarm> i
     private SysAccountMultilevelMapper accountMultilevelMapper;
 
     @Override
-    public Result add(Map<String, String> maps) {
+    public Result add(HttpServletRequest httpServletRequest, Map<String, String> maps) {
         String farmName = maps.get("farmName");
         String leader = maps.get("leader");
         String phone = maps.get("phone");
@@ -56,7 +58,12 @@ public class BaseFarmServiceImpl extends ServiceImpl<BaseFarmMapper, BaseFarm> i
         String code1 = maps.get("code");
         String farmCode = createFarmCode(areaCode);
 
+        String orgId = TokenSign.getOrgId(httpServletRequest);
+        Integer id = TokenSign.getMemberIdByJwtToken(httpServletRequest);
+        String uids = id + "," + orgId;
+
         BaseFarm baseFarm = new BaseFarm();
+        baseFarm.setRemark(uids);
         baseFarm.setAreaCode(areaCode);
         baseFarm.setCode1(code1);
         baseFarm.setFarmCode(farmCode);
@@ -127,7 +134,9 @@ public class BaseFarmServiceImpl extends ServiceImpl<BaseFarmMapper, BaseFarm> i
     }
 
     @Override
-    public Result list(Map<String, String> paramsMap) {
+    public Result list(HttpServletRequest httpServletRequest,Map<String, String> paramsMap) {
+        Integer id = TokenSign.getMemberIdByJwtToken(httpServletRequest);//登录用户id
+
         String farmName = paramsMap.get("farmName");
         String farmCode = paramsMap.get("farmCode");
         String code1 = paramsMap.get("code");
@@ -141,6 +150,7 @@ public class BaseFarmServiceImpl extends ServiceImpl<BaseFarmMapper, BaseFarm> i
         queryWrapper.like(StringUtils.isNotBlank(farmCode), "farm_code", farmCode);
         queryWrapper.like(StringUtils.isNotBlank(areaCode), "area_code", areaCode);
         queryWrapper.like(StringUtils.isNotBlank(leader), "leader", leader);
+        queryWrapper.like("remark", id);
         Page<BaseFarm> bizBaseStagePage = baseFarmMapper.selectPage(page, queryWrapper);
         return new Result(ResultCode.SUCCESS, bizBaseStagePage);
     }