图片修改

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

@@ -26,10 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -213,55 +210,14 @@ public class SysUserController {
                       @RequestParam(name = "address",required = false) String address,//身份证地址
                       @RequestParam(name = "detailedAddress") String detailedAddress,//详细地址
                       @RequestParam(name = "detailedAdressCode") String detailedAdressCode//地址行政码
-    ) throws UnsupportedEncodingException {
+    ) throws IOException {
         req.setCharacterEncoding("UTF-8");
         System.out.println(userName);
-        String imgname = "成功";
-        String originalFilename = idCordFrontUrl.getOriginalFilename();
-        String filenameExtension = StringUtils.getFilenameExtension(originalFilename);
-        String path = DateUtil.format(new Date(), "yyyy-MM");
-        try {
-            InputStream inputStream = idCordFrontUrl.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[] content = out.toByteArray();
-            imgname = UUID.randomUUID() + "." + filenameExtension;
-            UploadImage.sshSftp(content, path, imgname);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        String content = "https://dam.img.ifarmcloud.com:8030/images/" + path + "/" + imgname;
-        String imgname2 = "成功";
+        String content = UploadImage.getImageCom(idCordFrontUrl);
 
         String content2 ="" ;
         if (!"2".equals(type)){
-            String originalFilename2 = idCordBackUrl.getOriginalFilename();
-            String filenameExtension2 = StringUtils.getFilenameExtension(originalFilename2);
-            String path2 = DateUtil.format(new Date(), "yyyy-MM");
-            try {
-                InputStream inputStream = idCordBackUrl.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[] idCordBackUrlByte = out.toByteArray();
-                imgname2 = UUID.randomUUID() + "." + filenameExtension2;
-                UploadImage.sshSftp(idCordBackUrlByte, path2, imgname2);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            content2 =   "https://dam.img.ifarmcloud.com:8030/images/" + path2 + "/" + imgname2;
+             content2 = UploadImage.getImageCom(idCordBackUrl);
         }
 
         Map<String, String> map = new HashMap<>();
@@ -400,28 +356,8 @@ public class SysUserController {
 
     @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://dam.img.ifarmcloud.com:8030/images/" + path3 + "/" + imgname3;
+                         @RequestParam("id") String  id) throws IOException {
+        String content3 = UploadImage.getImageCom(permitImg);
 
         Map<String, String> map = new HashMap<>();
         map.put("id", id);

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

@@ -273,7 +273,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         user.setIdCardBackUrl(paramsMap.get("idCordBackUrl"));
 
 
-        if ( /*Integer.parseInt(paramsMap.get("type")) == 2||*/Integer.parseInt(paramsMap.get("type")) == 3) {
+        if (Integer.parseInt(paramsMap.get("type")) == 3) {
             QueryWrapper<PovertyUserRegist> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("XM", paramsMap.get("userName")).eq("ZJHM", paramsMap.get("idCord"));
             //TODO 会有问题，不可能只有一个
@@ -301,37 +301,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 if (sysUser.getIsRealName() == 1){
                     return new Result(10001, "用户已存在", false);
                 }else {
-                     /*   if (Integer.parseInt(paramsMap.get("type")) == 2) {
-            user.setUserType(Integer.parseInt(paramsMap.get("type")));
-            user.setUserName(paramsMap.get("userName"));
-            user.setPhone(TokenSign.getPhone(httpServletRequest));
-            user.setAddress(paramsMap.get("address"));
-            user.setDetailedAdress(paramsMap.get("detailedAddress"));
-            user.setDetailedAdressCode(paramsMap.get("detailedAdressCode"));
-            user.setCreateTime(new Date());
-            user.setPermit(paramsMap.get("idCordFrontUrl"));
-            String s = paramsMap.get("detailedAdressCode");
-            String[] split = s.split(",");
-            user.setBriefAddressCode(split[split.length - 1]);
-            user.setAccoutType(1);
-            user.setIsRealName(1);
-            QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("phone",TokenSign.getPhone(httpServletRequest));
-            Integer integer = userMapper.selectCount(queryWrapper);
-            QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("user_name", paramsMap.get("userName"));
-            Integer integer1 = userMapper.selectCount(queryWrapper1);
-            if (integer1 == 0) {
-                if (integer == 0) {
-                    userMapper.insert(user);
-                    return new Result(ResultCode.SUCCESS, user);
-                } else {
-                    return new Result(10001, "该手机号已被其他用户使用！", false);
-                }
-            }else{
-                return new Result(10001, "该企业已存在，请重新注册！", false);
-            }
-        }*/
                     sysUser.setUserType(Integer.parseInt(paramsMap.get("type")));
                     sysUser.setUserName(paramsMap.get("userName"));
                     sysUser.setIdCard(paramsMap.get("idCord"));