From 19251fb5596415bfa83c51b8ed130ecbb31644ce Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 09 十月 2023 18:31:30 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 309 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 289 insertions(+), 20 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index 16910ce..070b2e5 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -29,8 +29,10 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 车辆管理控制器
@@ -73,7 +75,8 @@
@Autowired
private TStoreOtherService storeOtherService;
-
+ @Autowired
+ private TOperatorService tOperatorService;
/**
@@ -97,6 +100,8 @@
model.addAttribute("list",list);
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("role",roleid);
+ List<TOperator> list1 = tOperatorService.list();
+ model.addAttribute("yysList",list1);
return PREFIX + "tShop_add.html";
}
@RequestMapping("/tShop_add_one")
@@ -109,11 +114,20 @@
return PREFIX + "tShop_add_one.html";
}
@RequestMapping("/tShop_add_two")
- public String tCompetitionAddTwo(Model model) {
+ public String tCompetitionAddTwo(Integer id,Model model) {
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
model.addAttribute("list",list);
+ model.addAttribute("id",id);
String roleid = UserExt.getUser().getRoleid();
- return PREFIX + "tShop_add_two.html";
+ return PREFIX + "TShop_edit_three.html";
+ }
+ @RequestMapping("/tShop_add_two1")
+ public String tCompetitionAddTwo1(Integer id,Model model) {
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list);
+ model.addAttribute("id",id);
+ String roleid = UserExt.getUser().getRoleid();
+ return PREFIX + "TShop_add_two.html";
}
@@ -123,25 +137,52 @@
@RequestMapping("/tShop_update/{id}")
public String tCityUpdate(@PathVariable Integer id, Model model) {
TStore byId = storeService.getById(id);
+ System.out.println("======byId========="+byId);
model.addAttribute("item",byId);
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
- model.addAttribute("list",list);
- TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId.getProvinceCode()));
- List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId,one.getId()));
+
+// TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId.getProvinceCode()));
+ List<TOperatorCity> one = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, byId.getOperatorId()).eq(TOperatorCity::getType, 1));
+ List<TOperatorCity> ones = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, byId.getOperatorId()).eq(TOperatorCity::getType, 1));
+
+ if(ones.size()>0){
+ model.addAttribute("list",ones);
+ TOperatorCity one1 = operatorCityService.getOne(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, byId.getOperatorId()).eq(TOperatorCity::getType, 1).eq(TOperatorCity::getCode,byId.getProvinceCode()));
+ List<TOperatorCity> list3 = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().in(TOperatorCity::getPid, one1.getId()).eq(TOperatorCity::getType, 2));
+ model.addAttribute("list1",list3);
+ System.out.println("===list3======="+list3);
+
+ }else {
+ List<TCity> list2 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list2);
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId.getProvinceCode()));
+ List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId,one1.getId()));
+ model.addAttribute("list1",list1);
+ System.out.println("===list1======="+list1);
+ }
CityListQuery cityListQuery = new CityListQuery();
cityListQuery.setOffset(1);
cityListQuery.setLimit(10000);
cityListQuery.setCityCode(byId.getCityCode());
Page<TCityManager> list2 = cityClient.list(cityListQuery);
- model.addAttribute("list1",list1);
+
+ List<TOperator> list1 = tOperatorService.list();
+ model.addAttribute("yysList",list1);
+
model.addAttribute("list2",list2.getRecords());
String roleid = UserExt.getUser().getRoleid();
- model.addAttribute("role",roleid);
+ model.addAttribute("role",roleid);
model.addAttribute("time",byId.getStartTime()+" - "+byId.getEndTime());
User byId1 = userMapper.selectById(byId.getStoreStaffId());
model.addAttribute("city",byId1);
model.addAttribute("type",1);
return PREFIX + "tShop_edit.html";
+ }
+ @RequestMapping("/tShop_update1/{id}")
+ public String tCityUpdate1(@PathVariable Integer id, Model model) {
+ TStoreOther byId = storeOtherService.getById(id);
+ model.addAttribute("item",byId);
+ return PREFIX + "tShop_edit_one.html";
}
@@ -160,6 +201,20 @@
model.addAttribute("list1",list1);
return PREFIX + "tShop_edit_two.html";
+ }
+ @RequestMapping("/tShop_update_one1/{id}")
+ public String tCityUpdateOne1(@PathVariable Integer id, Model model) {
+ TStoreOtherConfigTrue byId = tStoreOtherConfigTrueService.getById(id);
+ TTurn one = tTurnService.getOne(new LambdaQueryWrapper<TTurn>().eq(TTurn::getName, byId.getName()));
+ // page list
+ List<TTurn> list = tTurnService.list(new LambdaQueryWrapper<TTurn>().eq(TTurn::getPid, one.getId()));
+ // type list
+ List<TTurn> list1 = tTurnService.list(new LambdaQueryWrapper<TTurn>().eq(TTurn::getPid, byId.getPageId()));
+ model.addAttribute("item",byId);
+ model.addAttribute("list",list);
+ model.addAttribute("list1",list1);
+
+ return PREFIX + "tShop_add_three.html";
}
@@ -241,16 +296,59 @@
page.setRecords(list);
return super.packForBT(page);
}
+ @RequestMapping(value = "/listTwo1")
+ @ResponseBody
+ public Object listTwo1(Integer id) {
+ Page<TStoreOtherConfigTrue> page = new PageFactory<TStoreOtherConfigTrue>().defaultPage();
+ List<TStoreOtherConfigTrue> list = tStoreOtherConfigTrueService.page(page,new LambdaQueryWrapper<TStoreOtherConfigTrue>().eq(TStoreOtherConfigTrue::getPid, id).eq(TStoreOtherConfigTrue::getState,1)).getRecords();
+ page.setRecords(list);
+ return super.packForBT(page);
+ }
@RequestMapping(value = "/add")
@ResponseBody
- public Object list(TStore tStore,String time,String userName,String userPhone,String ids,Integer type,Integer yyId,String lat,String lon) {
+ public Object list(TStore tStore,String time,String userName,String userPhone,String ids,Integer type,Integer yyId,String lat,String lon,String pCode1,String cCode1) {
try {
- if(ToolUtil.isNotEmpty(tStore.getProvinceCode())) {
- TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, tStore.getProvinceCode()));
+ if(yyId==null){
+ yyId=0;
+ }
+ if(yyId!=0) {
+ List<TOperatorCity> list1 = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, yyId));
+ if(list1.size()>0){
+ if (ToolUtil.isNotEmpty(tStore.getProvinceCode())) {
+ TOperatorCity byId = operatorCityService.getById(tStore.getProvinceCode());
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId.getCode()));
+ tStore.setProvince(one.getName());
+ tStore.setProvinceCode(one.getCode());
+ List<TOperatorCity> list = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getPid, byId.getId()).eq(TOperatorCity::getType, 2));
+ if (list.size() > 0) {
+ TOperatorCity byId1 = operatorCityService.getById(tStore.getCityCode());
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId1.getCode()));
+ tStore.setCity(one1.getName());
+ tStore.setCityCode(one1.getCode());
+ } else {
+ TCity byId1 = cityService.getById(tStore.getCityCode());
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId1.getCode()));
+ tStore.setCity(one1.getName());
+ tStore.setCityCode(one1.getCode());
+ }
+ }
+ }else {
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getProvinceCode()));
+ tStore.setProvince(one.getName());
+ tStore.setProvinceCode(one.getCode());
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getCityCode()));
+ tStore.setCity(one1.getName());
+ tStore.setCityCode(one1.getCode());
+ }
+
+ }else {
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, pCode1));
tStore.setProvince(one.getName());
- TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, tStore.getCityCode()));
+ tStore.setProvinceCode(one.getCode());
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, cCode1));
tStore.setCity(one1.getName());
+ tStore.setCityCode(one1.getCode());
}
tStore.setStartTime(time.split(" - ")[0]);
tStore.setEndTime(time.split(" - ")[1]);
@@ -258,6 +356,7 @@
tStore.setType(type);
tStore.setOperatorId(yyId);
tStore.setState(1);
+ tStore.setCreateTime(new Date());
User user = new User();
List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getAccount, userPhone));
if(users.size()>0){
@@ -294,15 +393,53 @@
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(TStore tStore,String time,String userName,String userPhone,String ids,Integer type,Integer yyId) {
+ public Object update(TStore tStore,String time,String userName,String userPhone,String ids,Integer type,Integer yyId,String lat,String lon,String pCode1,String cCode1) {
try {
- TStore byId = storeService.getById(tStore.getId());
+ TStore byIdc = storeService.getById(tStore.getId());
- if(ToolUtil.isNotEmpty(tStore.getProvinceCode())) {
- TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, tStore.getProvinceCode()));
+ if(yyId==null){
+ yyId=0;
+ }
+ if(tStore.getType()==1){
+ yyId=0;
+ }
+ if(yyId!=0) {
+ List<TOperatorCity> list1 = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, yyId));
+ if(list1.size()>0){
+ if (ToolUtil.isNotEmpty(tStore.getProvinceCode())) {
+ TOperatorCity byId = operatorCityService.getById(tStore.getProvinceCode());
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId.getCode()));
+ tStore.setProvince(one.getName());
+ tStore.setProvinceCode(one.getCode());
+ List<TOperatorCity> list = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getPid, byId.getId()).eq(TOperatorCity::getType, 2));
+ if (list.size() > 0) {
+ TOperatorCity byId1 = operatorCityService.getById(tStore.getCityCode());
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId1.getCode()));
+ tStore.setCity(one1.getName());
+ tStore.setCityCode(one1.getCode());
+ } else {
+ TCity byId1 = cityService.getById(tStore.getCityCode());
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId1.getCode()));
+ tStore.setCity(one1.getName());
+ tStore.setCityCode(one1.getCode());
+ }
+ }
+ }else {
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getProvinceCode()));
+ tStore.setProvince(one.getName());
+ tStore.setProvinceCode(one.getCode());
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getCityCode()));
+ tStore.setCity(one1.getName());
+ tStore.setCityCode(one1.getCode());
+ }
+
+ }else {
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getProvinceCode()));
tStore.setProvince(one.getName());
- TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, tStore.getCityCode()));
+ tStore.setProvinceCode(one.getCode());
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getCityCode()));
tStore.setCity(one1.getName());
+ tStore.setCityCode(one1.getCode());
}
tStore.setStartTime(time.split(" - ")[0]);
tStore.setEndTime(time.split(" - ")[1]);
@@ -310,9 +447,9 @@
tStore.setType(type);
tStore.setOperatorId(yyId);
if(ToolUtil.isEmpty(tStore.getCoverDrawing())){
- tStore.setCoverDrawing(byId.getCoverDrawing());
+ tStore.setCoverDrawing(byIdc.getCoverDrawing());
}
- User user = userMapper.selectById(byId.getStoreStaffId());
+ User user = userMapper.selectById(byIdc.getStoreStaffId());
List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getAccount, userPhone).ne(User::getId,tStore.getStoreStaffId()));
if(users.size()>0){
return "5001";
@@ -321,6 +458,8 @@
user.setName(userName);
user.setPhone(userPhone);
userMapper.updateById(user);
+ tStore.setLon(lon);
+ tStore.setLat(lat);
storeService.updateById(tStore);
return new SuccessTip<>();
}catch (Exception e){
@@ -400,6 +539,55 @@
}
}
+ @Autowired
+ private TOperatorCityService operatorCityService;
+
+ @RequestMapping(value = "/onChange1")
+ @ResponseBody
+ public Object onChange1(Integer oneId) {
+ try {
+ List<TOperatorCity> list = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, oneId).eq(TOperatorCity::getType, 1));
+ if(list.size()==0){
+ List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ return list1;
+ }else {
+
+ return list;
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+
+ @RequestMapping(value = "/onChange2")
+ @ResponseBody
+ public Object onChange2(Integer oneId) {
+ try {
+ List<TOperatorCity> list1 = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getId, oneId).eq(TOperatorCity::getType, 1));
+ List<TOperatorCity> list = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getPid, oneId).eq(TOperatorCity::getType, 2));
+
+ // 若是全国 为空 去找这个省下面的市
+ if(list1.size()==0){
+ TCity byId = cityService.getById(oneId);
+ List<TCity> list2 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, byId.getId()));
+ return list2;
+ }
+ if(list.size()==0){
+ TOperatorCity tOperatorCity = list1.get(0);
+ Integer code = tOperatorCity.getCode();
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, code));
+ List<TCity> list2 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, one.getId()));
+ return list2;
+ }else {
+ return list;
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+
@RequestMapping(value = "/cancel")
public Object cancel(Integer id) {
@@ -416,6 +604,33 @@
public Object delete1(Integer id) {
try {
storeService.delete1(id);
+ return SUCCESS_TIP;
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+ @ResponseBody
+ @RequestMapping(value = "/deleteTwo")
+ public Object delete2(Integer id) {
+ try {
+ TStoreOtherConfigTrue byId = tStoreOtherConfigTrueService.getById(id);
+
+ byId.setState(2);
+ tStoreOtherConfigTrueService.updateById(byId);
+ return SUCCESS_TIP;
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+ @ResponseBody
+ @RequestMapping(value = "/del")
+ public Object del(Integer id) {
+ try {
+ storeOtherService.removeById(id);
+ tStoreOtherConfigTrueService.remove(new LambdaQueryWrapper<TStoreOtherConfigTrue>().eq(TStoreOtherConfigTrue::getPid,id));
+
return SUCCESS_TIP;
}catch (Exception e){
e.printStackTrace();
@@ -457,6 +672,20 @@
TStore byId = storeService.getById(id);
byId.setState(1);
storeService.updateById(byId);
+ return SUCCESS_TIP;
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
+
+ @RequestMapping(value = "/unfreeze1")
+ @ResponseBody
+ public Object unfreeze1(Integer id,Integer type) {
+ try {
+ TStoreOther byId = storeOtherService.getById(id);
+ byId.setState(type);
+ storeOtherService.updateById(byId);
return SUCCESS_TIP;
}catch (Exception e){
e.printStackTrace();
@@ -508,7 +737,6 @@
* ajax.set("type",type);
* ajax.set("turnId",turnId);
* ajax.set("sort",sort);
- * @param id
* @return
*/
@RequestMapping(value = "/addConfigOne")
@@ -553,6 +781,23 @@
return ERROR;
}
}
+ @RequestMapping(value = "/addConfig1")
+ @ResponseBody
+ public Object addConfig1(String name,Integer id) {
+ try {
+ TStoreOther byId = storeOtherService.getById(id);
+ byId.setName(
+ name
+ );
+ storeOtherService.updateById(byId);
+
+
+ return SUCCESS_TIP;
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
@RequestMapping(value = "/updateConfigOne")
@ResponseBody
public Object addConfigOne(String url,String name,Integer page,Integer type,String turnId,Integer sort,Integer id) {
@@ -577,6 +822,30 @@
return ERROR;
}
}
+ @RequestMapping(value = "/updateConfigOne3")
+ @ResponseBody
+ public Object addConfigOne3(String url,String name,Integer page,Integer type,String turnId,Integer sort,Integer id) {
+ try {
+ TStoreOtherConfigTrue byId = tStoreOtherConfigTrueService.getById(id);
+ if(ToolUtil.isNotEmpty(url)){
+ byId.setUrl(url);
+ }
+ byId.setName(name);
+ TTurn byId1 = tTurnService.getById(page);
+ TTurn byId2 = tTurnService.getById(type);
+ byId.setPage(byId1.getName());
+ byId.setType(byId2.getName());
+ byId.setTurnId(turnId);
+ byId.setSort(sort);
+ byId.setPageId(page);
+ byId.setTypeId(type);
+ tStoreOtherConfigTrueService.updateById(byId);
+ return SUCCESS_TIP;
+ }catch (Exception e){
+ e.printStackTrace();
+ return ERROR;
+ }
+ }
--
Gitblit v1.7.1