From 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 16 五月 2025 10:27:41 +0800
Subject: [PATCH] 修改文档bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java | 293 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 228 insertions(+), 65 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
index c319ccc..36fd92a 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
@@ -9,7 +9,6 @@
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.TServerCarmodel;
import com.stylefeng.guns.modular.system.service.ITServerCarmodelService;
-import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
@@ -45,12 +44,6 @@
@Autowired
private ITServerCarmodelService tServerCarmodelService;
- @Autowired
- private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
-
- @Value("${pushMinistryOfTransport}")
- private boolean pushMinistryOfTransport;
-
@@ -67,19 +60,20 @@
*/
@RequestMapping("/small")
public String small(Model model) {
- //跨城小件物流
- TSystemPrice one = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 5).eq("companyId", ShiroKit.getUser().getObjectId()));
- if (SinataUtil.isNotEmpty(one)){
- JSONObject json1 = JSONObject.fromObject(one.getContent());
- model.addAttribute("json1",json1);
- }
- //同城小件物流
- TSystemPrice two = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 4).eq("companyId", ShiroKit.getUser().getObjectId()));
- if (SinataUtil.isNotEmpty(two)){
- JSONObject json2 = JSONObject.fromObject(two.getContent());
- model.addAttribute("json2",json2);
- }
- return PREFIX + "small.html";
+// //跨城小件物流
+// TSystemPrice one = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 5).eq("companyId", ShiroKit.getUser().getObjectId()));
+// if (SinataUtil.isNotEmpty(one)){
+// JSONObject json1 = JSONObject.fromObject(one.getContent());
+// model.addAttribute("json1",json1);
+// }
+// //同城小件物流
+// TSystemPrice two = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 4).eq("companyId", ShiroKit.getUser().getObjectId()));
+// if (SinataUtil.isNotEmpty(two)){
+// JSONObject json2 = JSONObject.fromObject(two.getContent());
+// model.addAttribute("json2",json2);
+// }
+// return PREFIX + "small.html";
+ return PREFIX + "tSmall.html";
}
/**
@@ -88,7 +82,8 @@
@RequestMapping("/tSystemPrice_add")
public String tSystemPriceAdd(Model model) {
//查询所有专车车型
- List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).ne("state", 3));
+ Integer objectId = ShiroKit.getUser().getObjectId();
+ List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).eq("companyId", objectId).ne("state", 3));
List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
List<TServerCarmodel> serverCarmodels = new ArrayList<>();
for(TServerCarmodel tsc : modelList){
@@ -107,6 +102,29 @@
return PREFIX + "tSystemPrice_add.html";
}
+ @RequestMapping("/tSmallPrice_add")
+ public String tSmallPriceAdd(Model model) {
+ //查询所有专车车型
+ Integer objectId = ShiroKit.getUser().getObjectId();
+ List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 4).eq("companyId", objectId).ne("state", 3));
+ List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 4).eq("state",1));
+ List<TServerCarmodel> serverCarmodels = new ArrayList<>();
+ for(TServerCarmodel tsc : modelList){
+ boolean b = true;
+ for(TSystemPrice tsp : tSystemPrices){
+ if(tsc.getId() == tsp.getServerCarModelId()){
+ b = false;
+ break;
+ }
+ }
+ if(b){
+ serverCarmodels.add(tsc);
+ }
+ }
+ model.addAttribute("modelList",serverCarmodels);
+ return PREFIX + "tSmallPrice_add.html";
+ }
+
/**
* 跳转到修改专车价格设置
*/
@@ -121,21 +139,57 @@
//查询所有专车车型
List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).ne("state", 3));
- List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
+// List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
List<TServerCarmodel> serverCarmodels = new ArrayList<>();
- for(TServerCarmodel tsc : modelList){
- boolean b = true;
- for(TSystemPrice tsp : tSystemPrices){
- if(tsc.getId() == tsp.getServerCarModelId() && tsc.getId() != tSystemPriceId){
- b = false;
- break;
- }
- }
- if(b){
- serverCarmodels.add(tsc);
- }
- }
- model.addAttribute("modelList",serverCarmodels);
+// for(TServerCarmodel tsc : modelList){
+// boolean b = true;
+// for(TSystemPrice tsp : tSystemPrices){
+// if(tsc.getId() == tsp.getServerCarModelId() && tsc.getId() != tSystemPriceId){
+// b = false;
+// break;
+// }
+// }
+// if(b){
+// serverCarmodels.add(tsc);
+// }
+// }
+ TServerCarmodel tSystemPrice1 = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
+ serverCarmodels.add(tSystemPrice1);
+ model.addAttribute("modelList", serverCarmodels);
+
+ return PREFIX + "tSystemPrice_edit.html";
+ }
+
+
+
+ @RequestMapping("/tSmallPrice_update/{tSystemPriceId}")
+ public String tSmallPrice_update(@PathVariable Integer tSystemPriceId, Model model) {
+ TSystemPrice tSystemPrice = tSystemPriceService.selectById(tSystemPriceId);
+ model.addAttribute("item",tSystemPrice);
+ LogObjectHolder.me().set(tSystemPrice);
+
+ JSONObject json = JSONObject.fromObject(tSystemPrice.getContent());
+ model.addAttribute("json",json);
+
+ //查询所有专车车型
+// List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 4).ne("state", 3));
+// List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
+ List<TServerCarmodel> serverCarmodels = new ArrayList<>();
+// for(TServerCarmodel tsc : modelList){
+// boolean b = true;
+// for(TSystemPrice tsp : tSystemPrices){
+// if(tsc.getId() == tsp.getServerCarModelId() && tsc.getId() != tSystemPriceId){
+// b = false;
+// break;
+// }
+// }
+// if(b){
+// serverCarmodels.add(tsc);
+// }
+// }
+ TServerCarmodel tSystemPrice1 = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
+ serverCarmodels.add(tSystemPrice1);
+ model.addAttribute("modelList", serverCarmodels);
return PREFIX + "tSystemPrice_edit.html";
}
@@ -148,6 +202,14 @@
public Object list(String name,Integer state) {
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
page.setRecords(tSystemPriceService.getSpecialPriceList(page,ShiroKit.getUser().getObjectId(),name,state));
+ return super.packForBT(page);
+ }
+
+ @RequestMapping(value = "/listSmall")
+ @ResponseBody
+ public Object listSmall(String name,Integer state) {
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tSystemPriceService.getSpecialPriceList1(page,ShiroKit.getUser().getObjectId(),name,state));
return super.packForBT(page);
}
@@ -165,20 +227,71 @@
.last(" and not FIND_IN_SET(state,'3')"));
if (count > 0){
TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
- return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
+ return new ErrorTip(500, "【"+one.getChineseName()+"】已存在,请重新选择");
}
+ String fareTypeNoteChinese = tSystemPrice.getFareTypeNoteChinese();
+ fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& lt;", "<");
+ fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& gt;", ">");
+ fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& #40;", "(");
+ fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& #41;", ")");
+ tSystemPrice.setFareTypeNoteChinese(fareTypeNoteChinese);
+ String fareTypeNoteEnglish = tSystemPrice.getFareTypeNoteEnglish();
+ fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& lt;", "<");
+ fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& gt;", ">");
+ fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& #40;", "(");
+ fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& #41;", ")");
+ tSystemPrice.setFareTypeNoteEnglish(fareTypeNoteEnglish);
+ String fareTypeNoteFrench = tSystemPrice.getFareTypeNoteFrench();
+ fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& lt;", "<");
+ fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& gt;", ">");
+ fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& #40;", "(");
+ fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& #41;", ")");
+ tSystemPrice.setFareTypeNoteFrench(fareTypeNoteFrench);
+
+
tSystemPrice.setCompanyId(ShiroKit.getUser().getObjectId());
tSystemPrice.setType(1);
tSystemPrice.setState(1);
tSystemPriceService.insert(tSystemPrice);
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){//上传数据
- pushMinistryOfTransportUtil.baseInfoCompanyFare(tSystemPrice.getId());
- }
- }
- }).start();
+ return SUCCESS_TIP;
+ }
+
+ @RequestMapping(value = "/smalladd")
+ @ResponseBody
+ public Object smalladd(TSystemPrice tSystemPrice) {
+ //判断当前公司是否添加过该专车车型价格配置
+ int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
+ .eq("type", 1)
+ .eq("serverCarModelId", tSystemPrice.getServerCarModelId())
+ .eq("companyId",ShiroKit.getUser().getObjectId())
+ .last(" and not FIND_IN_SET(state,'3')"));
+ if (count > 0){
+ TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
+ return new ErrorTip(500, "【"+one.getChineseName()+"】已存在,请重新选择");
+ }
+ String fareTypeNoteChinese = tSystemPrice.getFareTypeNoteChinese();
+ fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& lt;", "<");
+ fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& gt;", ">");
+ fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& #40;", "(");
+ fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& #41;", ")");
+ tSystemPrice.setFareTypeNoteChinese(fareTypeNoteChinese);
+ String fareTypeNoteEnglish = tSystemPrice.getFareTypeNoteEnglish();
+ fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& lt;", "<");
+ fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& gt;", ">");
+ fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& #40;", "(");
+ fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& #41;", ")");
+ tSystemPrice.setFareTypeNoteEnglish(fareTypeNoteEnglish);
+ String fareTypeNoteFrench = tSystemPrice.getFareTypeNoteFrench();
+ fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& lt;", "<");
+ fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& gt;", ">");
+ fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& #40;", "(");
+ fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& #41;", ")");
+ tSystemPrice.setFareTypeNoteFrench(fareTypeNoteFrench);
+
+ tSystemPrice.setCompanyId(ShiroKit.getUser().getObjectId());
+ tSystemPrice.setType(4);
+ tSystemPrice.setState(1);
+ tSystemPriceService.insert(tSystemPrice);
return SUCCESS_TIP;
}
@@ -189,7 +302,7 @@
@ResponseBody
public Object update(TSystemPrice tSystemPrice) {
TSystemPrice obj = tSystemPriceService.selectById(tSystemPrice.getId());
- if (obj.getServerCarModelId() != tSystemPrice.getServerCarModelId()){
+ if (obj.getServerCarModelId().compareTo(tSystemPrice.getServerCarModelId()) != 0){
//判断当前公司是否添加过该专车车型价格配置
int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
.eq("type", 1)
@@ -198,18 +311,68 @@
.last(" and not FIND_IN_SET(state,'3')"));
if (count > 0){
TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
- return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
+ return new ErrorTip(500, "【"+one.getChineseName()+"】已存在,请重新选择");
}
}
+ String fareTypeNoteChinese = tSystemPrice.getFareTypeNoteChinese();
+ fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& lt;", "<");
+ fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& gt;", ">");
+ fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& #40;", "(");
+ fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& #41;", ")");
+ tSystemPrice.setFareTypeNoteChinese(fareTypeNoteChinese);
+ String fareTypeNoteEnglish = tSystemPrice.getFareTypeNoteEnglish();
+ fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& lt;", "<");
+ fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& gt;", ">");
+ fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& #40;", "(");
+ fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& #41;", ")");
+ tSystemPrice.setFareTypeNoteEnglish(fareTypeNoteEnglish);
+ String fareTypeNoteFrench = tSystemPrice.getFareTypeNoteFrench();
+ fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& lt;", "<");
+ fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& gt;", ">");
+ fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& #40;", "(");
+ fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& #41;", ")");
+ tSystemPrice.setFareTypeNoteFrench(fareTypeNoteFrench);
+
tSystemPriceService.updateById(tSystemPrice);
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport) {//上传数据
- pushMinistryOfTransportUtil.baseInfoCompanyFare(tSystemPrice.getId());
- }
+ return SUCCESS_TIP;
+ }
+
+ @RequestMapping(value = "/smallupdate")
+ @ResponseBody
+ public Object smallupdate(TSystemPrice tSystemPrice) {
+ TSystemPrice obj = tSystemPriceService.selectById(tSystemPrice.getId());
+ if (obj.getServerCarModelId().compareTo(tSystemPrice.getServerCarModelId()) != 0){
+ //判断当前公司是否添加过该专车车型价格配置
+ int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
+ .eq("isPackage", 1)
+ .eq("serverCarModelId", tSystemPrice.getServerCarModelId())
+ .eq("companyId",ShiroKit.getUser().getObjectId())
+ .last(" and not FIND_IN_SET(state,'3')"));
+ if (count > 0){
+ TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
+ return new ErrorTip(500, "【"+one.getChineseName()+"】已存在,请重新选择");
}
- }).start();
+ }
+ String fareTypeNoteChinese = tSystemPrice.getFareTypeNoteChinese();
+ fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& lt;", "<");
+ fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& gt;", ">");
+ fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& #40;", "(");
+ fareTypeNoteChinese = fareTypeNoteChinese.replaceAll("& #41;", ")");
+ tSystemPrice.setFareTypeNoteChinese(fareTypeNoteChinese);
+ String fareTypeNoteEnglish = tSystemPrice.getFareTypeNoteEnglish();
+ fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& lt;", "<");
+ fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& gt;", ">");
+ fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& #40;", "(");
+ fareTypeNoteEnglish = fareTypeNoteEnglish.replaceAll("& #41;", ")");
+ tSystemPrice.setFareTypeNoteEnglish(fareTypeNoteEnglish);
+ String fareTypeNoteFrench = tSystemPrice.getFareTypeNoteFrench();
+ fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& lt;", "<");
+ fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& gt;", ">");
+ fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& #40;", "(");
+ fareTypeNoteFrench = fareTypeNoteFrench.replaceAll("& #41;", ")");
+ tSystemPrice.setFareTypeNoteFrench(fareTypeNoteFrench);
+
+ tSystemPriceService.updateById(tSystemPrice);
return SUCCESS_TIP;
}
@@ -238,18 +401,18 @@
@ResponseBody
public Object smallSubmit(String json1,String json2) {
//跨城小件物流
- TSystemPrice one = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 5).eq("companyId", ShiroKit.getUser().getObjectId()));
- if (SinataUtil.isNotEmpty(one)){
- one.setContent(json1);
- tSystemPriceService.updateById(one);
- }else{
- one = new TSystemPrice();
- one.setState(1);
- one.setType(5);
- one.setCompanyId(ShiroKit.getUser().getObjectId());
- one.setContent(json1);
- tSystemPriceService.insert(one);
- }
+// TSystemPrice one = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 5).eq("companyId", ShiroKit.getUser().getObjectId()));
+// if (SinataUtil.isNotEmpty(one)){
+// one.setContent(json1);
+// tSystemPriceService.updateById(one);
+// }else{
+// one = new TSystemPrice();
+// one.setState(1);
+// one.setType(5);
+// one.setCompanyId(ShiroKit.getUser().getObjectId());
+// one.setContent(json1);
+// tSystemPriceService.insert(one);
+// }
//同城小件物流
TSystemPrice two = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 4).eq("companyId", ShiroKit.getUser().getObjectId()));
if (SinataUtil.isNotEmpty(two)){
--
Gitblit v1.7.1