接口1

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

@@ -54,6 +54,11 @@ public class SysUserController {
         AccessToken accessToken = new AccessToken();
         if (result.getCode() == 10000) {
             SysUser user = (SysUser) result.getData();
+            if (user.getUserType() == 4 && user.getPermit() == null) {
+                accessToken.setPermit(1);
+            } else {
+                accessToken.setPermit(0);//不需要
+            }
             accessToken.setAccountName(user.getUserName());
             accessToken.setCreated(new Date());
             accessToken.setType(user.getUserType());
@@ -138,7 +143,11 @@ public class SysUserController {
                       @RequestParam("type") String type,
                       @RequestParam("userName") String userName,
                       @RequestParam("idCord") String idCord,
-                      @RequestParam("phone") String phone) throws UnsupportedEncodingException {
+                      @RequestParam("phone") String phone,
+                      @RequestParam("farmName") String farmName,
+                      @RequestParam("veterId") String veterId,
+                      @RequestParam("detailedAdressCode") String detailedAdressCode,
+                      @RequestParam("permitImg") MultipartFile permitImg) throws UnsupportedEncodingException {
         req.setCharacterEncoding("UTF-8");
         System.out.println(userName);
         String imgname = "成功";
@@ -184,6 +193,29 @@ public class SysUserController {
         }
         String content2 = "https://img.ifarmcloud.com/images/" + path2 + "/" + imgname2;
 
+//        String imgname3 = "成功";
+//        String originalFilename3 = permitImg.getOriginalFilename();
+//        String filenameExtension3 = StringUtils.getFilenameExtension(originalFilename3);
+//        String path3 = DateUtil.format(new Date(), "yyyy-MM");
+//        try {
+//            InputStream inputStream = permitImg.getInputStream();
+//            BufferedInputStream in = new BufferedInputStream(inputStream);
+//            ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
+//            byte[] temp = new byte[1024];
+//            int size = 0;
+//            while ((size = in.read(temp)) != -1) {
+//                out.write(temp, 0, size);
+//            }
+//            in.close();
+//            byte[] content3 = out.toByteArray();
+//            imgname3 = UUID.randomUUID() + "." + filenameExtension3;
+//            UploadImage.sshSftp(content3, path3, imgname3);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        String content3 = "https://img.ifarmcloud.com/images/" + path3 + "/" + imgname3;
+
+
         Map<String, String> map = new HashMap<>();
         map.put("idCordFrontUrl", content);
         map.put("idCordBackUrl", content2);
@@ -192,6 +224,10 @@ public class SysUserController {
         map.put("userName", userName);
         map.put("idCord", idCord);
         map.put("phone", phone);
+        map.put("veterId", veterId);
+        map.put("detailedAdressCode", detailedAdressCode);
+        map.put("farmName", farmName);
+//        map.put("permitImg", content3);
         Result result = iSysUserService.add(req, map);
         if (result.getCode() == 10000) {
             SysUser user = (SysUser) result.getData();

admin/src/main/java/com/huimv/farm/damsubsidy/entity/AccessToken.java

@@ -20,6 +20,16 @@ public class AccessToken {
     private String phone;
     private SysUser user;
 
+    public Integer getPermit() {
+        return permit;
+    }
+
+    public void setPermit(Integer permit) {
+        this.permit = permit;
+    }
+
+    private Integer permit;
+
     public SysUser getUser() {
         return user;
     }
@@ -121,7 +131,7 @@ public class AccessToken {
         this.message = message;
     }
 
-    public AccessToken(String token, String loginIp, Date created, String accountName, Integer code, Integer type, String message,SysUser user) {
+    public AccessToken(String token, String loginIp, Date created, String accountName, Integer code, Integer type, String message,SysUser user,Integer permit) {
         this.token = token;
         this.loginIp = loginIp;
         this.created = created;
@@ -130,5 +140,6 @@ public class AccessToken {
         this.type = type;
         this.message = message;
         this.user = user;
+        this.permit = permit;
     }
 }

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

@@ -173,8 +173,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 user.setFarmType(0);
             }
             user.setDetailedAdress(paramsMap.get("address"));
+            user.setFarmName(paramsMap.get("farmName"));
         }
         if (Integer.parseInt(paramsMap.get("type")) == 2 ||Integer.parseInt(paramsMap.get("type")) == 3) {
+
             user.setAccoutType(1);
             user.setIsRealName(1);
             QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();