diff --git a/admin-pc/src/views/jeecg/report/Analysis.vue b/admin-pc/src/views/jeecg/report/Analysis.vue
index f2f8d69..5633972 100644
--- a/admin-pc/src/views/jeecg/report/Analysis.vue
+++ b/admin-pc/src/views/jeecg/report/Analysis.vue
@@ -1,698 +1,698 @@
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/applet-answer-api/src/main/java/org/jeecg/api/controller/AnswerAppletIndexController.java b/applet-answer-api/src/main/java/org/jeecg/api/controller/AnswerAppletIndexController.java
index c7ea599..693ff54 100644
--- a/applet-answer-api/src/main/java/org/jeecg/api/controller/AnswerAppletIndexController.java
+++ b/applet-answer-api/src/main/java/org/jeecg/api/controller/AnswerAppletIndexController.java
@@ -135,6 +135,14 @@ public class AnswerAppletIndexController {
+ //查询所有隐私政策列表
+ @ApiOperation(value="查询所有隐私政策列表", notes="查询所有隐私政策列表")
+ @GetMapping(value = "/privacyPolicyList")
+ public Result privacyPolicyList(){
+ return answerAppletIndexService.privacyPolicyList();
+ }
+
+
diff --git a/applet-answer-api/src/main/java/org/jeecg/api/service/AnswerAppletIndexService.java b/applet-answer-api/src/main/java/org/jeecg/api/service/AnswerAppletIndexService.java
index ea90c7c..89aa058 100644
--- a/applet-answer-api/src/main/java/org/jeecg/api/service/AnswerAppletIndexService.java
+++ b/applet-answer-api/src/main/java/org/jeecg/api/service/AnswerAppletIndexService.java
@@ -38,6 +38,9 @@ public interface AnswerAppletIndexService {
//公共配置接口
Result commonConfig();
+ //查询所有隐私政策列表
+ Result privacyPolicyList();
+
//首页-获取文章列表
Result articleList();
diff --git a/applet-answer-api/src/main/java/org/jeecg/api/service/impl/AnswerAppletIndexServiceImpl.java b/applet-answer-api/src/main/java/org/jeecg/api/service/impl/AnswerAppletIndexServiceImpl.java
index 9873a4c..3587cd8 100644
--- a/applet-answer-api/src/main/java/org/jeecg/api/service/impl/AnswerAppletIndexServiceImpl.java
+++ b/applet-answer-api/src/main/java/org/jeecg/api/service/impl/AnswerAppletIndexServiceImpl.java
@@ -34,6 +34,8 @@ import org.jeecg.modules.answerTopiLog.entity.AnswerTopiLog;
import org.jeecg.modules.answerTopiLog.service.IAnswerTopiLogService;
import org.jeecg.modules.answerTopic.entity.AnswerTopic;
import org.jeecg.modules.answerTopic.service.IAnswerTopicService;
+import org.jeecg.modules.answerYszc.entity.AnswerYszc;
+import org.jeecg.modules.answerYszc.service.IAnswerYszcService;
import org.jeecg.modules.commonBanner.entity.CommonBanner;
import org.jeecg.modules.commonBanner.service.ICommonBannerService;
import org.jeecg.modules.commonConfig.entity.CommonConfig;
@@ -76,7 +78,8 @@ public class AnswerAppletIndexServiceImpl implements AnswerAppletIndexService {
//公共配置
@Resource
private ICommonConfigService commonConfigService;
-
+ @Resource
+ private IAnswerYszcService answerYszcService;
//问题主表
@Autowired
@@ -184,6 +187,15 @@ public class AnswerAppletIndexServiceImpl implements AnswerAppletIndexService {
return Result.OK(list);
}
+ //查询所有隐私政策列表
+ @Override
+ public Result privacyPolicyList(){
+ List list = answerYszcService.lambdaQuery()
+ .orderByDesc(AnswerYszc::getSort)
+ .list();
+ return Result.OK(list);
+ }
+
//首页-获取文章列表
@Override
public Result articleList(){
diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/answerReservation/controller/AnswerReservationController.java b/applet-answer-api/src/main/java/org/jeecg/modules/answerReservation/controller/AnswerReservationController.java
index 8830296..fc45fda 100644
--- a/applet-answer-api/src/main/java/org/jeecg/modules/answerReservation/controller/AnswerReservationController.java
+++ b/applet-answer-api/src/main/java/org/jeecg/modules/answerReservation/controller/AnswerReservationController.java
@@ -220,9 +220,9 @@ public class AnswerReservationController extends JeecgController data) throws IOException {
+ public void sendTemplateMessage2(String accessToken, String toUser, String templateId, Map data,String orderId) throws IOException {
String url = TEMPLATE_MESSAGE_URL + accessToken;
Map requestBody = new HashMap<>();
requestBody.put("touser", toUser);
requestBody.put("template_id", templateId);
+ requestBody.put("page", "pages/index/cancelArticle?type=reservationSuccessful&id="+orderId);
requestBody.put("data", data);
ObjectMapper objectMapper = new ObjectMapper();
diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/controller/AnswerYszcController.java b/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/controller/AnswerYszcController.java
new file mode 100644
index 0000000..b8d1e8e
--- /dev/null
+++ b/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/controller/AnswerYszcController.java
@@ -0,0 +1,171 @@
+package org.jeecg.modules.answerYszc.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.answerYszc.entity.AnswerYszc;
+import org.jeecg.modules.answerYszc.service.IAnswerYszcService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 隐私政策表
+ * @Author: jeecg-boot
+ * @Date: 2025-02-21
+ * @Version: V1.0
+ */
+@Api(tags="隐私政策表")
+@RestController
+@RequestMapping("/answerYszc/answerYszc")
+@Slf4j
+public class AnswerYszcController extends JeecgController {
+ @Autowired
+ private IAnswerYszcService answerYszcService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param answerYszc
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "隐私政策表-分页列表查询")
+ @ApiOperation(value="隐私政策表-分页列表查询", notes="隐私政策表-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result> queryPageList(AnswerYszc answerYszc,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(answerYszc, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = answerYszcService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param answerYszc
+ * @return
+ */
+ @AutoLog(value = "隐私政策表-添加")
+ @ApiOperation(value="隐私政策表-添加", notes="隐私政策表-添加")
+ @PostMapping(value = "/add")
+ public Result add(@RequestBody AnswerYszc answerYszc) {
+ answerYszcService.save(answerYszc);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param answerYszc
+ * @return
+ */
+ @AutoLog(value = "隐私政策表-编辑")
+ @ApiOperation(value="隐私政策表-编辑", notes="隐私政策表-编辑")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result edit(@RequestBody AnswerYszc answerYszc) {
+ answerYszcService.updateById(answerYszc);
+ return Result.OK("编辑成功!");
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "隐私政策表-通过id删除")
+ @ApiOperation(value="隐私政策表-通过id删除", notes="隐私政策表-通过id删除")
+ @DeleteMapping(value = "/delete")
+ public Result delete(@RequestParam(name="id",required=true) String id) {
+ answerYszcService.removeById(id);
+ return Result.OK("删除成功!");
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "隐私政策表-批量删除")
+ @ApiOperation(value="隐私政策表-批量删除", notes="隐私政策表-批量删除")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.answerYszcService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("批量删除成功!");
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "隐私政策表-通过id查询")
+ @ApiOperation(value="隐私政策表-通过id查询", notes="隐私政策表-通过id查询")
+ @GetMapping(value = "/queryById")
+ public Result queryById(@RequestParam(name="id",required=true) String id) {
+ AnswerYszc answerYszc = answerYszcService.getById(id);
+ if(answerYszc==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(answerYszc);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param answerYszc
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, AnswerYszc answerYszc) {
+ return super.exportXls(request, answerYszc, AnswerYszc.class, "隐私政策表");
+ }
+
+ /**
+ * 通过excel导入数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, AnswerYszc.class);
+ }
+
+}
diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/entity/AnswerYszc.java b/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/entity/AnswerYszc.java
new file mode 100644
index 0000000..e5dc618
--- /dev/null
+++ b/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/entity/AnswerYszc.java
@@ -0,0 +1,62 @@
+package org.jeecg.modules.answerYszc.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 隐私政策表
+ * @Author: jeecg-boot
+ * @Date: 2025-02-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("answer_yszc")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="answer_yszc对象", description="隐私政策表")
+public class AnswerYszc implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private java.lang.String id;
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private java.lang.String createBy;
+ /**创建日期*/
+ @ApiModelProperty(value = "创建日期")
+ private java.util.Date createTime;
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private java.lang.String updateBy;
+ /**更新日期*/
+ @ApiModelProperty(value = "更新日期")
+ private java.util.Date updateTime;
+ /**排序*/
+ @Excel(name = "排序", width = 15)
+ @ApiModelProperty(value = "排序")
+ private java.lang.String sort;
+ /**隐私名称*/
+ @Excel(name = "隐私名称", width = 15)
+ @ApiModelProperty(value = "隐私名称")
+ private java.lang.String title;
+ /**内容*/
+ @Excel(name = "内容", width = 15)
+ @ApiModelProperty(value = "内容")
+ private java.lang.String details;
+}
diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/mapper/AnswerYszcMapper.java b/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/mapper/AnswerYszcMapper.java
new file mode 100644
index 0000000..efba514
--- /dev/null
+++ b/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/mapper/AnswerYszcMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.answerYszc.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.answerYszc.entity.AnswerYszc;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 隐私政策表
+ * @Author: jeecg-boot
+ * @Date: 2025-02-21
+ * @Version: V1.0
+ */
+public interface AnswerYszcMapper extends BaseMapper {
+
+}
diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/mapper/xml/AnswerYszcMapper.xml b/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/mapper/xml/AnswerYszcMapper.xml
new file mode 100644
index 0000000..e16e08c
--- /dev/null
+++ b/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/mapper/xml/AnswerYszcMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/service/IAnswerYszcService.java b/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/service/IAnswerYszcService.java
new file mode 100644
index 0000000..410f02d
--- /dev/null
+++ b/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/service/IAnswerYszcService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.answerYszc.service;
+
+import org.jeecg.modules.answerYszc.entity.AnswerYszc;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 隐私政策表
+ * @Author: jeecg-boot
+ * @Date: 2025-02-21
+ * @Version: V1.0
+ */
+public interface IAnswerYszcService extends IService {
+
+}
diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/service/impl/AnswerYszcServiceImpl.java b/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/service/impl/AnswerYszcServiceImpl.java
new file mode 100644
index 0000000..2eac132
--- /dev/null
+++ b/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/service/impl/AnswerYszcServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.answerYszc.service.impl;
+
+import org.jeecg.modules.answerYszc.entity.AnswerYszc;
+import org.jeecg.modules.answerYszc.mapper.AnswerYszcMapper;
+import org.jeecg.modules.answerYszc.service.IAnswerYszcService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 隐私政策表
+ * @Author: jeecg-boot
+ * @Date: 2025-02-21
+ * @Version: V1.0
+ */
+@Service
+public class AnswerYszcServiceImpl extends ServiceImpl implements IAnswerYszcService {
+
+}
diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/vue/AnswerYszcList.vue b/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/vue/AnswerYszcList.vue
new file mode 100644
index 0000000..0288143
--- /dev/null
+++ b/applet-answer-api/src/main/java/org/jeecg/modules/answerYszc/vue/AnswerYszcList.vue
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+
+
新增
+
导出
+
+ 导入
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+ 无图片
+ ![]()
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 详情
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+ 导出
+ 导入
+
+
+
+
+
+ 删除
+
+
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无文件
+ 下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+ {{ toggleSearchStatus ? '收起' : '展开' }}
+
+
+
+
+
+
+
+
新增
+
导出
+
+ 导入
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+ 无图片
+ ![]()
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 详情
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+ 导出
+ 导入
+
+
+
+
+
+ 删除
+
+
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 无文件
+ 下载
+
+
+
+
+