diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..e96534f
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index aa8bf90..e0db3c6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,21 +2,21 @@
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
@@ -30,9 +30,10 @@
-
+
+
@@ -41,57 +42,61 @@
-
-
+
+
+
+
-
+
-
-
+
+
+
-
+
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
@@ -100,82 +105,91 @@
-
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -183,22 +197,13 @@
-
-
-
-
-
-
-
-
-
@@ -212,6 +217,8 @@
suppliers
Supplier
supplier
+ biz
+ 360100
来源
@@ -223,6 +230,7 @@
Consumer
ConsumerVO
consumer
+ system
@@ -231,18 +239,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -250,7 +246,6 @@
-
@@ -263,7 +258,6 @@
-
@@ -282,6 +276,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -339,8 +347,6 @@
-
-
@@ -383,10 +389,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -396,7 +497,7 @@
-
+
@@ -413,11 +514,11 @@
+
-
@@ -1448,12 +1549,18 @@
-
+
+
+
+
+
+
+
-
+
@@ -1467,7 +1574,7 @@
-
+
@@ -1477,13 +1584,13 @@
-
-
+
+
-
+
@@ -1508,161 +1615,11 @@
-
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/coderman/api/system/realm/MyRealm.java
- 100
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1733,13 +1690,6 @@
-
-
-
-
-
-
-
@@ -1754,13 +1704,6 @@
-
-
-
-
-
-
-
@@ -1768,13 +1711,6 @@
-
-
-
-
-
-
-
@@ -1793,40 +1729,27 @@
-
-
-
-
+
-
-
-
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
@@ -1837,38 +1760,240 @@
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mbg.xml b/mbg.xml
index b75cfe6..9dcc2b5 100644
--- a/mbg.xml
+++ b/mbg.xml
@@ -21,13 +21,13 @@
-
-
+
\ No newline at end of file
diff --git a/src/main/java/com/coderman/api/biz/controller/FileUploadController.java b/src/main/java/com/coderman/api/biz/controller/FileUploadController.java
deleted file mode 100644
index 7a7e545..0000000
--- a/src/main/java/com/coderman/api/biz/controller/FileUploadController.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.coderman.api.biz.controller;
-
-import com.coderman.api.biz.utils.CommonFileUtil;
-import com.coderman.api.system.bean.ResponseBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-
-/**
- * 文件上传
- * @Author zhangyukang
- * @Date 2020/3/18 10:29
- * @Version 1.0
- **/
-@Slf4j
-@Api(tags = "文件上传接口")
-@RestController
-@RequestMapping("/upload")
-public class FileUploadController {
-
- @Autowired
- private CommonFileUtil commonFileUtil;
-
- /**
- * 上传图片文件
- * @param file
- * @return
- */
- @ApiOperation(value = "上传图片")
- @RequiresPermissions({"upload:image"})
- @PostMapping("/image")
- public ResponseBean image(MultipartFile file){
- if(file.isEmpty()){
- return ResponseBean.error("文件为空");
- }
- String originalFilename = file.getOriginalFilename();
- assert originalFilename != null;
- String fileSuffix = originalFilename.substring(originalFilename.lastIndexOf("."));
- if(!fileSuffix.equalsIgnoreCase("gif")&&!fileSuffix.equalsIgnoreCase(".jpg") && !fileSuffix.equalsIgnoreCase(".png")){
- log.info("文件格式不正确");
- return ResponseBean.error("文件格式不正确");
- }
- try {
- String url = commonFileUtil.uploadFile(file);
- System.out.println(url);
- return ResponseBean.success(url);
- } catch (IOException e) {
- e.printStackTrace();
- return ResponseBean.error("上传文件错误");
- }
- }
-
-}
diff --git a/src/main/java/com/coderman/api/biz/pojo/Consumer.java b/src/main/java/com/coderman/api/biz/pojo/Consumer.java
index be511fa..a730aef 100644
--- a/src/main/java/com/coderman/api/biz/pojo/Consumer.java
+++ b/src/main/java/com/coderman/api/biz/pojo/Consumer.java
@@ -24,4 +24,6 @@ public class Consumer {
private String phone;
private Integer sort;
+
+ private String contact;
}
\ No newline at end of file
diff --git a/src/main/java/com/coderman/api/biz/pojo/Supplier.java b/src/main/java/com/coderman/api/biz/pojo/Supplier.java
index 77c10ef..74e13a5 100644
--- a/src/main/java/com/coderman/api/biz/pojo/Supplier.java
+++ b/src/main/java/com/coderman/api/biz/pojo/Supplier.java
@@ -27,4 +27,6 @@ public class Supplier {
private Integer sort;
+ private String contact;
+
}
\ No newline at end of file
diff --git a/src/main/java/com/coderman/api/biz/service/imp/ConsumerServiceImpl.java b/src/main/java/com/coderman/api/biz/service/imp/ConsumerServiceImpl.java
index d4efae7..5c30c47 100644
--- a/src/main/java/com/coderman/api/biz/service/imp/ConsumerServiceImpl.java
+++ b/src/main/java/com/coderman/api/biz/service/imp/ConsumerServiceImpl.java
@@ -43,6 +43,12 @@ public class ConsumerServiceImpl implements ConsumerService {
if (consumerVO.getName() != null && !"".equals(consumerVO.getName())) {
o.createCriteria().andLike("name", "%" + consumerVO.getName() + "%");
}
+ if (consumerVO.getAddress() != null && !"".equals(consumerVO.getAddress())) {
+ o.createCriteria().andLike("address", "%" + consumerVO.getAddress() + "%");
+ }
+ if (consumerVO.getContact() != null && !"".equals(consumerVO.getContact())) {
+ o.createCriteria().andLike("contact", "%" + consumerVO.getContact() + "%");
+ }
List consumers = consumerMapper.selectByExample(o);
List categoryVOS= ConsumerConverter.converterToVOList(consumers);
PageInfo info = new PageInfo<>(consumers);
diff --git a/src/main/java/com/coderman/api/biz/utils/CommonFileUtil.java b/src/main/java/com/coderman/api/biz/utils/CommonFileUtil.java
index 60aef13..2587f0f 100644
--- a/src/main/java/com/coderman/api/biz/utils/CommonFileUtil.java
+++ b/src/main/java/com/coderman/api/biz/utils/CommonFileUtil.java
@@ -110,6 +110,14 @@ public class CommonFileUtil {
}
}
+ /**
+ * 上传图片
+ * @param is
+ * @param size
+ * @param fileExtName
+ * @param metaData
+ * @return
+ */
public String upfileImage(InputStream is, long size, String fileExtName, Set metaData) {
StorePath path = storageClient.uploadImageAndCrtThumbImage(is, size, fileExtName, metaData);
return getResAccessUrl(path);
diff --git a/src/main/java/com/coderman/api/biz/vo/ConsumerVO.java b/src/main/java/com/coderman/api/biz/vo/ConsumerVO.java
index 9da4cdd..a2f98da 100644
--- a/src/main/java/com/coderman/api/biz/vo/ConsumerVO.java
+++ b/src/main/java/com/coderman/api/biz/vo/ConsumerVO.java
@@ -29,4 +29,6 @@ public class ConsumerVO {
private Integer sort;
+ private String contact;
+
}
diff --git a/src/main/java/com/coderman/api/biz/vo/SupplierVO.java b/src/main/java/com/coderman/api/biz/vo/SupplierVO.java
index 3da2522..56eb295 100644
--- a/src/main/java/com/coderman/api/biz/vo/SupplierVO.java
+++ b/src/main/java/com/coderman/api/biz/vo/SupplierVO.java
@@ -36,4 +36,6 @@ public class SupplierVO {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private Date modifiedTime;
+
+ private String contact;
}
diff --git a/src/main/java/com/coderman/api/system/controller/FileUploadController.java b/src/main/java/com/coderman/api/system/controller/FileUploadController.java
new file mode 100644
index 0000000..185d6ec
--- /dev/null
+++ b/src/main/java/com/coderman/api/system/controller/FileUploadController.java
@@ -0,0 +1,135 @@
+package com.coderman.api.system.controller;
+
+import com.coderman.api.biz.utils.CommonFileUtil;
+import com.coderman.api.system.bean.ResponseBean;
+import com.coderman.api.system.mapper.ImageAttachmentMapper;
+import com.coderman.api.system.pojo.ImageAttachment;
+import com.coderman.api.system.vo.ImageAttachmentVO;
+import com.coderman.api.system.vo.PageVO;
+import com.coderman.api.system.vo.UserVO;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import tk.mybatis.mapper.entity.Example;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 文件上传
+ * @Author zhangyukang
+ * @Date 2020/3/18 10:29
+ * @Version 1.0
+ **/
+@Slf4j
+@Api(tags = "文件上传接口")
+@RestController
+@RequestMapping("/upload")
+public class FileUploadController {
+
+ @Autowired
+ private CommonFileUtil commonFileUtil;
+
+ @Autowired
+ private ImageAttachmentMapper imageAttachmentMapper;
+
+ /**
+ * 上传图片文件
+ * @param file
+ * @return
+ */
+ @ApiOperation(value = "上传图片")
+ @RequiresPermissions({"upload:image"})
+ @PostMapping("/image")
+ public ResponseBean image(MultipartFile file){
+ if(file.isEmpty()){
+ return ResponseBean.error("文件为空");
+ }
+ String originalFilename = file.getOriginalFilename();
+ assert originalFilename != null;
+ String fileSuffix = originalFilename.substring(originalFilename.lastIndexOf("."));
+ if(!fileSuffix.equalsIgnoreCase(".gif")
+ &&!fileSuffix.equalsIgnoreCase(".jpg")
+ && !fileSuffix.equalsIgnoreCase(".png")){
+ log.info("文件格式不正确");
+ return ResponseBean.error("文件格式不正确");
+ }
+ try {
+ String url = commonFileUtil.uploadFile(file);
+ ImageAttachment t = new ImageAttachment();
+ t.setPath(url);
+ t.setCreateTime(new Date());
+ t.setMediaType(file.getContentType());
+ t.setSuffix(fileSuffix);
+ t.setSize(file.getSize());
+ BufferedImage bufferedImage = ImageIO.read(file.getInputStream()); // 通过临时文件获取图片流
+ if(bufferedImage!=null){
+ int width = bufferedImage.getWidth();
+ int height = bufferedImage.getHeight();
+ t.setHeight(height);
+ t.setWidth(width);
+ }
+ imageAttachmentMapper.insert(t);
+ log.info("[上传文件]=>{}",url);
+ return ResponseBean.success(url);
+ } catch (IOException e) {
+ e.printStackTrace();
+ return ResponseBean.error("上传文件错误");
+ }
+ }
+
+
+ /**
+ * 附件列表(图片)
+ *
+ * @return
+ */
+ @ApiOperation(value = "附件列表", notes = "模糊查询附件列表")
+ @GetMapping("/findImageList")
+ public ResponseBean findImageList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "8") Integer pageSize,
+ ImageAttachmentVO imageAttachmentVO) {
+ PageHelper.startPage(pageNum,pageSize);
+ Example o = new Example(ImageAttachment.class);
+ o.setOrderByClause("create_time desc");
+ if(imageAttachmentVO!=null){
+ if(imageAttachmentVO.getMediaType()!=null&&!"".equalsIgnoreCase(imageAttachmentVO.getMediaType())){
+ o.createCriteria().andEqualTo("mediaType",imageAttachmentVO.getMediaType());
+ }
+ if(imageAttachmentVO.getPath()!=null&&!"".equalsIgnoreCase(imageAttachmentVO.getPath())){
+ o.createCriteria().andLike("path","%"+imageAttachmentVO.getPath()+"%");
+ }
+ if(imageAttachmentVO.getSuffix()!=null&&!"".equalsIgnoreCase(imageAttachmentVO.getSuffix())){
+ o.createCriteria().andEqualTo("suffix",imageAttachmentVO.getSuffix());
+ }
+ }
+ List imageAttachments = imageAttachmentMapper.selectByExample(o);
+ PageInfo imageAttachmentPageInfo = new PageInfo<>(imageAttachments);
+ return ResponseBean.success(imageAttachmentPageInfo);
+ }
+
+ /**
+ * 删除图片
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "删除图片", notes = "删除数据库记录,删除图片服务器上的图片")
+ @RequiresPermissions("image:delete")
+ @DeleteMapping("/delete/{id}")
+ public ResponseBean delete(@PathVariable Long id){
+ ImageAttachment imageAttachment = imageAttachmentMapper.selectByPrimaryKey(id);
+ commonFileUtil.deleteFile(imageAttachment.getPath());
+ imageAttachmentMapper.deleteByPrimaryKey(id);
+ return ResponseBean.success();
+ }
+
+}
diff --git a/src/main/java/com/coderman/api/system/mapper/ImageAttachmentMapper.java b/src/main/java/com/coderman/api/system/mapper/ImageAttachmentMapper.java
new file mode 100644
index 0000000..f0269d3
--- /dev/null
+++ b/src/main/java/com/coderman/api/system/mapper/ImageAttachmentMapper.java
@@ -0,0 +1,13 @@
+package com.coderman.api.system.mapper;
+
+import com.coderman.api.system.pojo.ImageAttachment;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * @Author zhangyukang
+ * @Date 2020/4/25 10:17
+ * @Version 1.0
+ **/
+public interface ImageAttachmentMapper extends Mapper {
+
+}
diff --git a/src/main/java/com/coderman/api/system/pojo/ImageAttachment.java b/src/main/java/com/coderman/api/system/pojo/ImageAttachment.java
new file mode 100644
index 0000000..df54a41
--- /dev/null
+++ b/src/main/java/com/coderman/api/system/pojo/ImageAttachment.java
@@ -0,0 +1,29 @@
+package com.coderman.api.system.pojo;
+
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+@Data
+@Table(name = "tb_image")
+public class ImageAttachment {
+
+ @Id
+ private Long id;
+
+ private String path;
+
+ private Long size;
+
+ private String mediaType;
+
+ private String suffix;
+
+ private Integer height;
+
+ private Integer width;
+
+ private Date createTime;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/coderman/api/system/service/impl/UserServiceImpl.java b/src/main/java/com/coderman/api/system/service/impl/UserServiceImpl.java
index c8024d8..967308e 100644
--- a/src/main/java/com/coderman/api/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/coderman/api/system/service/impl/UserServiceImpl.java
@@ -107,21 +107,19 @@ public class UserServiceImpl implements UserService {
public List