zcy
/
jee_wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码规范

master
erzhongxmu 2024-01-12 21:51:17 +08:00
parent f95d3a534e
commit b326ad568f
2 changed files with 1078 additions and 1089 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/zzjee/wm/controller/WmOmQmIController.java
View File

@ -73,12 +73,11 @@ import org.springframework.http.MediaType;
import org.springframework.web.util.UriComponentsBuilder; import org.springframework.web.util.UriComponentsBuilder;
/** /**
* @author erzhongxmu
* @version V1.0
* @Title: Controller * @Title: Controller
* @Description: 下架任务 * @Description: 下架任务
* @author erzhongxmu
* @date 2017-09-11 14:57:43 * @date 2017-09-11 14:57:43
* @version V1.0
*
*/ */
@Controller @Controller
@RequestMapping("/wmOmQmIController") @RequestMapping("/wmOmQmIController")
@ -96,7 +95,6 @@ public class WmOmQmIController extends BaseController {
private Validator validator; private Validator validator;
/** /**
* 下架任务列表 页面跳转 * 下架任务列表 页面跳转
* *
@ -106,14 +104,17 @@ public class WmOmQmIController extends BaseController {
public ModelAndView list(HttpServletRequest request) { public ModelAndView list(HttpServletRequest request) {
return new ModelAndView("com/zzjee/wm/wmOmQmIList"); return new ModelAndView("com/zzjee/wm/wmOmQmIList");
} }
@RequestMapping(params = "listd") @RequestMapping(params = "listd")
public ModelAndView listd(HttpServletRequest request) { public ModelAndView listd(HttpServletRequest request) {
return new ModelAndView("com/zzjee/wm/wmOmQmIdList"); return new ModelAndView("com/zzjee/wm/wmOmQmIdList");
} }
@RequestMapping(params = "assignlist") @RequestMapping(params = "assignlist")
public ModelAndView assignlist(HttpServletRequest request) { public ModelAndView assignlist(HttpServletRequest request) {
return new ModelAndView("com/zzjee/wm/wmOmQmIassignList"); return new ModelAndView("com/zzjee/wm/wmOmQmIassignList");
} }
/** /**
* easyui AJAX请求数据 * easyui AJAX请求数据
* *
@ -145,6 +146,7 @@ public class WmOmQmIController extends BaseController {
this.wmOmQmIService.getDataGridReturn(cq, true); this.wmOmQmIService.getDataGridReturn(cq, true);
TagUtil.datagrid(response, dataGrid); TagUtil.datagrid(response, dataGrid);
} }
@RequestMapping(params = "datagridassign") @RequestMapping(params = "datagridassign")
public void datagridassign(WmOmQmIEntity wmOmQmI, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { public void datagridassign(WmOmQmIEntity wmOmQmI, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) {
CriteriaQuery cq = new CriteriaQuery(WmOmQmIEntity.class, dataGrid); CriteriaQuery cq = new CriteriaQuery(WmOmQmIEntity.class, dataGrid);
@ -217,12 +219,12 @@ public class WmOmQmIController extends BaseController {
} else { } else {
try { try {
t.setBinSta("N"); t.setBinSta("N");
systemService.updateEntitie(t);; systemService.updateEntitie(t);
;
systemService.addLog(message, Globals.Log_Type_UPDATE, systemService.addLog(message, Globals.Log_Type_UPDATE,
Globals.Log_Leavel_INFO); Globals.Log_Leavel_INFO);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "添加到下架任务清单失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
} }
@ -251,8 +253,6 @@ public class WmOmQmIController extends BaseController {
if (StringUtil.isNotEmpty(firstrongqi)) { if (StringUtil.isNotEmpty(firstrongqi)) {
t.setFirstRq(firstrongqi); t.setFirstRq(firstrongqi);
} }
String recarno = ""; String recarno = "";
try { try {
WmOmNoticeHEntity wmOmNoticeHEntity = systemService.findUniqueByProperty(WmOmNoticeHEntity.class, "omNoticeId", t.getOmNoticeId()); WmOmNoticeHEntity wmOmNoticeHEntity = systemService.findUniqueByProperty(WmOmNoticeHEntity.class, "omNoticeId", t.getOmNoticeId());
@ -266,7 +266,6 @@ public class WmOmQmIController extends BaseController {
Globals.Log_Leavel_INFO); Globals.Log_Leavel_INFO);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "波次生成失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
@ -311,7 +310,6 @@ public class WmOmQmIController extends BaseController {
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "波次删除失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
j.setMsg(message); j.setMsg(message);
@ -350,7 +348,6 @@ public class WmOmQmIController extends BaseController {
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "添加到下架任务清单失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
j.setMsg(message); j.setMsg(message);
@ -358,7 +355,6 @@ public class WmOmQmIController extends BaseController {
} }
/** /**
* 删除下架任务 * 删除下架任务
* *
@ -376,7 +372,6 @@ public class WmOmQmIController extends BaseController {
systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "下架任务删除失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
j.setMsg(message); j.setMsg(message);
@ -425,14 +420,12 @@ public class WmOmQmIController extends BaseController {
Globals.Log_Leavel_INFO); Globals.Log_Leavel_INFO);
} else { } else {
j.setSuccess(false); j.setSuccess(false);
message = "下架任务找不到"; message = "下架任务找不到";
} }
} catch (Exception e) { } catch (Exception e) {
j.setSuccess(false); j.setSuccess(false);
e.printStackTrace(); e.printStackTrace();
message = "下架失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
j.setMsg(message); j.setMsg(message);
@ -440,8 +433,6 @@ public class WmOmQmIController extends BaseController {
} }
@RequestMapping(params = "dotodown") @RequestMapping(params = "dotodown")
@ResponseBody @ResponseBody
public synchronized AjaxJson dotodown(HttpServletRequest request) { public synchronized AjaxJson dotodown(HttpServletRequest request) {
@ -522,7 +513,6 @@ public class WmOmQmIController extends BaseController {
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "下架任务删除失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
j.setMsg(message); j.setMsg(message);
@ -546,7 +536,6 @@ public class WmOmQmIController extends BaseController {
systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "下架任务添加失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
j.setMsg(message); j.setMsg(message);
@ -555,7 +544,6 @@ public class WmOmQmIController extends BaseController {
/** /**
*
* @param page * @param page
* @return * @return
*/ */
@ -587,7 +575,6 @@ public class WmOmQmIController extends BaseController {
} }
/** /**
* 更新下架任务 * 更新下架任务
* *
@ -616,12 +603,12 @@ public class WmOmQmIController extends BaseController {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "下架任务更新失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
j.setMsg(message); j.setMsg(message);
return j; return j;
} }
/** /**
* 更新下架任务 * 更新下架任务
* *
@ -640,7 +627,6 @@ public class WmOmQmIController extends BaseController {
systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "下架任务更新失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
j.setMsg(message); j.setMsg(message);
@ -660,6 +646,7 @@ public class WmOmQmIController extends BaseController {
} }
return new ModelAndView("com/zzjee/wm/wmOmQmI-add"); return new ModelAndView("com/zzjee/wm/wmOmQmI-add");
} }
/** /**
* 下架任务编辑页面跳转 * 下架任务编辑页面跳转
* *
@ -704,6 +691,7 @@ public class WmOmQmIController extends BaseController {
modelMap.put(NormalExcelConstants.DATA_LIST, wmOmQmIs); modelMap.put(NormalExcelConstants.DATA_LIST, wmOmQmIs);
return NormalExcelConstants.JEECG_EXCEL_VIEW; return NormalExcelConstants.JEECG_EXCEL_VIEW;
} }
/** /**
* 导出excel 使模板 * 导出excel 使模板
* *

27
src/main/java/com/zzjee/wm/controller/WmPlatIoController.java
View File

@ -1,4 +1,5 @@
package com.zzjee.wm.controller; package com.zzjee.wm.controller;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@ -55,12 +56,11 @@ import com.zzjee.wm.entity.WmPlatIoEntity;
import com.zzjee.wm.service.WmPlatIoServiceI; import com.zzjee.wm.service.WmPlatIoServiceI;
/** /**
* @author erzhongxmu
* @version V1.0
* @Title: Controller * @Title: Controller
* @Description: 月台进出 * @Description: 月台进出
* @author erzhongxmu
* @date 2017-08-15 23:20:14 * @date 2017-08-15 23:20:14
* @version V1.0
*
*/ */
@Controller @Controller
@RequestMapping("/wmPlatIoController") @RequestMapping("/wmPlatIoController")
@ -78,7 +78,6 @@ public class WmPlatIoController extends BaseController {
private Validator validator; private Validator validator;
/** /**
* 月台进出列表 页面跳转 * 月台进出列表 页面跳转
* *
@ -88,10 +87,12 @@ public class WmPlatIoController extends BaseController {
public ModelAndView list(HttpServletRequest request) { public ModelAndView list(HttpServletRequest request) {
return new ModelAndView("com/zzjee/wm/wmPlatIoList"); return new ModelAndView("com/zzjee/wm/wmPlatIoList");
} }
@RequestMapping(params = "listplan") @RequestMapping(params = "listplan")
public ModelAndView listplan(HttpServletRequest request) { public ModelAndView listplan(HttpServletRequest request) {
return new ModelAndView("com/zzjee/wm/wmPlatIoplanList"); return new ModelAndView("com/zzjee/wm/wmPlatIoplanList");
} }
/** /**
* easyui AJAX请求数据 * easyui AJAX请求数据
* *
@ -114,7 +115,8 @@ public class WmPlatIoController extends BaseController {
Calendar c = Calendar.getInstance(); Calendar c = Calendar.getInstance();
c.setTime(today); c.setTime(today);
c.add(Calendar.DAY_OF_MONTH, 1);// 今天+1天 c.add(Calendar.DAY_OF_MONTH, 1);// 今天+1天
String query_planIndata_end = DateUtils.date2Str(c.getTime(),DateUtils.date_sdf);; String query_planIndata_end = DateUtils.date2Str(c.getTime(), DateUtils.date_sdf);
;
if (StringUtil.isNotEmpty(query_planIndata_begin)) { if (StringUtil.isNotEmpty(query_planIndata_begin)) {
cq.ge("planIndata", new SimpleDateFormat("yyyy-MM-dd").parse(query_planIndata_begin)); cq.ge("planIndata", new SimpleDateFormat("yyyy-MM-dd").parse(query_planIndata_begin));
} }
@ -138,9 +140,11 @@ public class WmPlatIoController extends BaseController {
try { try {
//自定义追加查询条件 //自定义追加查询条件
String query_planIndata_begin = request.getParameter("planIndata_begin1"); ; String query_planIndata_begin = request.getParameter("planIndata_begin1");
;
String query_planIndata_end = request.getParameter("planIndata_end2"); ; String query_planIndata_end = request.getParameter("planIndata_end2");
;
if (StringUtil.isNotEmpty(query_planIndata_begin)) { if (StringUtil.isNotEmpty(query_planIndata_begin)) {
cq.ge("planIndata", new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").parse(query_planIndata_begin)); cq.ge("planIndata", new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").parse(query_planIndata_begin));
} }
@ -172,7 +176,6 @@ public class WmPlatIoController extends BaseController {
systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "月台进出删除失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
j.setMsg(message); j.setMsg(message);
@ -200,7 +203,6 @@ public class WmPlatIoController extends BaseController {
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "月台进出删除失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
j.setMsg(message); j.setMsg(message);
@ -226,7 +228,6 @@ public class WmPlatIoController extends BaseController {
systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "月台进出添加失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
j.setMsg(message); j.setMsg(message);
@ -252,7 +253,6 @@ public class WmPlatIoController extends BaseController {
systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "月台进出更新失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
j.setMsg(message); j.setMsg(message);
@ -280,7 +280,6 @@ public class WmPlatIoController extends BaseController {
systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "月台释放失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
j.setMsg(message); j.setMsg(message);
@ -318,12 +317,12 @@ public class WmPlatIoController extends BaseController {
systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
message = "月台占用失败";
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
j.setMsg(message); j.setMsg(message);
return j; return j;
} }
/** /**
* 月台进出新增页面跳转 * 月台进出新增页面跳转
* *
@ -337,6 +336,7 @@ public class WmPlatIoController extends BaseController {
} }
return new ModelAndView("com/zzjee/wm/wmPlatIo-add"); return new ModelAndView("com/zzjee/wm/wmPlatIo-add");
} }
/** /**
* 月台进出编辑页面跳转 * 月台进出编辑页面跳转
* *
@ -381,6 +381,7 @@ public class WmPlatIoController extends BaseController {
modelMap.put(NormalExcelConstants.DATA_LIST, wmPlatIos); modelMap.put(NormalExcelConstants.DATA_LIST, wmPlatIos);
return NormalExcelConstants.JEECG_EXCEL_VIEW; return NormalExcelConstants.JEECG_EXCEL_VIEW;
} }
/** /**
* 导出excel 使模板 * 导出excel 使模板
* *