From b94071e14117ea98851bafdbf2c41e4a031df525 Mon Sep 17 00:00:00 2001 From: xiezhijun <15270898033@163.com> Date: Fri, 23 Apr 2021 19:06:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E5=85=BB=E7=9F=A5=E8=AF=86=E6=96=B0?= =?UTF-8?q?=E5=8A=A0=E9=97=AE=E9=A2=98=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysAskNutritionQuestionController.java | 103 ++++++++++++++++++ .../custom/WechatAppletController.java | 16 +++ .../domain/SysAskNutritionQuestion.java | 35 ++++++ .../mapper/SysAskNutritionQuestionMapper.java | 61 +++++++++++ .../ISysAskNutritionQuestionService.java | 61 +++++++++++ .../SysAskNutritionQuestionServiceImpl.java | 96 ++++++++++++++++ .../custom/SysAskNutritionQuestionMapper.xml | 87 +++++++++++++++ .../PunchLog/PunchLogDetail/index.vue | 18 ++- 8 files changed, 473 insertions(+), 4 deletions(-) create mode 100644 stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysAskNutritionQuestionController.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/domain/SysAskNutritionQuestion.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysAskNutritionQuestionMapper.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/service/ISysAskNutritionQuestionService.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysAskNutritionQuestionServiceImpl.java create mode 100644 stdiet-custom/src/main/resources/mapper/custom/SysAskNutritionQuestionMapper.xml diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysAskNutritionQuestionController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysAskNutritionQuestionController.java new file mode 100644 index 000000000..7ee982812 --- /dev/null +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysAskNutritionQuestionController.java @@ -0,0 +1,103 @@ +package com.stdiet.web.controller.custom; + +import java.util.List; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.stdiet.common.annotation.Log; +import com.stdiet.common.core.controller.BaseController; +import com.stdiet.common.core.domain.AjaxResult; +import com.stdiet.common.enums.BusinessType; +import com.stdiet.custom.domain.SysAskNutritionQuestion; +import com.stdiet.custom.service.ISysAskNutritionQuestionService; +import com.stdiet.common.utils.poi.ExcelUtil; +import com.stdiet.common.core.page.TableDataInfo; + +/** + * 营养小知识提问Controller + * + * @author xzj + * @date 2021-04-23 + */ +@RestController +@RequestMapping("/custom/askQuestion") +public class SysAskNutritionQuestionController extends BaseController +{ + @Autowired + private ISysAskNutritionQuestionService sysAskNutritionQuestionService; + + /** + * 查询营养小知识提问列表 + */ + @PreAuthorize("@ss.hasPermi('custom:askQuestion:list')") + @GetMapping("/list") + public TableDataInfo list(SysAskNutritionQuestion sysAskNutritionQuestion) + { + startPage(); + List list = sysAskNutritionQuestionService.selectSysAskNutritionQuestionList(sysAskNutritionQuestion); + return getDataTable(list); + } + + /** + * 导出营养小知识提问列表 + */ + @PreAuthorize("@ss.hasPermi('custom:askQuestion:export')") + @Log(title = "营养小知识提问", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(SysAskNutritionQuestion sysAskNutritionQuestion) + { + List list = sysAskNutritionQuestionService.selectSysAskNutritionQuestionList(sysAskNutritionQuestion); + ExcelUtil util = new ExcelUtil(SysAskNutritionQuestion.class); + return util.exportExcel(list, "askQuestion"); + } + + /** + * 获取营养小知识提问详细信息 + */ + @PreAuthorize("@ss.hasPermi('custom:askQuestion:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(sysAskNutritionQuestionService.selectSysAskNutritionQuestionById(id)); + } + + /** + * 新增营养小知识提问 + */ + @PreAuthorize("@ss.hasPermi('custom:askQuestion:add')") + @Log(title = "营养小知识提问", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SysAskNutritionQuestion sysAskNutritionQuestion) + { + return toAjax(sysAskNutritionQuestionService.insertSysAskNutritionQuestion(sysAskNutritionQuestion)); + } + + /** + * 修改营养小知识提问 + */ + @PreAuthorize("@ss.hasPermi('custom:askQuestion:edit')") + @Log(title = "营养小知识提问", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SysAskNutritionQuestion sysAskNutritionQuestion) + { + return toAjax(sysAskNutritionQuestionService.updateSysAskNutritionQuestion(sysAskNutritionQuestion)); + } + + /** + * 删除营养小知识提问 + */ + @PreAuthorize("@ss.hasPermi('custom:askQuestion:remove')") + @Log(title = "营养小知识提问", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(sysAskNutritionQuestionService.deleteSysAskNutritionQuestionByIds(ids)); + } +} \ No newline at end of file diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java index fc7b75231..5e63840b8 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java @@ -4,6 +4,7 @@ import com.itextpdf.io.util.DateTimeUtil; import com.stdiet.common.core.controller.BaseController; import com.stdiet.common.core.domain.AjaxResult; import com.stdiet.common.core.page.TableDataInfo; +import com.stdiet.common.enums.BusinessType; import com.stdiet.common.exception.file.FileNameLengthLimitExceededException; import com.stdiet.common.utils.DateUtils; import com.stdiet.common.utils.StringUtils; @@ -47,6 +48,9 @@ public class WechatAppletController extends BaseController { @Autowired private ISysNutritionQuestionService sysNutritionQuestionService; + @Autowired + private ISysAskNutritionQuestionService sysAskNutritionQuestionService; + /** * 查询微信小程序中展示的客户案例 */ @@ -293,4 +297,16 @@ public class WechatAppletController extends BaseController { Map result = sysNutritionQuestionService.getNutritionQuestionListByKey(sysNutritionQuestion, pageNum, pageSize); return AjaxResult.success(result); } + + /** + * 新增营养小知识提问 + */ + @PostMapping("/addAskNutritionQuestion") + public AjaxResult addAskNutritionQuestion(@RequestBody SysAskNutritionQuestion sysAskNutritionQuestion) + { + if(StringUtils.isEmpty(sysAskNutritionQuestion.getOpenid()) || StringUtils.isEmpty(sysAskNutritionQuestion.getQuestion())){ + return AjaxResult.error("添加失败"); + } + return toAjax(sysAskNutritionQuestionService.insertSysAskNutritionQuestion(sysAskNutritionQuestion)); + } } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysAskNutritionQuestion.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysAskNutritionQuestion.java new file mode 100644 index 000000000..b064ea34c --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysAskNutritionQuestion.java @@ -0,0 +1,35 @@ +package com.stdiet.custom.domain; + +import lombok.Data; +import com.stdiet.common.annotation.Excel; +import com.stdiet.common.core.domain.BaseEntity; + +/** + * 营养小知识提问对象 sys_ask_nutrition_question + * + * @author xzj + * @date 2021-04-23 + */ +@Data +public class SysAskNutritionQuestion extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 提问者微信openid */ + @Excel(name = "提问者微信openid") + private String openid; + + /** 问题内容 */ + @Excel(name = "问题内容") + private String question; + + /** 是否已回答，0未回答，1已回答 */ + @Excel(name = "是否已回答，0未回答，1已回答") + private Integer replyFlag; + + /** 删除标识 0未删除 1已删除 */ + private Integer delFlag; +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysAskNutritionQuestionMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysAskNutritionQuestionMapper.java new file mode 100644 index 000000000..ceadbe3e7 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysAskNutritionQuestionMapper.java @@ -0,0 +1,61 @@ +package com.stdiet.custom.mapper; + +import java.util.List; +import com.stdiet.custom.domain.SysAskNutritionQuestion; + +/** + * 营养小知识提问Mapper接口 + * + * @author xzj + * @date 2021-04-23 + */ +public interface SysAskNutritionQuestionMapper +{ + /** + * 查询营养小知识提问 + * + * @param id 营养小知识提问ID + * @return 营养小知识提问 + */ + public SysAskNutritionQuestion selectSysAskNutritionQuestionById(Long id); + + /** + * 查询营养小知识提问列表 + * + * @param sysAskNutritionQuestion 营养小知识提问 + * @return 营养小知识提问集合 + */ + public List selectSysAskNutritionQuestionList(SysAskNutritionQuestion sysAskNutritionQuestion); + + /** + * 新增营养小知识提问 + * + * @param sysAskNutritionQuestion 营养小知识提问 + * @return 结果 + */ + public int insertSysAskNutritionQuestion(SysAskNutritionQuestion sysAskNutritionQuestion); + + /** + * 修改营养小知识提问 + * + * @param sysAskNutritionQuestion 营养小知识提问 + * @return 结果 + */ + public int updateSysAskNutritionQuestion(SysAskNutritionQuestion sysAskNutritionQuestion); + + /** + * 删除营养小知识提问 + * + * @param id 营养小知识提问ID + * @return 结果 + */ + public int deleteSysAskNutritionQuestionById(Long id); + + /** + * 批量删除营养小知识提问 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysAskNutritionQuestionByIds(Long[] ids); +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysAskNutritionQuestionService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysAskNutritionQuestionService.java new file mode 100644 index 000000000..385dbb616 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysAskNutritionQuestionService.java @@ -0,0 +1,61 @@ +package com.stdiet.custom.service; + +import java.util.List; +import com.stdiet.custom.domain.SysAskNutritionQuestion; + +/** + * 营养小知识提问Service接口 + * + * @author xzj + * @date 2021-04-23 + */ +public interface ISysAskNutritionQuestionService +{ + /** + * 查询营养小知识提问 + * + * @param id 营养小知识提问ID + * @return 营养小知识提问 + */ + public SysAskNutritionQuestion selectSysAskNutritionQuestionById(Long id); + + /** + * 查询营养小知识提问列表 + * + * @param sysAskNutritionQuestion 营养小知识提问 + * @return 营养小知识提问集合 + */ + public List selectSysAskNutritionQuestionList(SysAskNutritionQuestion sysAskNutritionQuestion); + + /** + * 新增营养小知识提问 + * + * @param sysAskNutritionQuestion 营养小知识提问 + * @return 结果 + */ + public int insertSysAskNutritionQuestion(SysAskNutritionQuestion sysAskNutritionQuestion); + + /** + * 修改营养小知识提问 + * + * @param sysAskNutritionQuestion 营养小知识提问 + * @return 结果 + */ + public int updateSysAskNutritionQuestion(SysAskNutritionQuestion sysAskNutritionQuestion); + + /** + * 批量删除营养小知识提问 + * + * @param ids 需要删除的营养小知识提问ID + * @return 结果 + */ + public int deleteSysAskNutritionQuestionByIds(Long[] ids); + + /** + * 删除营养小知识提问信息 + * + * @param id 营养小知识提问ID + * @return 结果 + */ + public int deleteSysAskNutritionQuestionById(Long id); +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysAskNutritionQuestionServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysAskNutritionQuestionServiceImpl.java new file mode 100644 index 000000000..b3aacb0bd --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysAskNutritionQuestionServiceImpl.java @@ -0,0 +1,96 @@ +package com.stdiet.custom.service.impl; + +import java.util.List; +import com.stdiet.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.stdiet.custom.mapper.SysAskNutritionQuestionMapper; +import com.stdiet.custom.domain.SysAskNutritionQuestion; +import com.stdiet.custom.service.ISysAskNutritionQuestionService; + +/** + * 营养小知识提问Service业务层处理 + * + * @author xzj + * @date 2021-04-23 + */ +@Service +public class SysAskNutritionQuestionServiceImpl implements ISysAskNutritionQuestionService +{ + @Autowired + private SysAskNutritionQuestionMapper sysAskNutritionQuestionMapper; + + /** + * 查询营养小知识提问 + * + * @param id 营养小知识提问ID + * @return 营养小知识提问 + */ + @Override + public SysAskNutritionQuestion selectSysAskNutritionQuestionById(Long id) + { + return sysAskNutritionQuestionMapper.selectSysAskNutritionQuestionById(id); + } + + /** + * 查询营养小知识提问列表 + * + * @param sysAskNutritionQuestion 营养小知识提问 + * @return 营养小知识提问 + */ + @Override + public List selectSysAskNutritionQuestionList(SysAskNutritionQuestion sysAskNutritionQuestion) + { + return sysAskNutritionQuestionMapper.selectSysAskNutritionQuestionList(sysAskNutritionQuestion); + } + + /** + * 新增营养小知识提问 + * + * @param sysAskNutritionQuestion 营养小知识提问 + * @return 结果 + */ + @Override + public int insertSysAskNutritionQuestion(SysAskNutritionQuestion sysAskNutritionQuestion) + { + sysAskNutritionQuestion.setCreateTime(DateUtils.getNowDate()); + return sysAskNutritionQuestionMapper.insertSysAskNutritionQuestion(sysAskNutritionQuestion); + } + + /** + * 修改营养小知识提问 + * + * @param sysAskNutritionQuestion 营养小知识提问 + * @return 结果 + */ + @Override + public int updateSysAskNutritionQuestion(SysAskNutritionQuestion sysAskNutritionQuestion) + { + sysAskNutritionQuestion.setUpdateTime(DateUtils.getNowDate()); + return sysAskNutritionQuestionMapper.updateSysAskNutritionQuestion(sysAskNutritionQuestion); + } + + /** + * 批量删除营养小知识提问 + * + * @param ids 需要删除的营养小知识提问ID + * @return 结果 + */ + @Override + public int deleteSysAskNutritionQuestionByIds(Long[] ids) + { + return sysAskNutritionQuestionMapper.deleteSysAskNutritionQuestionByIds(ids); + } + + /** + * 删除营养小知识提问信息 + * + * @param id 营养小知识提问ID + * @return 结果 + */ + @Override + public int deleteSysAskNutritionQuestionById(Long id) + { + return sysAskNutritionQuestionMapper.deleteSysAskNutritionQuestionById(id); + } +} \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysAskNutritionQuestionMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysAskNutritionQuestionMapper.xml new file mode 100644 index 000000000..a2cb0cb93 --- /dev/null +++ b/stdiet-custom/src/main/resources/mapper/custom/SysAskNutritionQuestionMapper.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + id, openid, question, reply_flag, create_time, create_by, update_time, update_by, del_flag + + + + + + + + insert into sys_ask_nutrition_question + + openid, + question, + reply_flag, + create_time, + create_by, + update_time, + update_by, + del_flag, + + + #{openid}, + #{question}, + #{replyFlag}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + #{delFlag}, + + + + + update sys_ask_nutrition_question + + openid = #{openid}, + question = #{question}, + reply_flag = #{replyFlag}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + del_flag = #{delFlag}, + + where id = #{id} + + + + update sys_ask_nutrition_question set del_flag = 1 where id = #{id} + + + + update sys_ask_nutrition_question set del_flag = 1 where id in + + #{id} + + + + \ No newline at end of file diff --git a/stdiet-ui/src/components/PunchLog/PunchLogDetail/index.vue b/stdiet-ui/src/components/PunchLog/PunchLogDetail/index.vue index 6ed36559c..a28a5cb26 100644 --- a/stdiet-ui/src/components/PunchLog/PunchLogDetail/index.vue +++ b/stdiet-ui/src/components/PunchLog/PunchLogDetail/index.vue @@ -39,22 +39,22 @@

食物照片

@@ -288,4 +288,14 @@ export default {