生物防控人员

huimv-receive/src/main/java/com/huimv/receive/controller/LoginController.java

@@ -132,6 +132,52 @@ public class LoginController {
         return token;
     }
 
+    @PostMapping(value = "/loginMultilevelClent")
+    public Result loginMultilevelClent(HttpServletRequest req, @RequestBody Map<String, String> map) {
+
+
+        String accountName = map.get("accountName");
+        String password = map.get("password");
+//        String code = map.get("code");
+
+        String remoteHost = req.getRemoteHost();
+
+//        String redisCode = redisTemplate.opsForValue().get(remoteHost);
+//        if (redisCode == null) {
+//            return  new Result(10005,"验证码过期,点击刷新",false);
+//        }
+//        if (!redisCode.equals(code.toUpperCase())) {
+//            return  new Result(10006,"验证码错误,登录失败",false);
+//        }
+        // 未对密码加密
+        Result result = iLoginService.loginMultilevelClient(accountName, password);
+        if (result.getCode() == 10000) {
+
+            SysAccountMultilevel accountEntity = (SysAccountMultilevel) result.getData();
+            Integer id = accountEntity.getId();
+            IpTools.getRemoteHost(req);
+            AccessToken accessToken = new AccessToken();
+            accessToken.setCreated(new Date());
+            accessToken.setAccountName(accountName);
+            accessToken.setFarmId(accountEntity.getFarmIds());
+            String token = TokenSign.sign(accountName, id, accountEntity.getFarmIds(), null, null);
+            accessToken.setToken(token);
+
+            accessToken.setId(id);
+            accessToken.setLoginIp(remoteHost);
+            accessToken.setType(accountEntity.getType());
+            Integer lastFarmId = accountEntity.getLastFarmId();
+            if (ObjectUtil.isEmpty(lastFarmId)) {
+                lastFarmId = Integer.parseInt(accountEntity.getFarmIds().split(",")[0]);
+            }
+            accessToken.setLastFarmId(lastFarmId);
+            accessToken.setUserName(accountEntity.getUserName());
+
+            return new Result(ResultCode.SUCCESS, accessToken);
+        }
+        return result;
+    }
+
     @RequestMapping("/logoutClient")
     public Result logoutClient(HttpServletRequest req, @RequestBody Map<String, String> map) {
         String accountName = map.get("accountName");

huimv-receive/src/main/java/com/huimv/receive/entity/vo/BaseProcessByLocationVo.java

@@ -10,7 +10,7 @@ public class BaseProcessByLocationVo {
     private Integer id;
 
     private String farmId;
-    private String pcrType;
+    private Integer pcrType;
     private String passUserName;
     private String qualifiedDate;
 

huimv-receive/src/main/java/com/huimv/receive/service/ILoginService.java

@@ -9,4 +9,6 @@ public interface ILoginService {
     Result logout();
 
     Result loginMultilevel(String accountName, String password);
+
+    Result loginMultilevelClient(String accountName, String password);
 }

huimv-receive/src/main/java/com/huimv/receive/service/impl/LoginServiceImpl.java

@@ -33,6 +33,24 @@ public class LoginServiceImpl implements ILoginService {
             return new Result(10001, "账号不存在或密码错误.", false);
         }
 
+        if (accountMultilevel.getAccountStatus() == 0){
+            return new Result(10002, "账号未启用.", false);
+        }
+        return new Result(ResultCode.SUCCESS,accountMultilevel);
+    }
+
+    @Override
+    public Result loginMultilevelClient(String accountName, String password) {
+        QueryWrapper<SysAccountMultilevel> wrapper = new QueryWrapper<>();
+        wrapper.eq("account",accountName).eq("password",password);
+        SysAccountMultilevel accountMultilevel = accountMultilevelMapper.selectOne(wrapper);
+
+        if (ObjectUtil.isEmpty(accountMultilevel)){
+            return new Result(10001, "账号不存在或密码错误.", false);
+        }
+        if (accountMultilevel.getType()!=0){
+            return new Result(10001, "用户类型不匹配.", false);
+        }
 
         if (accountMultilevel.getAccountStatus() == 0){
             return new Result(10002, "账号未启用.", false);