feats

src/main/java/com/example/civilizedcity/controller/CommController.java

@@ -8,10 +8,14 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
 import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -23,6 +27,11 @@ public class CommController extends BaseController {
     @Autowired
     OSSUtils ossUtils;
 
+    @Value("${yz.upload.path}")
+    String uploadPath;
+    @Value("${yz.upload.prefix}")
+    String uploadPrefix;
+
     @GetMapping("/ma/captcha")
     @ApiOperation(value="获取验证码", notes = "获取验证码", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean getCaptcha(@ApiParam("手机号码") @RequestParam("phone") String phone) throws Exception {
@@ -39,16 +48,51 @@ public class CommController extends BaseController {
     @PostMapping("/{client}/file")
     public ResponseBean uploadImage(@ApiParam("客户端") @PathVariable String client,
                                     @ApiParam("文件") @RequestParam("file") MultipartFile multipartFile,
-                                    @ApiParam("文件类型") @RequestParam(value = "fileType", defaultValue = "image") String fileType) {
-        try {
-            String url = ossUtils.putObject(multipartFile);
-
-            Map<String, Object> resp = new HashMap<>();
-            resp.put("url", url);
-            resp.put("fileType", fileType);
-            return ResponseBean.success(resp);
-        } catch (IOException e) {
-            return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+                                    @ApiParam("文件类型") @RequestParam(value = "fileType", defaultValue = "image") String fileType) throws Exception {
+//        try {
+//            String url = ossUtils.putObject(multipartFile);
+//
+//            Map<String, Object> resp = new HashMap<>();
+//            resp.put("url", url);
+//            resp.put("fileType", fileType);
+//            return ResponseBean.success(resp);
+//        } catch (IOException e) {
+//            return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+//        }
+
+
+        //获取文件名
+        String fileName = multipartFile.getOriginalFilename();
+        String newFileName = String.format("%s/%d-%s", getMonth(), System.currentTimeMillis(), fileName);
+
+        // 上传目录以日期分类
+        File tmp = new File(String.format("%s/%s", getUploadPath(), getMonth()));
+        if (!tmp.exists()) {
+            tmp.mkdir();
+        }
+
+        //
+        File upFile = new File(String.format("%s/%s", getUploadPath(), newFileName));
+        multipartFile.transferTo(upFile);
+
+        String url = String.format("%s/%s", uploadPrefix, newFileName);
+        return ResponseBean.success(new HashMap<String, Object>(){{
+            put("url", url);
+        }});
+    }
+
+    private String getUploadPath() {
+        File tmp = new File(uploadPath);
+        if (!tmp.exists()) {
+            tmp.mkdir();
         }
+
+        return uploadPath;
+    }
+
+    private String getMonth() {
+        LocalDateTime now = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+        return now.format(formatter);
     }
 }

src/main/java/com/example/civilizedcity/controller/TaNoticeController.java

@@ -4,8 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.BaseController;
+import com.example.civilizedcity.common.Constants;
 import com.example.civilizedcity.common.ResponseBean;
+
+import java.time.LocalDateTime;
 import java.util.List;
+
+import com.example.civilizedcity.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,8 +19,9 @@ import org.springframework.web.bind.annotation.*;
 import com.example.civilizedcity.entity.TaNotice;
 import com.example.civilizedcity.service.TaNoticeService;
 
- /**
+/**
  * 通知公告;(ta_notice)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
@@ -23,14 +29,14 @@ import com.example.civilizedcity.service.TaNoticeService;
 @RestController
 @RequestMapping("/")
 public class TaNoticeController extends BaseController {
-    
+
     @Autowired
     private TaNoticeService taNoticeService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    /**
+     * 通过ID查询单条数据
      *
-     * @param noticeId 主键
+     * @param id 主键
      * @return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
@@ -38,28 +44,32 @@ public class TaNoticeController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         return ResponseBean.success(taNoticeService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/taNotice")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @ApiParam("发布状态") @RequestParam(value = "status", required = false) Integer status) throws Exception {
+
         IPage<TaNotice> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TaNotice> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<TaNotice> result = taNoticeService.page(pg);
-        
+        QueryWrapper<TaNotice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(null != status, "status", status);
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.orderByDesc("weight");
+        queryWrapper.orderByDesc("create_date");
+        IPage<TaNotice> result = taNoticeService.page(pg, queryWrapper);
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param taNotice 实例对象
@@ -68,11 +78,19 @@ public class TaNoticeController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/taNotice")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody TaNotice taNotice) throws Exception {
+        taNotice.setNoticeId(null);
+
+        if (StringUtils.isEmpty(taNotice.getTitle())) {
+            return ResponseBean.error("公告标题不能为空");
+        }
+
+        taNotice.setCreateDate(LocalDateTime.now());
+
         taNoticeService.save(taNotice);
         return ResponseBean.success(taNotice);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param taNotice 实例对象
@@ -81,20 +99,26 @@ public class TaNoticeController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/taNotice/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaNotice taNotice,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable String id) throws Exception {
+        taNotice.setNoticeId(id);
+
+        if (StringUtils.isEmpty(taNotice.getTitle())) {
+            return ResponseBean.error("公告标题不能为空");
+        }
+
         taNoticeService.updateById(taNotice);
         return ResponseBean.success(taNotice);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
-     * @param noticeId 主键
+     * @param id 主键
      * @return 是否成功
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taNotice/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id) {
         taNoticeService.removeLogicById(id);
         return ResponseBean.success("success");
     }

src/main/java/com/example/civilizedcity/entity/TaNotice.java

@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
 public class TaNotice implements Serializable,Cloneable{
     /** 通知ID */
     @ApiModelProperty(name = "通知ID",notes = "")
-    @TableId(value = "notice_id", type = IdType.INPUT)
+    @TableId(value = "notice_id", type = IdType.ASSIGN_UUID)
     private String noticeId ;
     /** 标题 */
     @ApiModelProperty(name = "标题",notes = "")

src/main/resources/application.yml

@@ -20,6 +20,9 @@ spring:
 
 ###
 yz:
+  upload:
+    path: E:\work\public-upload
+    prefix: http://127.0.0.1:8000
   filter:
     annList:
       - "/swagger-ui/**"