From 789a568c9c17964c4859eaa4a631d493bfa6ab9e Mon Sep 17 00:00:00 2001 From: ck <851316342@qq.com> Date: Tue, 28 Jul 2020 11:02:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=81=E7=88=B1=E6=84=8F=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=A8=A1=E5=9D=97:=201.=E5=A1=AB=E5=86=99=E6=83=85=E4=B9=A6=20?= =?UTF-8?q?2.=E6=9F=A5=E7=9C=8B=E6=83=85=E4=B9=A6=E6=96=87=E6=9C=AClist?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=8D=95=E4=B8=AA=E6=83=85=E4=B9=A6=E6=96=87?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../say/controller/LoveLetterController.java | 27 ++++++++ .../say/controller/LoveTypeController.java | 58 ++++++++++++++++ .../java/com/bsd/say/entities/BaseEntity.java | 10 ++- .../java/com/bsd/say/entities/LoveLetter.java | 11 +-- .../java/com/bsd/say/entities/LoveType.java | 5 +- .../com/bsd/say/mapper/LoveLetterMapper.java | 9 +++ .../com/bsd/say/mapper/LoveTypeMapper.java | 9 +++ .../bsd/say/service/LoveLetterService.java | 6 ++ .../com/bsd/say/service/LoveTypeService.java | 10 +++ .../bsd/say/service/impl/BaseServiceImpl.java | 2 - .../service/impl/LoveLetterServiceImpl.java | 20 ++++++ .../say/service/impl/LoveTypeServiceImpl.java | 68 +++++++++++++++++++ .../resources/mapper/LoveLetterMapper.xml | 5 ++ src/main/resources/mapper/LoveTypeMapper.xml | 5 ++ 14 files changed, 232 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/bsd/say/controller/LoveLetterController.java create mode 100644 src/main/java/com/bsd/say/controller/LoveTypeController.java create mode 100644 src/main/java/com/bsd/say/mapper/LoveLetterMapper.java create mode 100644 src/main/java/com/bsd/say/mapper/LoveTypeMapper.java create mode 100644 src/main/java/com/bsd/say/service/LoveLetterService.java create mode 100644 src/main/java/com/bsd/say/service/LoveTypeService.java create mode 100644 src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java create mode 100644 src/main/java/com/bsd/say/service/impl/LoveTypeServiceImpl.java create mode 100644 src/main/resources/mapper/LoveLetterMapper.xml create mode 100644 src/main/resources/mapper/LoveTypeMapper.xml diff --git a/src/main/java/com/bsd/say/controller/LoveLetterController.java b/src/main/java/com/bsd/say/controller/LoveLetterController.java new file mode 100644 index 0000000..2ef7a81 --- /dev/null +++ b/src/main/java/com/bsd/say/controller/LoveLetterController.java @@ -0,0 +1,27 @@ +package com.bsd.say.controller; + +import com.bsd.say.beans.AjaxRequest; +import com.bsd.say.beans.AjaxResult; +import com.bsd.say.entities.LoveLetter; +import com.bsd.say.service.LoveLetterService; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; + +@RestController +@RequestMapping("love-letter") +public class LoveLetterController extends BaseController{ + + @Override + public LoveLetterService getBaseService() { + return super.getBaseService(); + } + + @RequestMapping("save") + public AjaxResult save(@RequestBody AjaxRequest ajaxRequest, HttpServletRequest request) { + saveOrUpdate(ajaxRequest); + return new AjaxResult(); + } +} diff --git a/src/main/java/com/bsd/say/controller/LoveTypeController.java b/src/main/java/com/bsd/say/controller/LoveTypeController.java new file mode 100644 index 0000000..6687a10 --- /dev/null +++ b/src/main/java/com/bsd/say/controller/LoveTypeController.java @@ -0,0 +1,58 @@ +package com.bsd.say.controller; + +import com.bsd.say.beans.AjaxRequest; +import com.bsd.say.beans.AjaxResult; +import com.bsd.say.entities.LoveType; +import com.bsd.say.service.LoveTypeService; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +@RestController +@RequestMapping("love-type") +public class LoveTypeController extends BaseController{ + @Resource + private LoveTypeService loveTypeService; + + @Override + public LoveTypeService getBaseService() { + return super.getBaseService(); + } + + @RequestMapping("save") + public AjaxResult save(@RequestBody AjaxRequest ajaxRequest, HttpServletRequest request) { + saveOrUpdate(ajaxRequest); + return new AjaxResult(); + } + + @RequestMapping("list") + public AjaxResult list(){ + AjaxResult ajaxResult = new AjaxResult(); + try { + ajaxResult = loveTypeService.getLoveTypeList(); + } catch (Exception e) { + e.printStackTrace(); + String errMsg = e.getMessage() != null ? e.getMessage() : "操作失败"; + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg(errMsg); + } + return ajaxResult; + } + + @RequestMapping("select-id") + public AjaxResult getLoveTypeById(@RequestBody AjaxRequest ajaxRequest){ + AjaxResult ajaxResult = new AjaxResult(); + try { + ajaxResult = loveTypeService.getLoveTypeById(ajaxRequest); + } catch (Exception e) { + e.printStackTrace(); + String errMsg = e.getMessage() != null ? e.getMessage() : "操作失败"; + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg(errMsg); + } + return ajaxResult; + } +} diff --git a/src/main/java/com/bsd/say/entities/BaseEntity.java b/src/main/java/com/bsd/say/entities/BaseEntity.java index 3e7db19..a06bc5a 100644 --- a/src/main/java/com/bsd/say/entities/BaseEntity.java +++ b/src/main/java/com/bsd/say/entities/BaseEntity.java @@ -18,10 +18,16 @@ public class BaseEntity { @TableId(type = IdType.AUTO) private Long id; @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss", + timezone = "GMT+8" + ) private Date createDateTime; @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss", + timezone = "GMT+8" + ) private Date updateDateTime; - private Long createBy; - private Long updateBy; private int state; } diff --git a/src/main/java/com/bsd/say/entities/LoveLetter.java b/src/main/java/com/bsd/say/entities/LoveLetter.java index 6626a8a..104580a 100644 --- a/src/main/java/com/bsd/say/entities/LoveLetter.java +++ b/src/main/java/com/bsd/say/entities/LoveLetter.java @@ -9,11 +9,8 @@ public class LoveLetter extends BaseEntity{ /** * 用户id(谁写的爱意情书) */ - private String userId; - /** - * 情书内容(有字数限制) - */ - private String content; + private Integer userId; + /** * 情书类型 */ @@ -26,4 +23,8 @@ public class LoveLetter extends BaseEntity{ * 接收人姓名 */ private String receiveName; + /** + * 落款人 + */ + private String senderName; } diff --git a/src/main/java/com/bsd/say/entities/LoveType.java b/src/main/java/com/bsd/say/entities/LoveType.java index 1d3ed16..903a5cd 100644 --- a/src/main/java/com/bsd/say/entities/LoveType.java +++ b/src/main/java/com/bsd/say/entities/LoveType.java @@ -6,10 +6,7 @@ import lombok.Data; @TableName("love_type") @Data public class LoveType extends BaseEntity{ - /** - * 绑定情书id - */ - private Integer letterId; + /** * 爱意类型内容 */ diff --git a/src/main/java/com/bsd/say/mapper/LoveLetterMapper.java b/src/main/java/com/bsd/say/mapper/LoveLetterMapper.java new file mode 100644 index 0000000..161032b --- /dev/null +++ b/src/main/java/com/bsd/say/mapper/LoveLetterMapper.java @@ -0,0 +1,9 @@ +package com.bsd.say.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bsd.say.entities.LoveLetter; +import org.springframework.stereotype.Repository; + +@Repository("loveLetterMapper") +public interface LoveLetterMapper extends BaseMapper { +} diff --git a/src/main/java/com/bsd/say/mapper/LoveTypeMapper.java b/src/main/java/com/bsd/say/mapper/LoveTypeMapper.java new file mode 100644 index 0000000..66e31c1 --- /dev/null +++ b/src/main/java/com/bsd/say/mapper/LoveTypeMapper.java @@ -0,0 +1,9 @@ +package com.bsd.say.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bsd.say.entities.LoveType; +import org.springframework.stereotype.Repository; + +@Repository("loveTypeMapper") +public interface LoveTypeMapper extends BaseMapper { +} diff --git a/src/main/java/com/bsd/say/service/LoveLetterService.java b/src/main/java/com/bsd/say/service/LoveLetterService.java new file mode 100644 index 0000000..0ad3542 --- /dev/null +++ b/src/main/java/com/bsd/say/service/LoveLetterService.java @@ -0,0 +1,6 @@ +package com.bsd.say.service; + +import com.bsd.say.entities.LoveLetter; + +public interface LoveLetterService extends BaseService{ +} diff --git a/src/main/java/com/bsd/say/service/LoveTypeService.java b/src/main/java/com/bsd/say/service/LoveTypeService.java new file mode 100644 index 0000000..291affb --- /dev/null +++ b/src/main/java/com/bsd/say/service/LoveTypeService.java @@ -0,0 +1,10 @@ +package com.bsd.say.service; + +import com.bsd.say.beans.AjaxRequest; +import com.bsd.say.beans.AjaxResult; +import com.bsd.say.entities.LoveType; + +public interface LoveTypeService extends BaseService{ + AjaxResult getLoveTypeList(); + AjaxResult getLoveTypeById(AjaxRequest ajaxRequest); +} diff --git a/src/main/java/com/bsd/say/service/impl/BaseServiceImpl.java b/src/main/java/com/bsd/say/service/impl/BaseServiceImpl.java index fece209..4229ee5 100644 --- a/src/main/java/com/bsd/say/service/impl/BaseServiceImpl.java +++ b/src/main/java/com/bsd/say/service/impl/BaseServiceImpl.java @@ -44,11 +44,9 @@ public abstract class BaseServiceImpl, T extends BaseEnt Long id = entity.getId(); if (id == null) { - entity.setCreateBy(operatorId); entity.setCreateDateTime(date); entity.setState(Constants.ENABLE); } - entity.setUpdateBy(operatorId); entity.setUpdateDateTime(date); return super.saveOrUpdate((T) entity); } diff --git a/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java b/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java new file mode 100644 index 0000000..a0848dc --- /dev/null +++ b/src/main/java/com/bsd/say/service/impl/LoveLetterServiceImpl.java @@ -0,0 +1,20 @@ +package com.bsd.say.service.impl; + +import com.bsd.say.entities.LoveLetter; +import com.bsd.say.mapper.LoveLetterMapper; +import com.bsd.say.service.LoveLetterService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service("loveLetterService") +@Transactional +public class LoveLetterServiceImpl extends BaseServiceImpl implements LoveLetterService { + @Autowired + protected LoveLetterMapper loveLetterMapper; + + @Override + public LoveLetterMapper getBaseMapper() { + return this.loveLetterMapper; + } +} diff --git a/src/main/java/com/bsd/say/service/impl/LoveTypeServiceImpl.java b/src/main/java/com/bsd/say/service/impl/LoveTypeServiceImpl.java new file mode 100644 index 0000000..ffc330d --- /dev/null +++ b/src/main/java/com/bsd/say/service/impl/LoveTypeServiceImpl.java @@ -0,0 +1,68 @@ +package com.bsd.say.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.bsd.say.beans.AjaxRequest; +import com.bsd.say.beans.AjaxResult; +import com.bsd.say.entities.LoveType; +import com.bsd.say.mapper.LoveLetterMapper; +import com.bsd.say.mapper.LoveTypeMapper; +import com.bsd.say.service.LoveTypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service("loveTypeService") +@Transactional +public class LoveTypeServiceImpl extends BaseServiceImpl implements LoveTypeService { + @Autowired + protected LoveTypeMapper loveTypeMapper; + + @Override + public LoveTypeMapper getBaseMapper() { + return this.loveTypeMapper; + } + + @Override + public AjaxResult getLoveTypeList() { + AjaxResult ajaxResult = new AjaxResult(); + List loveTypes = loveTypeMapper.selectList(Wrappers.lambdaQuery().eq(LoveType::getState,1) + .orderByAsc(LoveType::getId)); + if (loveTypes.size()==0||loveTypes == null){ + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg("NOT FOUND"); + }else { + ajaxResult.setRetcode(AjaxResult.SUCCESS); + ajaxResult.setData(loveTypes); + } + return ajaxResult; + } + + @Override + public AjaxResult getLoveTypeById(AjaxRequest ajaxRequest) { + AjaxResult ajaxResult = new AjaxResult(); + JSONObject data = ajaxRequest.getData(); + if (data == null){ + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg("DATA MISSING"); + }else { + Integer id = data.getInteger("id"); + if (id == null){ + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg("ID MISSING"); + }else { + LoveType loveType = loveTypeMapper.selectById(id); + if (loveType == null){ + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg("RESULT MISSING"); + }else { + ajaxResult.setData(loveType); + ajaxResult.setRetcode(AjaxResult.SUCCESS); + } + } + } + return ajaxResult; + } +} diff --git a/src/main/resources/mapper/LoveLetterMapper.xml b/src/main/resources/mapper/LoveLetterMapper.xml new file mode 100644 index 0000000..7fc868f --- /dev/null +++ b/src/main/resources/mapper/LoveLetterMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/resources/mapper/LoveTypeMapper.xml b/src/main/resources/mapper/LoveTypeMapper.xml new file mode 100644 index 0000000..9f69261 --- /dev/null +++ b/src/main/resources/mapper/LoveTypeMapper.xml @@ -0,0 +1,5 @@ + + + + +