From 0ad75f90e6464b95bef06c88227f521c5c03d41d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 06 五月 2023 16:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THtmlController.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THtmlController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THtmlController.java
index cc3c68e..9f27ad3 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THtmlController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THtmlController.java
@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.system.controller.general;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.modular.system.controller.util.LabelReplaceUtil;
@@ -14,6 +16,8 @@
import org.springframework.web.bind.annotation.RequestParam;
import com.stylefeng.guns.modular.system.model.THtml;
import com.stylefeng.guns.modular.system.service.ITHtmlService;
+
+import java.util.Objects;
/**
* 控制器
@@ -128,6 +132,52 @@
}
/**
+ * 跳转到代驾服务协议与隐私政策保护,法律条款,个人信息处理规则
+ */
+ @RequestMapping("/agreementExplain")
+ public String agentDrivingServiceExplain(Integer type,Model model) {
+ THtml one = queryHtmlByType(HtmlTypeEnum.AGENT_DRIVING_SERVICE_EXPLAIN.getCode());
+ model.addAttribute("one",one);
+ THtml two = queryHtmlByType(HtmlTypeEnum.CLAUSE.getCode());
+ model.addAttribute("two",two);
+ THtml three = queryHtmlByType(HtmlTypeEnum.PERSONAL_INFORMATION_RULES.getCode());
+ model.addAttribute("three",three);
+ return PREFIX + "agreementExplain.html";
+ }
+
+ /**
+ * 跳转到加盟基本要求
+ */
+ @RequestMapping("/requirementsJoinExplain")
+ public String requirementsJoinExplain(Model model) {
+ THtml tHtml = queryHtmlByType(HtmlTypeEnum.BASIC_REQUIREMENTS_JOINING.getCode());
+ JSONObject jsonObject = JSONObject.parseObject(tHtml.getHtml());
+ JSONArray rules = jsonObject.getJSONArray("rules");
+ JSONArray objects = new JSONArray();
+ for (int i = 0; i < rules.size(); i++) {
+ JSONObject jsonObject1 = JSONObject.parseObject(JSONObject.toJSONString(rules.get(i)));
+ if(i == 0){
+ jsonObject1.put("key",0);
+ }else {
+ jsonObject1.put("key",1);
+ }
+ objects.add(jsonObject1);
+ }
+ model.addAttribute("array",objects);
+ model.addAttribute("id",tHtml.getId());
+ return PREFIX + "requirementsJoinExplain.html";
+ }
+
+ /**
+ * 跳转到代驾服务协议与隐私政策保护,法律条款,个人信息处理规则
+ */
+ @RequestMapping("/agreement")
+ @ResponseBody
+ public Object agreement(Integer type) {
+ return queryHtmlByType(type);
+ }
+
+ /**
* 获取列表
*/
@RequestMapping(value = "/list")
--
Gitblit v1.7.1