Merge remote-tracking branch 'origin/master'

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

@@ -14,6 +14,7 @@ spring:
             - Path=/admin/**
           filters:
             - StripPrefix=1
+
         - id: manage2
           uri: http://127.0.0.1:8099
           predicates:
@@ -21,6 +22,12 @@ spring:
           filters:
             - StripPrefix=1
 
+        - id: register2
+          uri: http://127.0.0.1:9090
+          predicates:
+            - Path=/register2/**
+          filters:
+            - StripPrefix=1
 logging:
   level:
     org.springframework.cloud.gateway: debug  # Gateway调试模式

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

@@ -47,7 +47,22 @@ public class SysAccountMultilevelController {
         return accountMultilevelService.findUserAccount(searchStr,pageNum,pageSize,userId);
 
     }
+    //下层组织
+   /* @PostMapping("/listSubordinate")
+    public Result listSubordinate(@RequestBody Map map , HttpServletRequest request){
+
 
+        int pageNum = (Integer)map.get("pageNum");
+        int pageSize = (Integer)map.get("pageSize");
+        String searchStr = (String)map.get("searchStr");
+//        String orgId  = (String)map.get("orgId");
+//        if (StringUtils.isBlank(orgId)){
+        String  orgId = TokenSign.getOrgId(request);
+//        }
+
+        return accountMultilevelService.listSubordinate(searchStr,pageNum,pageSize,orgId);
+
+    }*/
     @PostMapping("/listSubordinate")
     public Result listSubordinate(@RequestBody Map map , HttpServletRequest request){
 
@@ -57,7 +72,7 @@ public class SysAccountMultilevelController {
         String searchStr = (String)map.get("searchStr");
 //        String orgId  = (String)map.get("orgId");
 //        if (StringUtils.isBlank(orgId)){
-        String  orgId = TokenSign.getOrgId(request);
+        Integer  orgId = TokenSign.getMemberIdByJwtToken(request);
 //        }
 
         return accountMultilevelService.listSubordinate(searchStr,pageNum,pageSize,orgId);

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/service/ISysAccountMultilevelService.java

@@ -26,7 +26,8 @@ public interface ISysAccountMultilevelService extends IService<SysAccountMultile
 
     List<Integer> getAllChildId(String orgId);
 
-    Result listSubordinate(String searchStr, int pageNum, int pageSize, String orgId);
+//    Result listSubordinate(String searchStr, int pageNum, int pageSize, String orgId);
+    Result listSubordinate(String searchStr, int pageNum, int pageSize, Integer orgId);
 
     Result getLastFarmId(Integer userId);
 

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/service/impl/SysAccountMultilevelServiceImpl.java

@@ -111,8 +111,8 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
         return list;
     }
 
-    @Override
-    public Result listSubordinate(String searchStr, int pageNum, int pageSize, String orgId) {
+//    @Override
+  /*  public Result listSubordinate(String searchStr, int pageNum, int pageSize, String orgId) {
 
         QueryWrapper<SysAccountMultilevel> wrapper = new QueryWrapper<>();
 
@@ -136,8 +136,21 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
 
         IPage<SysAccountMultilevel> page = this.page(new Page<>(pageNum, pageSize), wrapper);
         return new Result(ResultCode.SUCCESS,page);
-    }
+    }*/
+    @Override
+    public Result listSubordinate(String searchStr, int pageNum, int pageSize, Integer orgId) {
+
+        QueryWrapper<SysAccountMultilevel> wrapper = new QueryWrapper<>();
+
+//        wrapper.ne("id",orgId);
+        wrapper.like("pids",orgId);
+        if (StringUtils.isNotBlank(searchStr)){
+            wrapper.like("user_name",searchStr).or().like("account",searchStr);
+        }
 
+        IPage<SysAccountMultilevel> page = this.page(new Page<>(pageNum, pageSize), wrapper);
+        return new Result(ResultCode.SUCCESS,page);
+    }
     @Override
     public Result getLastFarmId(Integer userId) {
         SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(userId);

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

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-process
 
   datasource:
-    url: jdbc:mysql://122.112.224.199:3306/huimv-eartag-smart2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/HuimvManageApplication.java

@@ -1,11 +1,13 @@
 package com.huimv.eartag2.manage2;
 
+import com.huimv.eartag2.common.config.InterceptorConfig;
 import com.huimv.eartag2.manage2.netty.EartagServer;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
 import org.springframework.web.client.RestTemplate;
 
 /**
@@ -18,6 +20,7 @@ import org.springframework.web.client.RestTemplate;
  **/
 @SpringBootApplication
 @MapperScan("com.huimv.eartag2.manage2.mapper")
+@Import(InterceptorConfig.class)
 public class HuimvManageApplication {
     public static void main(String[] args) throws InterruptedException {
 

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

@@ -1,12 +1,14 @@
 package com.huimv.eartag2.manage2.controller;
 
 
+import com.huimv.eartag2.common.common.token.TokenSign;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.manage2.service.BaseFarmService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -63,5 +65,27 @@ public class BaseFarmController {
         return baseFarmService.list(paramsMap);
     }
 
+    /**
+     * @description: 【查询】 根据账号查询所有牧场
+     * @author: 鱼余
+     * @param:
+     **/
+    @GetMapping("/listById")
+    public Result listById(HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        return baseFarmService.listById(userId);
+    }
+
+    /**
+     * @description: 【修改】 账号绑定牧场
+     * @author: 鱼余
+     * @param: paramsMap
+     **/
+    @PostMapping("/boundFarm")
+    public Result boundFarm(@RequestBody Map<String,String> paramsMap){
+
+        return baseFarmService.boundFarm(paramsMap);
+    }
+
 }
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/SysAccountMultilevelMapper.java

@@ -0,0 +1,18 @@
+package com.huimv.eartag2.manage2.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.eartag2.manage2.pojo.SysAccountMultilevel;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-10-14
+ */
+@Repository
+public interface SysAccountMultilevelMapper extends BaseMapper<SysAccountMultilevel> {
+
+}

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

@@ -0,0 +1,51 @@
+package com.huimv.eartag2.manage2.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class SysAccountMultilevel extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String account;
+
+    private String password;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+
+    private String pids;
+
+    private Integer accountStatus;
+
+    private String farmIds;
+
+    private String color;
+
+    private Boolean mode;
+
+    private Integer lastFarmId;
+
+    private String userName;
+    private Integer type;
+
+}

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

@@ -23,4 +23,8 @@ public interface BaseFarmService extends IService<BaseFarm> {
     Result update(Map<String, String> maps);
 
     Result list(Map<String,String> paramsMap);
+
+    Result listById(Integer userId);
+
+    Result boundFarm(Map<String, String> paramsMap);
 }

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

@@ -0,0 +1,21 @@
+package com.huimv.eartag2.manage2.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.manage2.pojo.SysAccountMultilevel;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-10-14
+ */
+public interface ISysAccountMultilevelService extends IService<SysAccountMultilevel> {
+
+
+
+}

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

@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.eartag2.manage2.mapper.SysAccountMultilevelMapper;
 import com.huimv.eartag2.manage2.pojo.BaseFarm;
 import com.huimv.eartag2.manage2.mapper.BaseFarmMapper;
 import com.huimv.eartag2.manage2.pojo.BasePigpen;
 import com.huimv.eartag2.manage2.pojo.BizBaseStage;
+import com.huimv.eartag2.manage2.pojo.SysAccountMultilevel;
 import com.huimv.eartag2.manage2.service.BaseFarmService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.eartag2.manage2.utils.IDUtil;
@@ -41,6 +43,9 @@ public class BaseFarmServiceImpl extends ServiceImpl<BaseFarmMapper, BaseFarm> i
     @Autowired
     private IDUtil idUtil;
 
+    @Autowired
+    private SysAccountMultilevelMapper accountMultilevelMapper;
+
     @Override
     public Result add(Map<String, String> maps) {
         String farmName = maps.get("farmName");
@@ -143,4 +148,24 @@ public class BaseFarmServiceImpl extends ServiceImpl<BaseFarmMapper, BaseFarm> i
         Page<BaseFarm> bizBaseStagePage = baseFarmMapper.selectPage(page, queryWrapper);
         return new Result(ResultCode.SUCCESS, bizBaseStagePage);
     }
+
+    @Override
+    public Result listById(Integer userId) {
+        if (userId== 1){
+            return new Result(ResultCode.SUCCESS,this.list());
+        }
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(userId);
+        String[] farmIds = sysAccountMultilevel.getFarmIds().split(",");
+        return new Result(ResultCode.SUCCESS,this.list(new QueryWrapper<BaseFarm>().in("farm_code",farmIds)));
+    }
+
+    @Override
+    public Result boundFarm(Map<String, String> paramsMap) {
+        String farmCodes = paramsMap.get("farmCodes");
+        String userId = paramsMap.get("userId");
+        SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(userId);
+        sysAccountMultilevel.setFarmIds(farmCodes);
+        accountMultilevelMapper.updateById(sysAccountMultilevel);
+        return new Result(10000,"绑定成功",true);
+    }
 }

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

@@ -0,0 +1,26 @@
+package com.huimv.eartag2.manage2.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.eartag2.manage2.mapper.SysAccountMultilevelMapper;
+import com.huimv.eartag2.manage2.pojo.SysAccountMultilevel;
+import com.huimv.eartag2.manage2.service.ISysAccountMultilevelService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-10-14
+ */
+@Service
+public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMultilevelMapper, SysAccountMultilevel> implements ISysAccountMultilevelService {
+
+
+
+
+}