完成公告功能

src/main/java/com/chuanghai/repair/controller/NoticeController.java

@@ -4,13 +4,22 @@ import com.chuanghai.repair.entity.RepairsNotice;
 import com.chuanghai.repair.service.RepairsNoticeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
+/**
+ * @Author: 浮生
+ * @Date: 2022/2/25 星期五 19:36
+ * @Description: com.chuanghai.repair.controller
+ * @version: 1.0
+ */
 @Api(tags = "公告管理")
 @RestController
 @RequestMapping("/notice")
@@ -19,33 +28,47 @@ public class NoticeController {
     @Resource(name = "repairsNoticeService")
     private RepairsNoticeService repairsNoticeService;
 
-//    @ApiOperation("添加公告")
-//    @PostMapping(value = "/addNotice")
-//    public Boolean addNotice(String noticeContent, Date noticeTime, Integer adminId){
-//
-//    }
+    @ApiOperation("添加公告")
+    @PostMapping(value = "/addNotice")
+    public Boolean addNotice(@ApiParam(name = "公告内容", required = true) String noticeContent,
+                             @ApiParam(name = "发布时间") String noticeTime,
+                             @ApiParam(name = "发布管理员Id") Integer adminId) {
+        //flag false 添加失败  true 添加成功
+        Boolean flag = Boolean.FALSE;
+        try {
+            if (adminId != null) {
+                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                noticeTime = df.format(new Date());
+                repairsNoticeService.addNotice(noticeContent, noticeTime, adminId);
+                flag = Boolean.TRUE;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return flag;
+    }
 
     @ApiOperation("发布公告")
     @PostMapping(value = "/releaseNotice")
-    public RepairsNotice releaseNotice(){
+    public RepairsNotice releaseNotice() {
         RepairsNotice repairsNotice = null;
         try {
             repairsNotice = repairsNoticeService.releaseNotice();
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return repairsNotice;
     }
 
-    @ApiOperation("删除公告")
-    @PostMapping(value = "/updateNotice")
-    public Boolean updateNotice(String noticeId){
+    //    @ApiOperation("删除公告")
+//    @PostMapping(value = "/updateNotice")
+    public Boolean updateNotice(@ApiParam(name = "公告Id", required = true) String noticeId) {
         Boolean flag = Boolean.FALSE;
         try {
-            if(repairsNoticeService.updateNotice(noticeId) == null){
+            if (repairsNoticeService.updateNotice(noticeId) == null) {
                 flag = Boolean.TRUE;
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return flag;
@@ -53,19 +76,31 @@ public class NoticeController {
 
 //    @ApiOperation("修改公告")
 //    @PostMapping(value = "/alterNotice")
-//    public Boolean alterNotice(String noticeContent, Date noticeTime, Integer noticeId){
-//
-//    }
-
-    @ApiOperation("查询全部公告")
-    @PostMapping(value = "/queryAllNotice")
-    public RepairsNotice queryAllNotice(String noticeStatus){
-        RepairsNotice repairsNotice = null;
+    public Boolean alterNotice(@ApiParam(name = "公告内容", required = true) String noticeContent,
+                               @ApiParam(name = "修改时间") String noticeTime,
+                               @ApiParam(name = "公告Id", required = true) Integer noticeId) {
+        //flag false 修改失败  true 修改成功
+        Boolean flag = Boolean.FALSE;
         try {
-            if(noticeStatus!="" && noticeStatus!=null){
-                repairsNotice =  repairsNoticeService.queryAllNotice(noticeStatus);
+            if (noticeId != null) {
+                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                noticeTime = df.format(new Date());
+                repairsNoticeService.alterNotice(noticeContent, noticeTime, noticeId);
+                flag = Boolean.TRUE;
             }
-        }catch (Exception e){
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return flag;
+    }
+
+    //    @ApiOperation("查询全部公告")
+//    @PostMapping(value = "/queryAllNotice")
+    public List<RepairsNotice> queryAllNotice() {
+        List<RepairsNotice> repairsNotice = null;
+        try {
+            repairsNotice = repairsNoticeService.queryAllNotice();
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return repairsNotice;

src/main/java/com/chuanghai/repair/entity/RepairsNotice.java

@@ -33,7 +33,7 @@ public class RepairsNotice {
      */
     @ApiModelProperty(value = "发布时间")
     @Column(name = "notice_time")
-    private Date noticeTime;
+    private String noticeTime;
 
     /**
      * 公告状态 0（删除）1（启用）

src/main/java/com/chuanghai/repair/mapper/RepairsNoticeMapper.java

@@ -4,6 +4,7 @@ import com.chuanghai.repair.entity.RepairsNotice;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Date;
+import java.util.List;
 
 @Mapper
 public interface RepairsNoticeMapper  {
@@ -15,7 +16,7 @@ public interface RepairsNoticeMapper  {
      * @return
      * @throws Exception
      */
-    Boolean addNotice(String noticeContent, Date noticeTime, Integer adminId) throws Exception;
+    Boolean addNotice(String noticeContent, String noticeTime, Integer adminId) throws Exception;
 
     /**
      * 发布公告
@@ -41,13 +42,12 @@ public interface RepairsNoticeMapper  {
      * @return
      * @throws Exception
      */
-    RepairsNotice alterNotice(String noticeContent, Date noticeTime, Integer noticeId) throws Exception;
+    RepairsNotice alterNotice(String noticeContent, String noticeTime, Integer noticeId) throws Exception;
 
     /**
      * 查询全部公告
-     * @param noticeStatus
      * @return
      * @throws Exception
      */
-    RepairsNotice queryAllNotice(String noticeStatus) throws Exception;
+    List<RepairsNotice> queryAllNotice() throws Exception;
 }

src/main/java/com/chuanghai/repair/service/RepairsNoticeService.java

@@ -3,6 +3,7 @@ package com.chuanghai.repair.service;
 import com.chuanghai.repair.entity.RepairsNotice;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author: bingo
@@ -20,7 +21,7 @@ public interface RepairsNoticeService {
      * @return
      * @throws Exception
      */
-    Boolean addNotice(String noticeContent, Date noticeTime, Integer adminId) throws Exception;
+    Boolean addNotice(String noticeContent, String noticeTime, Integer adminId) throws Exception;
 
     /**
      * 发布公告
@@ -48,14 +49,13 @@ public interface RepairsNoticeService {
      * @return
      * @throws Exception
      */
-    RepairsNotice alterNotice(String noticeContent, Date noticeTime, Integer noticeId) throws Exception;
+    RepairsNotice alterNotice(String noticeContent, String noticeTime, Integer noticeId) throws Exception;
 
     /**
      * 查询全部公告
      *
-     * @param noticeStatus
      * @return
      * @throws Exception
      */
-    RepairsNotice queryAllNotice(String noticeStatus) throws Exception;
+    List<RepairsNotice> queryAllNotice() throws Exception;
 }

src/main/java/com/chuanghai/repair/service/ServiceImpl/RepairsNoticeServiceImpl.java

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -31,7 +32,8 @@ public class RepairsNoticeServiceImpl implements RepairsNoticeService {
      * @throws Exception
      */
     @Override
-    public Boolean addNotice(String noticeContent, Date noticeTime, Integer adminId) throws Exception {
+    public Boolean addNotice(String noticeContent, String noticeTime, Integer adminId) throws Exception {
+        System.out.println(repairsNoticeMapper.addNotice(noticeContent, noticeTime, adminId));
         return repairsNoticeMapper.addNotice(noticeContent, noticeTime, adminId);
     }
 
@@ -67,18 +69,19 @@ public class RepairsNoticeServiceImpl implements RepairsNoticeService {
      * @throws Exception
      */
     @Override
-    public RepairsNotice alterNotice(String noticeContent, Date noticeTime, Integer noticeId) throws Exception{
+    public RepairsNotice alterNotice(String noticeContent, String noticeTime, Integer noticeId) throws Exception{
+        System.out.println(repairsNoticeMapper.alterNotice(noticeContent,noticeTime,noticeId));
         return repairsNoticeMapper.alterNotice(noticeContent,noticeTime,noticeId);
     }
 
     /**
      * 查询全部公告
-     * @param noticeStatus
      * @return
      * @throws Exception
      */
     @Override
-    public RepairsNotice queryAllNotice(String noticeStatus) throws Exception{
-        return repairsNoticeMapper.queryAllNotice(noticeStatus);
+    public List<RepairsNotice> queryAllNotice() throws Exception{
+        System.out.println(repairsNoticeMapper.queryAllNotice());
+        return repairsNoticeMapper.queryAllNotice();
     }
 }

src/main/resources/mapper/RepairsNoticeMapper.xml

@@ -21,7 +21,7 @@
     <select id="addNotice" parameterType="com.chuanghai.repair.entity.RepairsNotice"
             resultType="Boolean">
         insert into repairs_notice(notice_content,notice_time,notice_status,admin_id)
-        values(#{noticeContent},#{noticeTime},#{noticeStatus},#{adminId});
+        values(#{noticeContent},#{noticeTime},1,#{adminId});
     </select>
 
     <!--    发布公告-->
@@ -43,7 +43,7 @@
     <!--    修改公告-->
     <select id="alterNotice" parameterType="com.chuanghai.repair.entity.RepairsNotice"
             resultType="com.chuanghai.repair.entity.RepairsNotice">
-        update repairs_notice no set no.notice_content = #{noticeContent},no.notice_time = #{noticeTime}
+        update repairs_notice set notice_content = #{noticeContent},notice_time = #{noticeTime}
         <trim prefix="where" prefixOverrides="and" suffix="" suffixOverrides="">
             <if test="noticeId!='' and noticeId!=null">
                 and notice_id = #{noticeId}
@@ -52,7 +52,7 @@
     </select>
 
     <!--    查询全部公告-->
-    <select id="queryAllNotice" resultType="com.chuanghai.repair.entity.RepairsNotice">
-        select * from repairs_notice no where notice_status = 1;
+    <select id="queryAllNotice" resultMap="BaseResultMap">
+        select * from repairs_notice where notice_status = 1;
     </select>
 </mapper>