营养知识新加问题添加

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<SysAskNutritionQuestion> 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<SysAskNutritionQuestion> list = sysAskNutritionQuestionService.selectSysAskNutritionQuestionList(sysAskNutritionQuestion);
+        ExcelUtil<SysAskNutritionQuestion> util = new ExcelUtil<SysAskNutritionQuestion>(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));
+    }
+}

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<String,Object> 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));
+    }
 }

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;
+}

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<SysAskNutritionQuestion> 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);
+}

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<SysAskNutritionQuestion> 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);
+}

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<SysAskNutritionQuestion> 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);
+    }
+}

stdiet-custom/src/main/resources/mapper/custom/SysAskNutritionQuestionMapper.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stdiet.custom.mapper.SysAskNutritionQuestionMapper">
+
+    <resultMap type="SysAskNutritionQuestion" id="SysAskNutritionQuestionResult">
+        <result property="id"    column="id"    />
+        <result property="openid"    column="openid"    />
+        <result property="question"    column="question"    />
+        <result property="replyFlag"    column="reply_flag"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectSysAskNutritionQuestionVo">
+        id, openid, question, reply_flag, create_time, create_by, update_time, update_by, del_flag
+    </sql>
+
+    <select id="selectSysAskNutritionQuestionList" parameterType="SysAskNutritionQuestion" resultMap="SysAskNutritionQuestionResult">
+        select
+        <include refid="selectSysAskNutritionQuestionVo"/>
+        from sys_ask_nutrition_question where del_flag = 0
+        <if test="question != null  and question != ''"> and question like concat('%',#{question},'%')</if>
+    </select>
+
+    <select id="selectSysAskNutritionQuestionById" parameterType="Long" resultMap="SysAskNutritionQuestionResult">
+        select
+        <include refid="selectSysAskNutritionQuestionVo"/>
+        from sys_ask_nutrition_question
+        where id = #{id} and del_flag = 0
+    </select>
+
+    <insert id="insertSysAskNutritionQuestion" parameterType="SysAskNutritionQuestion" useGeneratedKeys="true" keyProperty="id">
+        insert into sys_ask_nutrition_question
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="openid != null">openid,</if>
+            <if test="question != null">question,</if>
+            <if test="replyFlag != null">reply_flag,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="delFlag != null">del_flag,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="openid != null">#{openid},</if>
+            <if test="question != null">#{question},</if>
+            <if test="replyFlag != null">#{replyFlag},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSysAskNutritionQuestion" parameterType="SysAskNutritionQuestion">
+        update sys_ask_nutrition_question
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="openid != null">openid = #{openid},</if>
+            <if test="question != null">question = #{question},</if>
+            <if test="replyFlag != null">reply_flag = #{replyFlag},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSysAskNutritionQuestionById" parameterType="Long">
+        update sys_ask_nutrition_question set del_flag = 1 where id = #{id}
+    </delete>
+
+    <delete id="deleteSysAskNutritionQuestionByIds" parameterType="String">
+        update sys_ask_nutrition_question set del_flag = 1 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

stdiet-ui/src/components/PunchLog/PunchLogDetail/index.vue

@@ -39,22 +39,22 @@
                 <h4>食物照片</h4>
                 <div>
                   <el-image v-for="(item, index) in punchLog.imagesUrl.breakfastImages" title="点击大图预览" :key="index"
-                  style="width: 300px; height: 300px"
+                  class="food_image_first"
                   :src="item"
                   :preview-src-list="imageUrl">
                   </el-image>
                    <el-image v-for="(item, index) in punchLog.imagesUrl.lunchImages" title="点击大图预览" :key="index"
-                  style="width: 300px; height: 300px"
+                  class="food_image"
                   :src="item"
                   :preview-src-list="imageUrl">
                   </el-image>
                   <el-image v-for="(item, index) in punchLog.imagesUrl.dinnerImages" title="点击大图预览" :key="index"
-                  style="width: 300px; height: 300px"
+                  class="food_image"
                   :src="item"
                   :preview-src-list="imageUrl">
                   </el-image>
                   <el-image v-for="(item, index) in punchLog.imagesUrl.extraMealImages" title="点击大图预览" :key="index"
-                  style="width: 300px; height: 300px"
+                  class="food_image"
                   :src="item"
                   :preview-src-list="imageUrl">
                   </el-image>
@@ -288,4 +288,14 @@ export default {
 
 <style lang="scss" scoped>
 
+    .food_image_first{
+      width: 300px;
+      height: 300px;
+    }
+
+    .food_image{
+      width: 300px;
+      height: 300px;
+      margin-left:10px
+    }
 </style>