后台登录

admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysUserController.java

@@ -49,22 +49,34 @@ public class SysUserController {
 
     @PostMapping(value = "/login")
     public Result loginMultilevel(HttpServletRequest req, @RequestBody Map<String, String> map) {
-
+        String remoteHost = req.getRemoteHost();
         Result result = iSysUserService.loginMultilevel(req, map);
         AccessToken accessToken = new AccessToken();
         if (result.getCode() == 10000) {
             SysUser user = (SysUser) result.getData();
             accessToken.setAccountName(user.getUserName());
             accessToken.setCreated(new Date());
-            accessToken.setLoginIp(user.getLastIp());
             accessToken.setType(user.getUserType());
             accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(),user.getId()));
+
+            accessToken.setCode(result.getCode());
+            accessToken.setMessage(result.getMessage());
+
+            accessToken.setUserId(user.getId());
+            accessToken.setPhone(user.getPhone());
+
+            accessToken.setLoginIp(remoteHost);
         }
         if (result.getCode() == 10004) {
             accessToken.setAccountName("游客");
             accessToken.setCreated(new Date());
             accessToken.setToken(TokenSign.sign("游客", map.get("phone"),null));
             accessToken.setLoginIp("");
+            accessToken.setCode(result.getCode());
+            accessToken.setMessage(result.getMessage());
+
+
+            accessToken.setLoginIp(remoteHost);
         }
         if (result.getCode() == 10001) {
             return iSysUserService.loginMultilevel(req, map);

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillIsolatedServiceImpl.java

@@ -101,7 +101,11 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     String substring = start.substring(0, start.length() - end.length());
                     System.out.println(substring);
                     List<String> eartagNos = new ArrayList<>();
-                    for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
+                    //TODO
+                    if (Integer.parseInt(substring1) >Integer.parseInt(end) ){
+                        return new Result(10001,"耳标号格式错误",false);
+                    }
+                    for (int i = Integer.parseInt(substring1); i <=  Integer.valueOf(end); i++){
                         eartagNos.add(substring+i);
                     }
                     for (String eartagNo : eartagNos) {

admin/src/main/resources/application-dev.yml

@@ -8,6 +8,10 @@ server:
 spring:
   application:
     name: huimv-damsubsidy
+  servlet:
+    multipart:
+      max-request-size: 100MB
+      max-file-size: 10MB
 
   datasource:
     druid: