测试

admin/src/main/java/com/huimv/farm/damsubsidy/common/utils/PageUtils.java

@@ -12,14 +12,14 @@ public class PageUtils {
     public static Page getPage(Map map){
         map.get("pageSize");
 
-        String pageNum = (String) map.get("pageNum");
-        String pageSize = (String) map.get("pageSize");
+        Integer pageNum = (Integer) map.get("pageNum");
+        Integer pageSize = (Integer) map.get("pageSize");
         if (StringUtils.isEmpty(pageNum)){
-            pageNum ="1";
+            pageNum =1;
         }
         if (StringUtils.isEmpty(pageSize)){
-            pageSize ="10";
+            pageSize =10;
         }
-       return new Page(Long.parseLong(pageNum), Long.parseLong(pageSize));
+       return new Page(Long.valueOf(pageNum), Long.valueOf(pageSize));
     }
 }

admin/src/main/java/com/huimv/farm/damsubsidy/common/utils/UploadImage.java

@@ -1,10 +1,21 @@
 package com.huimv.farm.damsubsidy.common.utils;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.UUID;
 import com.jcraft.jsch.*;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-
-import java.io.OutputStream;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.util.Date;
+import java.util.List;
 
 @Component
 public class UploadImage {
@@ -28,7 +39,6 @@ public class UploadImage {
      */
     public static void sshSftp(byte[] bytes,String path,String fileName) throws Exception{
 
-
         // 服务器保存路径
         String filepath = basePath +path ;
         Session session = null;
@@ -100,5 +110,45 @@ public class UploadImage {
             System.out.println("上传成功!");
         }
     }
+    public static byte[] resizeImage(byte[] srcImgData, float reduceMultiple) throws IOException {
+        BufferedImage bi = ImageIO.read(new ByteArrayInputStream(srcImgData));
+        int width = (int) (bi.getWidth() * reduceMultiple); // 源图宽度
+        int height = (int) (bi.getHeight() * reduceMultiple); // 源图高度
+        Image image = bi.getScaledInstance(width, height, Image.SCALE_SMOOTH);
+        BufferedImage tag = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+        Graphics g = tag.getGraphics();
+        g.setColor(Color.RED);
+        g.drawImage(image, 0, 0, null); // 绘制处理后的图
+        g.dispose();
+        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
+        ImageIO.write(tag, "JPEG", bOut);
+        return bOut.toByteArray();
+    }
+
+    public  String uploadImg( MultipartFile image ) {
+        String originalFilename = image.getOriginalFilename();
+        String filenameExtension = StringUtils.getFilenameExtension(originalFilename);
+        String path = DateUtil.format(new Date(), "yyyy-MM");
+        try {
+            InputStream inputStream = image.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();
+            String imgname = UUID.randomUUID() + "." + filenameExtension;
+            UploadImage.sshSftp(content, path, imgname);
+            return "https://img.ifarmcloud.com/images/" + path + "/" + imgname;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "上传失败";
+        }
+    }
+
 }
 

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

@@ -13,6 +13,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.imageio.ImageIO;
 import java.io.*;
 import java.lang.reflect.Field;
 import java.util.Date;
@@ -27,9 +28,8 @@ public class ImagesTest {
 
 
     @PostMapping("/test")
-    public  String test( @RequestParam("image") MultipartFile image,
-            @RequestParam("image1") MultipartFile image1) {
-        System.out.println(image1);
+    public  String test( @RequestParam("image") MultipartFile image
+            ) {
         System.out.println(image);
         String imgname = "成功";
         String originalFilename = image.getOriginalFilename();
@@ -48,6 +48,7 @@ public class ImagesTest {
             in.close();
             byte[] content = out.toByteArray();
             imgname = UUID.randomUUID() + "." + filenameExtension;
+            UploadImage.resizeImage(content,0.5F);
             UploadImage.sshSftp(content, path, imgname);
         } catch (Exception e) {
             e.printStackTrace();
@@ -58,6 +59,7 @@ public class ImagesTest {
         return content;
     }
 
+
    /* @RequestMapping("excelTest/import")
     @ResponseBody
      public String evaluationUpdate(@RequestParam(value = "file", required = true) MultipartFile file,) throws Exception {

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

@@ -92,7 +92,7 @@ public class SysUser extends BaseEntity implements Serializable {
     /*审核进度*/
     private Integer accoutType;
 
-    /*审核进度*/
+
     private String accountNum;
     private String password;
     private Integer pid;

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

@@ -23,7 +23,7 @@ import java.util.List;
 public class AuthorizeServiceImpl implements IAuthorizeService {
 
     @Autowired
-    AccountGroupMapper accountGroupMapper;
+    private AccountGroupMapper accountGroupMapper;
     @Autowired
     GroupMenuMapper groupMenuMapper;
     @Autowired

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

@@ -1,6 +1,8 @@
 package com.huimv.farm.damsubsidy.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.farm.damsubsidy.common.utils.PageUtils;
 import com.huimv.farm.damsubsidy.common.utils.Result;
@@ -11,7 +13,6 @@ import com.huimv.farm.damsubsidy.mapper.BaseVeterStationMapper;
 import com.huimv.farm.damsubsidy.service.IBaseVeterStationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 
 import java.util.Map;
 
@@ -29,6 +30,9 @@ public class BaseVeterStationServiceImpl extends ServiceImpl<BaseVeterStationMap
     @Override
     public Result page(Map map) {
         Page page = PageUtils.getPage(map);
-        return new Result(ResultCode.SUCCESS,this.page(page));
+        String name = (String)map.get("name");
+        QueryWrapper<BaseVeterStation> wrapper = new QueryWrapper<BaseVeterStation>().like(StringUtils.isNotBlank(name), "station_name", name);
+
+        return new Result(ResultCode.SUCCESS,this.page(page,wrapper));
     }
 }

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

@@ -2,6 +2,7 @@ package com.huimv.farm.damsubsidy.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.farm.damsubsidy.common.utils.Result;
@@ -68,8 +69,10 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
     public  IPage<Group> listGroup(Map map, List<Long> allChildId) {
         Integer pageNum = (Integer)map.get("pageNum");
         Integer pageSize = (Integer)map.get("pageSize");
+        String searchStr = (String)map.get("searchStr");
+        boolean notBlank = StringUtils.isNotBlank(searchStr);
 
-        return this.page(new Page<>(pageNum, pageSize),new QueryWrapper<Group>().in("account_id",allChildId).orderByDesc("id"));
+        return this.page(new Page<>(pageNum, pageSize),new QueryWrapper<Group>().like(StringUtils.isNotBlank(searchStr),"group_name",searchStr).in("account_id",allChildId).orderByDesc("id"));
     }
 
     @Override

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

@@ -418,7 +418,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         wrapper.ne("id", userId);
         wrapper.eq("is_delete", 0);
         if (StringUtils.isNotBlank(searchStr)) {
-            wrapper.like("user_name", searchStr);
+            wrapper.and(i ->i.like("user_name", searchStr).or().like("account_num",searchStr));
         }
 
         IPage<SysUser> page = this.page(new Page<SysUser>(Long.valueOf(pageNum), Long.valueOf(pageSize)), wrapper);

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

@@ -53,4 +53,4 @@ spring:
 mybatis-plus:
   configuration:
 #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl