From 0481353111afb43a2322e18530dde26f1d841ead Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 11:15:34 +0800
Subject: [PATCH] 代码调整
---
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java | 139 ----------------------------------------------
1 files changed, 1 insertions(+), 138 deletions(-)
diff --git a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java
index 2ace73b..e1e332e 100644
--- a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java
+++ b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.shiro.ShiroKit;
-import com.stylefeng.guns.core.util.DateUtil;
-import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.util.AddAdminLogUtil;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -235,75 +234,6 @@
}
/**
- * 跳转到添加亲密账户协议管理
- */
- @RequestMapping("/intimateAgreement")
- public String intimateAgreement(Model model) {
- TAgreement tAgreement = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type",16));
- if (ToolUtil.isEmpty(tAgreement)){
- tAgreement = new TAgreement();
- tAgreement.setContent("");
- tAgreement.setId(0);
- }
- model.addAttribute("item",tAgreement);
- return PREFIX + "intimateAgreement.html";
- }
-
-
- /**
- * 租车协议
- * @param model
- * @return
- */
- @RequestMapping("/rentalCarAgreement")
- public String rentalCarAgreement(Model model) {
- TAgreement tAgreement = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type",19));
- if (ToolUtil.isEmpty(tAgreement)){
- tAgreement = new TAgreement();
- tAgreement.setContent("");
- tAgreement.setId(0);
- }
- model.addAttribute("item",tAgreement);
- return PREFIX + "rentalCarAgreement.html";
- }
-
- /**
- * 车辆售卖协议
- * @param model
- * @return
- */
- @RequestMapping("/sellCarsAgreement")
- public String sellCarsAgreement(Model model) {
- TAgreement tAgreement = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type",20));
- if (ToolUtil.isEmpty(tAgreement)){
- tAgreement = new TAgreement();
- tAgreement.setContent("");
- tAgreement.setId(0);
- }
- model.addAttribute("item",tAgreement);
- return PREFIX + "sellCarsAgreement.html";
- }
-
-
- /**
- * 车辆售卖协议
- * @param model
- * @return
- */
- @RequestMapping("/carBuyingProblem")
- public String carBuyingProblem(Model model) {
- TAgreement tAgreement = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type",21));
- if (ToolUtil.isEmpty(tAgreement)){
- tAgreement = new TAgreement();
- tAgreement.setContent("");
- tAgreement.setId(0);
- }
- model.addAttribute("item",tAgreement);
- return PREFIX + "carBuyingProblem.html";
- }
-
-
- /**
* 获取用户端协议管理列表
*/
@RequestMapping(value = "/list")
@@ -342,46 +272,6 @@
return SUCCESS_TIP;
}
-
- /**
- * 新增或修改亲密账户协议
- */
- @RequestMapping(value = "/addOrUpdateIntimateAgreement")
- @ResponseBody
- public Object addOrUpdateIntimateAgreement(TAgreement tAgreement) {
- if (tAgreement.getId() == 0){
- tAgreement.setId(null);
- tAgreement.setInsertUser(ShiroKit.getUser().getName());
- tAgreement.setUseType(1);
- tAgreement.setType(16);
- tAgreement.setFlag("1");
- tAgreement.setInsertTime(DateUtil.parseTime(DateUtil.getTime()));
- tAgreement.setUpdateUser(ShiroKit.getUser().getId());
-
- /// 过滤富文本的特殊字符
- String content = tAgreement.getContent();
- content = content.replaceAll("& lt;", "<").replaceAll("& gt;", ">");
-
- content = content.replaceAll("\\(", "& #40;").replaceAll("\\)", "& #41;");
- tAgreement.setContent(content);
- tAgreementService.insert(tAgreement);
- }else {
- tAgreement.setUpdateUser(ShiroKit.getUser().getId());
- tAgreement.setUpdateTime(DateUtil.parseTime(DateUtil.getTime()));
- tAgreement.setFlag("2");
-
- /// 过滤富文本的特殊字符
- String content = tAgreement.getContent();
- content = content.replaceAll("& lt;", "<").replaceAll("& gt;", ">");
-
- content = content.replaceAll("\\(", "& #40;").replaceAll("\\)", "& #41;");
- tAgreement.setContent(content);
- tAgreementService.updateById(tAgreement);
- }
- return SUCCESS_TIP;
- }
-
-
/**
* 用户端协议管理详情
*/
@@ -389,32 +279,5 @@
@ResponseBody
public Object detail(@PathVariable("tAgreementId") Integer tAgreementId) {
return tAgreementService.selectById(tAgreementId);
- }
-
-
-
- /**
- * 跳转到超时扣款协议
- * @param model
- * @return
- */
- @RequestMapping("/timeOutDeduct")
- public String timeOutDeduct(Model model) {
- TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 17));
- model.addAttribute("one",one);
- return PREFIX + "tAgreementTimeOutDeduct.html";
- }
-
-
- /**
- * 跳转到投诉扣款协议
- * @param model
- * @return
- */
- @RequestMapping("/complaintDeduct")
- public String complaintDeduct(Model model) {
- TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 18));
- model.addAttribute("one",one);
- return PREFIX + "tAgreementComplaintDeduct.html";
}
}
--
Gitblit v1.7.1