Skip to content
GitLab
Commit 5a3d32de authored by Suncos's avatar Suncos
Browse files

no commit message

parent 5f5877fe
Hide whitespace changes
Inline Side-by-side
JeeSpringCloud/src/main/java/com/company/project/modules/ylttrip/rest/TfTicketRestController.java
View file @ 5a3d32de
...@@ -49,8 +49,10 @@ import org.springframework.web.bind.annotation.*; ...@@ -49,8 +49,10 @@ import org.springframework.web.bind.annotation.*;
@Api(value="订单接口", description="订单接口") @Api(value="订单接口", description="订单接口")
public class TfTicketRestController extends AbstractBaseController { public class TfTicketRestController extends AbstractBaseController {
//调用dubbo服务器是，要去Reference注解,注解Autowired
//@Reference(version = "1.0.0")
@Autowired @Autowired
private ITfTicketService tfTicketService; private ITfTicketService tfTicketServiceImpl;
/** /**
* 订单信息 * 订单信息
...@@ -72,7 +74,7 @@ public class TfTicketRestController extends AbstractBaseController { ...@@ -72,7 +74,7 @@ public class TfTicketRestController extends AbstractBaseController {
private Result get(String id) { private Result get(String id) {
TfTicket entity = null; TfTicket entity = null;
if (StringUtils.isNotBlank(id)){ if (StringUtils.isNotBlank(id)){
entity = tfTicketService.getCache(id); entity = tfTicketServiceImpl.getCache(id);
//entity = tfTicketService.get(id); //entity = tfTicketService.get(id);
} }
if (entity == null){ if (entity == null){
...@@ -102,7 +104,7 @@ public class TfTicketRestController extends AbstractBaseController { ...@@ -102,7 +104,7 @@ public class TfTicketRestController extends AbstractBaseController {
} }
private Result findList(TfTicket tfTicket, Model model) { private Result findList(TfTicket tfTicket, Model model) {
List<TfTicket> list = tfTicketService.findListCache(tfTicket); List<TfTicket> list = tfTicketServiceImpl.findListCache(tfTicket);
//List<TfTicket> list = tfTicketService.findList(tfTicket); //List<TfTicket> list = tfTicketService.findList(tfTicket);
Result result = ResultFactory.getSuccessResult(); Result result = ResultFactory.getSuccessResult();
result.setResultObject(list); result.setResultObject(list);
...@@ -128,7 +130,7 @@ public class TfTicketRestController extends AbstractBaseController { ...@@ -128,7 +130,7 @@ public class TfTicketRestController extends AbstractBaseController {
} }
private Result list(TfTicket tfTicket, Model model) { private Result list(TfTicket tfTicket, Model model) {
Page<TfTicket> page = tfTicketService.findPageCache(new Page<TfTicket>(tfTicket.getPageNo(),tfTicket.getPageSize(),tfTicket.getOrderBy()), tfTicket); Page<TfTicket> page = tfTicketServiceImpl.findPageCache(new Page<TfTicket>(tfTicket.getPageNo(),tfTicket.getPageSize(),tfTicket.getOrderBy()), tfTicket);
//Page<TfTicket> page = tfTicketService.findPage(new Page<TfTicket>(tfTicket.getPageNo(),tfTicket.getPageSize(),tfTicket.getOrderBy()), tfTicket); //Page<TfTicket> page = tfTicketService.findPage(new Page<TfTicket>(tfTicket.getPageNo(),tfTicket.getPageSize(),tfTicket.getOrderBy()), tfTicket);
Result result = ResultFactory.getSuccessResult(); Result result = ResultFactory.getSuccessResult();
result.setResultObject(page); result.setResultObject(page);
...@@ -154,7 +156,7 @@ public class TfTicketRestController extends AbstractBaseController { ...@@ -154,7 +156,7 @@ public class TfTicketRestController extends AbstractBaseController {
} }
private Result listFrist(TfTicket tfTicket, Model model) { private Result listFrist(TfTicket tfTicket, Model model) {
Page<TfTicket> page = tfTicketService.findPageCache(new Page<TfTicket>(tfTicket.getPageNo(),tfTicket.getPageSize(),tfTicket.getOrderBy()), tfTicket); Page<TfTicket> page = tfTicketServiceImpl.findPageCache(new Page<TfTicket>(tfTicket.getPageNo(),tfTicket.getPageSize(),tfTicket.getOrderBy()), tfTicket);
//Page<TfTicket> page = tfTicketService.findPage(new Page<TfTicket>(tfTicket.getPageNo(),tfTicket.getPageSize(),tfTicket.getOrderBy()), tfTicket); //Page<TfTicket> page = tfTicketService.findPage(new Page<TfTicket>(tfTicket.getPageNo(),tfTicket.getPageSize(),tfTicket.getOrderBy()), tfTicket);
Result result = ResultFactory.getSuccessResult(); Result result = ResultFactory.getSuccessResult();
if(page.getList().size()>0){ if(page.getList().size()>0){
...@@ -187,7 +189,7 @@ public class TfTicketRestController extends AbstractBaseController { ...@@ -187,7 +189,7 @@ public class TfTicketRestController extends AbstractBaseController {
if (!beanValidator(model, tfTicket)){ if (!beanValidator(model, tfTicket)){
Result result = ResultFactory.getErrorResult("数据验证失败"); Result result = ResultFactory.getErrorResult("数据验证失败");
} }
tfTicketService.save(tfTicket); tfTicketServiceImpl.save(tfTicket);
Result result = ResultFactory.getSuccessResult("保存订单成功"); Result result = ResultFactory.getSuccessResult("保存订单成功");
return result; return result;
} }
...@@ -211,7 +213,7 @@ public class TfTicketRestController extends AbstractBaseController { ...@@ -211,7 +213,7 @@ public class TfTicketRestController extends AbstractBaseController {
} }
private Result delete(TfTicket tfTicket, RedirectAttributes redirectAttributes) { private Result delete(TfTicket tfTicket, RedirectAttributes redirectAttributes) {
tfTicketService.delete(tfTicket); tfTicketServiceImpl.delete(tfTicket);
Result result = ResultFactory.getSuccessResult("删除订单成功"); Result result = ResultFactory.getSuccessResult("删除订单成功");
return result; return result;
} }
...@@ -237,7 +239,7 @@ public class TfTicketRestController extends AbstractBaseController { ...@@ -237,7 +239,7 @@ public class TfTicketRestController extends AbstractBaseController {
} }
private Result deleteByLogic(TfTicket tfTicket, RedirectAttributes redirectAttributes) { private Result deleteByLogic(TfTicket tfTicket, RedirectAttributes redirectAttributes) {
tfTicketService.deleteByLogic(tfTicket); tfTicketServiceImpl.deleteByLogic(tfTicket);
Result result = ResultFactory.getSuccessResult("删除订单成功"); Result result = ResultFactory.getSuccessResult("删除订单成功");
return result; return result;
} }
...@@ -263,7 +265,7 @@ public class TfTicketRestController extends AbstractBaseController { ...@@ -263,7 +265,7 @@ public class TfTicketRestController extends AbstractBaseController {
private Result deleteAll(String ids, RedirectAttributes redirectAttributes) { private Result deleteAll(String ids, RedirectAttributes redirectAttributes) {
String idArray[] =ids.split(","); String idArray[] =ids.split(",");
for(String id : idArray){ for(String id : idArray){
tfTicketService.delete(tfTicketService.get(id)); tfTicketServiceImpl.delete(tfTicketServiceImpl.get(id));
} }
Result result = ResultFactory.getSuccessResult("删除订单成功"); Result result = ResultFactory.getSuccessResult("删除订单成功");
return result; return result;
...@@ -292,7 +294,7 @@ public class TfTicketRestController extends AbstractBaseController { ...@@ -292,7 +294,7 @@ public class TfTicketRestController extends AbstractBaseController {
private Result deleteAllByLogic(String ids, RedirectAttributes redirectAttributes) { private Result deleteAllByLogic(String ids, RedirectAttributes redirectAttributes) {
String idArray[] =ids.split(","); String idArray[] =ids.split(",");
for(String id : idArray){ for(String id : idArray){
tfTicketService.deleteByLogic(tfTicketService.get(id)); tfTicketServiceImpl.deleteByLogic(tfTicketServiceImpl.get(id));
} }
Result result = ResultFactory.getSuccessResult("删除订单成功"); Result result = ResultFactory.getSuccessResult("删除订单成功");
return result; return result;
......
JeeSpringCloud/src/main/java/com/company/project/modules/ylttrip/web/TfTicketController.java
View file @ 5a3d32de
...@@ -46,13 +46,13 @@ public class TfTicketController extends AbstractBaseController { ...@@ -46,13 +46,13 @@ public class TfTicketController extends AbstractBaseController {
//调用dubbo服务器是，要去Reference注解,注解Autowired //调用dubbo服务器是，要去Reference注解,注解Autowired
//@Reference(version = "1.0.0") //@Reference(version = "1.0.0")
@Autowired @Autowired
private ITfTicketService tfTicketService; private ITfTicketService tfTicketServiceImpl;
@ModelAttribute @ModelAttribute
public TfTicket get(@RequestParam(required=false) String id) { public TfTicket get(@RequestParam(required=false) String id) {
TfTicket entity = null; TfTicket entity = null;
if (StringUtils.isNotBlank(id)){ if (StringUtils.isNotBlank(id)){
entity = tfTicketService.getCache(id); entity = tfTicketServiceImpl.getCache(id);
//entity = tfTicketService.get(id); //entity = tfTicketService.get(id);
} }
if (entity == null){ if (entity == null){
...@@ -86,7 +86,7 @@ public class TfTicketController extends AbstractBaseController { ...@@ -86,7 +86,7 @@ public class TfTicketController extends AbstractBaseController {
if(tfTicket.getOrderBy()==""){ if(tfTicket.getOrderBy()==""){
tfTicket.setOrderBy("totalDate"); tfTicket.setOrderBy("totalDate");
} }
List<TfTicket> list = tfTicketService.totalCache(tfTicket); List<TfTicket> list = tfTicketServiceImpl.totalCache(tfTicket);
//List<TfTicket> list = tfTicketService.total(tfTicket); //List<TfTicket> list = tfTicketService.total(tfTicket);
model.addAttribute("list", list); model.addAttribute("list", list);
for(TfTicket tfTicketItem:list){ for(TfTicket tfTicketItem:list){
...@@ -142,7 +142,7 @@ public class TfTicketController extends AbstractBaseController { ...@@ -142,7 +142,7 @@ public class TfTicketController extends AbstractBaseController {
if(StringUtils.isEmpty(tfTicket.getTotalType())){ if(StringUtils.isEmpty(tfTicket.getTotalType())){
tfTicket.setTotalType("%Y-%m-%d"); tfTicket.setTotalType("%Y-%m-%d");
} }
List<TfTicket> list = tfTicketService.totalCache(tfTicket); List<TfTicket> list = tfTicketServiceImpl.totalCache(tfTicket);
//List<TfTicket> list = tfTicketService.total(tfTicket); //List<TfTicket> list = tfTicketService.total(tfTicket);
model.addAttribute("sumTotalCount", list.stream().mapToInt(TfTicket::getTotalCount).sum()); model.addAttribute("sumTotalCount", list.stream().mapToInt(TfTicket::getTotalCount).sum());
model.addAttribute("sumGoodsNum", list.stream().mapToDouble(TfTicket::getSumGoodsNum).sum()); model.addAttribute("sumGoodsNum", list.stream().mapToDouble(TfTicket::getSumGoodsNum).sum());
...@@ -158,7 +158,7 @@ public class TfTicketController extends AbstractBaseController { ...@@ -158,7 +158,7 @@ public class TfTicketController extends AbstractBaseController {
@RequiresPermissions("ylttrip:tfTicket:list") @RequiresPermissions("ylttrip:tfTicket:list")
@RequestMapping(value = {"list", ""}) @RequestMapping(value = {"list", ""})
public String list(TfTicket tfTicket, HttpServletRequest request, HttpServletResponse response, Model model) { public String list(TfTicket tfTicket, HttpServletRequest request, HttpServletResponse response, Model model) {
Page<TfTicket> page = tfTicketService.findPageCache(new Page<TfTicket>(request, response), tfTicket); Page<TfTicket> page = tfTicketServiceImpl.findPageCache(new Page<TfTicket>(request, response), tfTicket);
//Page<TfTicket> page = tfTicketService.findPage(new Page<TfTicket>(request, response), tfTicket); //Page<TfTicket> page = tfTicketService.findPage(new Page<TfTicket>(request, response), tfTicket);
model.addAttribute("page", page); model.addAttribute("page", page);
tfTicket.setOrderBy("totalDate"); tfTicket.setOrderBy("totalDate");
...@@ -172,7 +172,7 @@ public class TfTicketController extends AbstractBaseController { ...@@ -172,7 +172,7 @@ public class TfTicketController extends AbstractBaseController {
@RequiresPermissions("ylttrip:tfTicket:list") @RequiresPermissions("ylttrip:tfTicket:list")
@RequestMapping(value = {"listVue"}) @RequestMapping(value = {"listVue"})
public String listVue(TfTicket tfTicket, HttpServletRequest request, HttpServletResponse response, Model model) { public String listVue(TfTicket tfTicket, HttpServletRequest request, HttpServletResponse response, Model model) {
Page<TfTicket> page = tfTicketService.findPageCache(new Page<TfTicket>(request, response), tfTicket); Page<TfTicket> page = tfTicketServiceImpl.findPageCache(new Page<TfTicket>(request, response), tfTicket);
//Page<TfTicket> page = tfTicketService.findPage(new Page<TfTicket>(request, response), tfTicket); //Page<TfTicket> page = tfTicketService.findPage(new Page<TfTicket>(request, response), tfTicket);
model.addAttribute("page", page); model.addAttribute("page", page);
return "modules/ylttrip/tfTicketListVue"; return "modules/ylttrip/tfTicketListVue";
...@@ -184,7 +184,7 @@ public class TfTicketController extends AbstractBaseController { ...@@ -184,7 +184,7 @@ public class TfTicketController extends AbstractBaseController {
//RequiresPermissions("ylttrip:tfTicket:select") //RequiresPermissions("ylttrip:tfTicket:select")
@RequestMapping(value = {"select"}) @RequestMapping(value = {"select"})
public String select(TfTicket tfTicket, HttpServletRequest request, HttpServletResponse response, Model model) { public String select(TfTicket tfTicket, HttpServletRequest request, HttpServletResponse response, Model model) {
Page<TfTicket> page = tfTicketService.findPageCache(new Page<TfTicket>(request, response), tfTicket); Page<TfTicket> page = tfTicketServiceImpl.findPageCache(new Page<TfTicket>(request, response), tfTicket);
//Page<TfTicket> page = tfTicketService.findPage(new Page<TfTicket>(request, response), tfTicket); //Page<TfTicket> page = tfTicketService.findPage(new Page<TfTicket>(request, response), tfTicket);
model.addAttribute("page", page); model.addAttribute("page", page);
return "modules/ylttrip/tfTicketSelect"; return "modules/ylttrip/tfTicketSelect";
...@@ -213,7 +213,7 @@ public class TfTicketController extends AbstractBaseController { ...@@ -213,7 +213,7 @@ public class TfTicketController extends AbstractBaseController {
if (!beanValidator(model, tfTicket)){ if (!beanValidator(model, tfTicket)){
return form(tfTicket, model,request,response); return form(tfTicket, model,request,response);
} }
tfTicketService.save(tfTicket); tfTicketServiceImpl.save(tfTicket);
addMessage(redirectAttributes, "保存订单成功"); addMessage(redirectAttributes, "保存订单成功");
return "redirect:"+Global.getAdminPath()+"/ylttrip/tfTicket/?repage"; return "redirect:"+Global.getAdminPath()+"/ylttrip/tfTicket/?repage";
} }
...@@ -224,7 +224,7 @@ public class TfTicketController extends AbstractBaseController { ...@@ -224,7 +224,7 @@ public class TfTicketController extends AbstractBaseController {
@RequiresPermissions("ylttrip:tfTicket:del") @RequiresPermissions("ylttrip:tfTicket:del")
@RequestMapping(value = "delete") @RequestMapping(value = "delete")
public String delete(TfTicket tfTicket, RedirectAttributes redirectAttributes) { public String delete(TfTicket tfTicket, RedirectAttributes redirectAttributes) {
tfTicketService.delete(tfTicket); tfTicketServiceImpl.delete(tfTicket);
addMessage(redirectAttributes, "删除订单成功"); addMessage(redirectAttributes, "删除订单成功");
return "redirect:"+Global.getAdminPath()+"/ylttrip/tfTicket/?repage"; return "redirect:"+Global.getAdminPath()+"/ylttrip/tfTicket/?repage";
} }
...@@ -235,7 +235,7 @@ public class TfTicketController extends AbstractBaseController { ...@@ -235,7 +235,7 @@ public class TfTicketController extends AbstractBaseController {
@RequiresPermissions(value={"ylttrip:tfTicket:del","ylttrip:tfTicket:delByLogic"},logical=Logical.OR) @RequiresPermissions(value={"ylttrip:tfTicket:del","ylttrip:tfTicket:delByLogic"},logical=Logical.OR)
@RequestMapping(value = "deleteByLogic") @RequestMapping(value = "deleteByLogic")
public String deleteByLogic(TfTicket tfTicket, RedirectAttributes redirectAttributes) { public String deleteByLogic(TfTicket tfTicket, RedirectAttributes redirectAttributes) {
tfTicketService.deleteByLogic(tfTicket); tfTicketServiceImpl.deleteByLogic(tfTicket);
addMessage(redirectAttributes, "逻辑删除订单成功"); addMessage(redirectAttributes, "逻辑删除订单成功");
return "redirect:"+Global.getAdminPath()+"/ylttrip/tfTicket/?repage"; return "redirect:"+Global.getAdminPath()+"/ylttrip/tfTicket/?repage";
} }
...@@ -248,7 +248,7 @@ public class TfTicketController extends AbstractBaseController { ...@@ -248,7 +248,7 @@ public class TfTicketController extends AbstractBaseController {
public String deleteAll(String ids, RedirectAttributes redirectAttributes) { public String deleteAll(String ids, RedirectAttributes redirectAttributes) {
String[] idArray = ids.split(","); String[] idArray = ids.split(",");
for(String id : idArray){ for(String id : idArray){
tfTicketService.delete(tfTicketService.get(id)); tfTicketServiceImpl.delete(tfTicketServiceImpl.get(id));
} }
addMessage(redirectAttributes, "删除订单成功"); addMessage(redirectAttributes, "删除订单成功");
return "redirect:"+Global.getAdminPath()+"/ylttrip/tfTicket/?repage"; return "redirect:"+Global.getAdminPath()+"/ylttrip/tfTicket/?repage";
...@@ -262,7 +262,7 @@ public class TfTicketController extends AbstractBaseController { ...@@ -262,7 +262,7 @@ public class TfTicketController extends AbstractBaseController {
public String deleteAllByLogic(String ids, RedirectAttributes redirectAttributes) { public String deleteAllByLogic(String ids, RedirectAttributes redirectAttributes) {
String[] idArray = ids.split(","); String[] idArray = ids.split(",");
for(String id : idArray){ for(String id : idArray){
tfTicketService.deleteByLogic(tfTicketService.get(id)); tfTicketServiceImpl.deleteByLogic(tfTicketServiceImpl.get(id));
} }
addMessage(redirectAttributes, "删除订单成功"); addMessage(redirectAttributes, "删除订单成功");
return "redirect:"+Global.getAdminPath()+"/ylttrip/tfTicket/?repage"; return "redirect:"+Global.getAdminPath()+"/ylttrip/tfTicket/?repage";
...@@ -276,7 +276,7 @@ public class TfTicketController extends AbstractBaseController { ...@@ -276,7 +276,7 @@ public class TfTicketController extends AbstractBaseController {
public String exportFile(TfTicket tfTicket, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) { public String exportFile(TfTicket tfTicket, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
try { try {
String fileName = "订单"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx"; String fileName = "订单"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
Page<TfTicket> page = tfTicketService.findPage(new Page<TfTicket>(request, response, -1), tfTicket); Page<TfTicket> page = tfTicketServiceImpl.findPage(new Page<TfTicket>(request, response, -1), tfTicket);
new ExportExcel("订单", TfTicket.class).setDataList(page.getList()).write(response, fileName).dispose(); new ExportExcel("订单", TfTicket.class).setDataList(page.getList()).write(response, fileName).dispose();
return null; return null;
} catch (Exception e) { } catch (Exception e) {
...@@ -297,7 +297,7 @@ public class TfTicketController extends AbstractBaseController { ...@@ -297,7 +297,7 @@ public class TfTicketController extends AbstractBaseController {
ImportExcel ei = new ImportExcel(file, 1, 0); ImportExcel ei = new ImportExcel(file, 1, 0);
List<TfTicket> list = ei.getDataList(TfTicket.class); List<TfTicket> list = ei.getDataList(TfTicket.class);
for (TfTicket tfTicket : list){ for (TfTicket tfTicket : list){
tfTicketService.save(tfTicket); tfTicketServiceImpl.save(tfTicket);
} }
addMessage(redirectAttributes, "已成功导入 "+successNum+" 条订单记录"); addMessage(redirectAttributes, "已成功导入 "+successNum+" 条订单记录");
} catch (Exception e) { } catch (Exception e) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment