消息模板controller 编写

INSTALL.md

@@ -452,7 +452,7 @@ services:
         - 12201:12201/udp
 networks:
     graylog:
-      driver: bridg
+      driver: bridge
 ```
 
 这个文件里唯一需要改动的就是`ip`（本来的端口是`9000`的，我由于已经占用了`9000`端口了，所以我这里把端口改成了`9009`，你们可以随意）

austin-common/src/main/java/com/java3y/austin/enums/RespStatusEnum.java

@@ -17,8 +17,8 @@ public enum RespStatusEnum {
   /**
    * OK：操作成功
    */
-  SUCCESS("00000", "操作成功"),
+  SUCCESS("0", "操作成功"),
-  FAIL("00001", "操作失败"),
+  FAIL("-1", "操作失败"),
 
 
   /**

austin-common/src/main/java/com/java3y/austin/vo/BasicResultVO.java

@@ -20,7 +20,7 @@ public final class BasicResultVO<T> {
   /**
    * 响应状态
    */
-  private String code;
+  private String status;
 
   /**
    * 响应编码
@@ -41,7 +41,7 @@ public final class BasicResultVO<T> {
   }
 
   public BasicResultVO(RespStatusEnum status, String msg, T data) {
-    this.code = status.getCode();
+    this.status = status.getCode();
     this.msg = msg;
     this.data = data;
   }

austin-service-api-impl/src/main/java/com/java3y/austin/service/SendServiceImpl.java

@@ -40,7 +40,7 @@ public class SendServiceImpl implements SendService  {
 
         ProcessContext process = processController.process(context);
 
-        return new SendResponse(process.getResponse().getCode(), process.getResponse().getMsg());
+        return new SendResponse(process.getResponse().getStatus(), process.getResponse().getMsg());
     }
 
     @Override
@@ -59,7 +59,7 @@ public class SendServiceImpl implements SendService  {
 
         ProcessContext process = processController.process(context);
 
-        return new SendResponse(process.getResponse().getCode(), process.getResponse().getMsg());
+        return new SendResponse(process.getResponse().getStatus(), process.getResponse().getMsg());
     }
 
 

austin-web/src/main/java/com/java3y/austin/controller/MessageTemplateController.java

@@ -1,78 +1,48 @@
 package com.java3y.austin.controller;
 
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSON;
 import com.java3y.austin.dao.MessageTemplateDao;
 import com.java3y.austin.domain.MessageTemplate;
+import com.java3y.austin.vo.BasicResultVO;
+import com.java3y.austin.vo.MessageTemplateVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 
 
 /**
- * MessageTemplateController
+ * 消息模板管理Controller
- * 插入模板测试类
  * @author 3y
  */
 @RestController
-@RequestMapping("/Message")
+@RequestMapping("/messageTemplate")
 @Api("发送消息")
+@CrossOrigin(origins = "http://localhost:3000", allowCredentials = "true")
 public class MessageTemplateController {
 
     @Autowired
     private MessageTemplateDao messageTemplateDao;
 
     /**
-     * test insert
+     * 如果Id存在，则修改
+     * 如果Id不存在，则保存
      */
-    @GetMapping("/insert")
+    @PostMapping("/save")
     @ApiOperation("/插入数据")
-    public String insert() {
+    public BasicResultVO saveOrUpdate(@RequestBody MessageTemplate messageTemplate) {
-
-        MessageTemplate messageTemplate = MessageTemplate.builder()
-                .name("test邮件")
-                .auditStatus(10)
-                .flowId("yyyy")
-                .msgStatus(10)
-                .idType(50)
-                .sendChannel(40)
-                .templateType(20)
-                .msgType(10)
-                .expectPushTime("0")
-                .msgContent("{\"content\":\"{$contentValue}\",\"title\":\"{$title}\"}")
-                .sendAccount(66)
-                .creator("yyyyc")
-                .updator("yyyyu")
-                .team("yyyt")
-                .proposer("yyyy22")
-                .auditor("yyyyyyz")
-                .isDeleted(0)
-                .created(Math.toIntExact(DateUtil.currentSeconds()))
-                .updated(Math.toIntExact(DateUtil.currentSeconds()))
-                .deduplicationTime(1)
-                .isNightShield(0)
-                .build();
-
         MessageTemplate info = messageTemplateDao.save(messageTemplate);
-
+        return BasicResultVO.success(info);
-        return JSON.toJSONString(info);
-
     }
 
     /**
-     * test query
+     * 列表数据
      */
     @GetMapping("/query")
     @ApiOperation("/查找数据")
-    public String query() {
+    public BasicResultVO queryList() {
         Iterable<MessageTemplate> all = messageTemplateDao.findAll();
-        for (MessageTemplate messageTemplate : all) {
+        long count = messageTemplateDao.count();
-            return JSON.toJSONString(messageTemplate);
+        MessageTemplateVo messageTemplateVo = MessageTemplateVo.builder().count(count).rows(all).build();
-        }
+        return BasicResultVO.success(messageTemplateVo);
-        return null;
     }
 }

austin-web/src/main/java/com/java3y/austin/vo/MessageTemplateVo.java

@@ -0,0 +1,30 @@
+package com.java3y.austin.vo;
+
+import com.java3y.austin.domain.MessageTemplate;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * 消息模板的Vo
+ *
+ * @author 3y
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class MessageTemplateVo {
+
+    /**
+     * 消息模板李彪
+     */
+    private Iterable<MessageTemplate> rows;
+
+    /**
+     * 总条数
+     */
+    private Long count;
+}