接口12

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

@@ -193,28 +193,6 @@ 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);
@@ -227,7 +205,7 @@ public class SysUserController {
         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();
@@ -239,9 +217,9 @@ public class SysUserController {
             accessToken.setToken(TokenSign.sign(user.getUserName(), user.getPhone(),user.getId()));
             return new Result(ResultCode.SUCCESS, accessToken);
         } else if (result.getCode() == 10002) {
-            return new Result(ResultCode.UNAUTHENTICATED, "待审核");
+            return new Result(10002, "待审核",false);
         } else {
-            return new Result(ResultCode.FAIL, "用户已实名");
+            return new Result(10001, "用户已实名",false);
         }
     }
 
@@ -329,4 +307,36 @@ public class SysUserController {
             return new Result(ResultCode.SUCCESS,sysUsers);
         }
     }
+
+    @PostMapping("/addImg")
+    public Result addImg(HttpServletRequest httpServletRequest,@RequestParam("permitImg") MultipartFile permitImg,
+                         @RequestParam("id") String  id){
+        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("id", id);
+        map.put("permitImg", content3);
+       return iSysUserService.addImg(httpServletRequest, map);
+
+    }
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/ISysUserService.java

@@ -54,4 +54,6 @@ public interface ISysUserService extends IService<SysUser> {
     Result remove(SysUser sysUser, Long userId);
 
     Result updateUser(SysUser sysUser, Long userId);
+
+    Result addImg(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -102,7 +102,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         if (type == 1) {
             String refuseReason = paramsMap.get("refuseReason"); //拒绝理由
             if (refuseReason == "" || refuseReason == null) {
-                return new Result(ResultCode.FAIL, "拒绝理由不能为空！");
+                return new Result(10001, "拒绝理由不能为空！",false);
             }
             QueryWrapper<BillSubsidy> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("id", id);
@@ -137,10 +137,10 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         if (type == 1) { //驳回
             String rejectReason = paramsMap.get("rejectReason");
             if (rejectReason == null || rejectReason == "") {
-                return new Result(ResultCode.FAIL, "驳回理由不能为空！");
+                return new Result(10001, "驳回理由不能为空！",false);
             }
             if (workAccptUrl == null || workAccptUrl == "") {
-                return new Result(ResultCode.FAIL, "工作验收表不能为空！");
+                return new Result(10001, "工作验收表不能为空！",false);
             }
             billSubsidy.setSubsidySch(4);
             billSubsidy.setRejectReason(rejectReason);

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

@@ -50,18 +50,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         //TODO 验证码接口暂时不写，验证码验证接口写在此接口之前，这里默认验证码已经正确！
         String phone = paramsMap.get("phone");
         if (!phone.matches("1[3-9]\\d{9}")) {
-            return new Result(ResultCode.FAIL, "手机号格式不正确");
+            return new Result(10001, "手机号格式不正确",false);
         }
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone", phone);
         SysUser sysUser = userMapper.selectOne(queryWrapper);
         if (ObjectUtil.isEmpty(sysUser)) {
-            return new Result(ResultCode.DATA_NULL, "用户暂未注册，请注册！");
+            return new Result(10004, "用户暂未注册，请注册！",false);
         } else {
             if (sysUser.getAccoutType() == 1) {
                 return new Result(ResultCode.SUCCESS, sysUser);
             } else  {
-                return new Result(ResultCode.FAIL,"未审核或者账号异常！");
+                return new Result(10001,"未审核或者账号异常！",false);
             }
         }
     }
@@ -140,6 +140,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return new Result(ResultCode.SUCCESS, "修改成功");
     }
 
+    @Override
+    public Result addImg(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String img = paramsMap.get("permitImg");
+        String id = paramsMap.get("id");
+        SysUser user = userMapper.selectById(id);
+        user.setPermit(img);
+        userMapper.updateById(user);
+        return new Result(ResultCode.SUCCESS, userMapper.selectById(id));
+    }
+
 
     @Transactional
     @Override
@@ -183,16 +193,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             queryWrapper1.eq("id_card", paramsMap.get("idCord"));
             SysUser user2 = userMapper.selectOne(queryWrapper1);
             if (ObjectUtil.isNotEmpty(user2)) {
-                return new Result(ResultCode.FAIL, "");
+                return new Result(10001, "",false);
             }
             QueryWrapper<SysUser> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("phone", paramsMap.get("phone"));
             SysUser sysUser = userMapper.selectOne(queryWrapper2);
             if (ObjectUtil.isNotEmpty(sysUser)) {
-                return new Result(ResultCode.FAIL, "");
+                return new Result(10001, "",false);
             }
             if (!paramsMap.get("phone").equals(TokenSign.getPhone(httpServletRequest))) {
-                return new Result(ResultCode.FAIL, "实名手机号与当前手机号不一致");
+                return new Result(10001, "实名手机号与当前手机号不一致",false);
             }
             userMapper.insert(user);
             return new Result(ResultCode.SUCCESS, userMapper.selectOne(new QueryWrapper<SysUser>().eq("phone", paramsMap.get("phone"))));
@@ -203,26 +213,26 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             queryWrapper1.eq("id_card", paramsMap.get("idCord"));
             SysUser user2 = userMapper.selectOne(queryWrapper1);
             if (ObjectUtil.isNotEmpty(user2)) {
-                return new Result(ResultCode.FAIL, "");
+                return new Result(10001, "用户已存在",false);
             }
             QueryWrapper<SysUser> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("phone", paramsMap.get("phone"));
             SysUser sysUser = userMapper.selectOne(queryWrapper2);
             if (ObjectUtil.isNotEmpty(sysUser)) {
-                return new Result(ResultCode.FAIL, "");
+                return new Result(10001, "用户已存在",false);
             }
             if (!paramsMap.get("phone").equals(TokenSign.getPhone(httpServletRequest))) {
-                return new Result(ResultCode.FAIL, "实名手机号与当前手机号不一致");
+                return new Result(10001, "实名手机号与当前手机号不一致",false);
             }
             userMapper.insert(user);
-            return new Result(ResultCode.UNAUTHENTICATED,"待审核");
+            return new Result(10004,"待审核",false);
         }
     }
 
     @Override
     public Result edit(HttpServletRequest httpServletRequest, SysUser user) {
         userMapper.updateById(user);
-        return new Result(ResultCode.SUCCESS, "修改成功！");
+        return new Result(10000, "修改成功！",true);
     }
 
     @Override
@@ -238,7 +248,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String idCord = paramsMap.get("idCord");
         String phone = paramsMap.get("phone");
         if (!phone.matches("1[3-9]\\d{9}")) {
-            return new Result(ResultCode.FAIL, "手机号格式不正确");
+            return new Result(10001, "手机号格式不正确",false);
         }
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_name", userName).eq("id_card", idCord);
@@ -300,7 +310,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser user = userMapper.selectById(id);
         user.setAccoutType(Integer.parseInt(accoutType));
         userMapper.updateById(user);
-        return new Result(ResultCode.SUCCESS,"修改成功");
+        return new Result(10000,"修改成功",true);
     }
 
     @Override