From 6057839527750438867b60583599df19a3b45a50 Mon Sep 17 00:00:00 2001 From: e Date: Sat, 6 Apr 2019 09:26:22 +0800 Subject: [PATCH] TMS --- pom.xml | 25 + .../java/com/zzjee/api/TokenController.java | 11 + .../com/zzjee/md/entity/MdGoodsEntity.java | 1 + .../com/zzjee/md/entity/MvGoodsEntity.java | 78 +- .../controller/TmsMdCheliangController.java | 416 ++++++++ .../tms/controller/TmsMdDzController.java | 443 ++++++++ .../controller/TmsYwDingdanController.java | 946 ++++++++++++++++++ .../tms/controller/VTmsDzController.java | 402 ++++++++ .../java/com/zzjee/tms/entity/DdPage.java | 18 + .../zzjee/tms/entity/TmsMdCheliangEntity.java | 395 ++++++++ .../com/zzjee/tms/entity/TmsMdDzEntity.java | 395 ++++++++ .../com/zzjee/tms/entity/VTmsDzEntity.java | 63 ++ .../tms/service/TmsMdCheliangServiceI.java | 15 + .../zzjee/tms/service/TmsMdDzServiceI.java | 15 + .../tms/service/TmsYwDingdanServiceI.java | 15 + .../com/zzjee/tms/service/VTmsDzServiceI.java | 15 + .../impl/TmsMdCheliangServiceImpl.java | 158 +++ .../tms/service/impl/TmsMdDzServiceImpl.java | 158 +++ .../service/impl/TmsYwDingdanServiceImpl.java | 184 ++++ .../tms/service/impl/VTmsDzServiceImpl.java | 122 +++ .../com/zzjee/tmsv/service/VYsddServiceI.java | 15 + .../tmsv/service/impl/VYsddServiceImpl.java | 156 +++ .../wm/controller/WmOmNoticeHController.java | 178 +++- .../service/impl/WmOmNoticeHServiceImpl.java | 56 +- src/main/java/com/zzjee/wmutil/wmUtil.java | 1 + .../core/util/ResourceUtil.java | 17 + .../jwt/util/ResponseMessage.java | 59 ++ .../org/jeecgframework/jwt/util/Result.java | 55 + .../util/menu/ResponseMessageCodeEnum.java | 30 + .../web/system/pojo/base/TSUser.java | 14 + src/main/resources/spring-mvc.xml | 2 +- src/main/resources/sysConfig.properties | 8 +- .../webapp/webpage/com/zzjee/md/mdCus-add.jsp | 13 +- .../webpage/com/zzjee/md/mdCus-update.jsp | 15 +- .../com/zzjee/tms/tmsMdCheliang-add.jsp | 78 ++ .../com/zzjee/tms/tmsMdCheliang-update.jsp | 75 ++ .../webpage/com/zzjee/tms/tmsMdCheliang.js | 32 + .../com/zzjee/tms/tmsMdCheliangList.js | 0 .../com/zzjee/tms/tmsMdCheliangList.jsp | 61 ++ .../webpage/com/zzjee/tms/tmsMdDz-add.jsp | 76 ++ .../webpage/com/zzjee/tms/tmsMdDz-update.jsp | 75 ++ .../webapp/webpage/com/zzjee/tms/tmsMdDz.js | 32 + .../webpage/com/zzjee/tms/tmsMdDzChoose.jsp | 61 ++ .../webpage/com/zzjee/tms/tmsMdDzList.js | 0 .../webpage/com/zzjee/tms/tmsMdDzList.jsp | 61 ++ .../com/zzjee/tms/tmsYwDingdan-add.jsp | 364 +++++++ .../com/zzjee/tms/tmsYwDingdan-addbak.jsp | 660 ++++++++++++ .../com/zzjee/tms/tmsYwDingdan-update.jsp | 342 +++++++ .../com/zzjee/tms/tmsYwDingdan-updatebak.jsp | 736 ++++++++++++++ .../webpage/com/zzjee/tms/tmsYwDingdan.js | 32 + .../webpage/com/zzjee/tms/tmsYwDingdanList.js | 0 .../com/zzjee/tms/tmsYwDingdanList.jsp | 90 ++ .../com/zzjee/tms/tmsYwDingdanhd-update.jsp | 402 ++++++++ .../com/zzjee/tms/tmsYwDingdanhdList.jsp | 182 ++++ .../com/zzjee/tms/tmsYwDingdanjs-update.jsp | 402 ++++++++ .../com/zzjee/tms/tmsYwDingdanjsList.jsp | 88 ++ .../com/zzjee/tms/tmsYwDingdanpcList.jsp | 131 +++ .../com/zzjee/tms/tmsYwDingdanzcList.jsp | 108 ++ .../webpage/com/zzjee/tmsv/vYsddList.jsp | 62 ++ .../com/zzjee/wm/print/jianhuorenwu-print.jsp | 18 +- .../com/zzjee/wm/print/jianhuorenwuzhuisu.jsp | 261 +++++ .../com/zzjee/wm/print/zhuisuitem-print.jsp | 173 ++++ .../webpage/com/zzjee/wm/wmOmNoticeH-add.jsp | 5 +- .../webpage/com/zzjee/wm/wmOmNoticeHList.jsp | 10 +- src/main/webapp/webpage/system/user/user.jsp | 10 + 65 files changed, 9096 insertions(+), 25 deletions(-) create mode 100644 src/main/java/com/zzjee/tms/controller/TmsMdCheliangController.java create mode 100644 src/main/java/com/zzjee/tms/controller/TmsMdDzController.java create mode 100644 src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java create mode 100644 src/main/java/com/zzjee/tms/controller/VTmsDzController.java create mode 100644 src/main/java/com/zzjee/tms/entity/DdPage.java create mode 100644 src/main/java/com/zzjee/tms/entity/TmsMdCheliangEntity.java create mode 100644 src/main/java/com/zzjee/tms/entity/TmsMdDzEntity.java create mode 100644 src/main/java/com/zzjee/tms/entity/VTmsDzEntity.java create mode 100644 src/main/java/com/zzjee/tms/service/TmsMdCheliangServiceI.java create mode 100644 src/main/java/com/zzjee/tms/service/TmsMdDzServiceI.java create mode 100644 src/main/java/com/zzjee/tms/service/TmsYwDingdanServiceI.java create mode 100644 src/main/java/com/zzjee/tms/service/VTmsDzServiceI.java create mode 100644 src/main/java/com/zzjee/tms/service/impl/TmsMdCheliangServiceImpl.java create mode 100644 src/main/java/com/zzjee/tms/service/impl/TmsMdDzServiceImpl.java create mode 100644 src/main/java/com/zzjee/tms/service/impl/TmsYwDingdanServiceImpl.java create mode 100644 src/main/java/com/zzjee/tms/service/impl/VTmsDzServiceImpl.java create mode 100644 src/main/java/com/zzjee/tmsv/service/VYsddServiceI.java create mode 100644 src/main/java/com/zzjee/tmsv/service/impl/VYsddServiceImpl.java create mode 100644 src/main/java/org/jeecgframework/jwt/util/ResponseMessage.java create mode 100644 src/main/java/org/jeecgframework/jwt/util/Result.java create mode 100644 src/main/java/org/jeecgframework/jwt/util/menu/ResponseMessageCodeEnum.java create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsMdCheliang-add.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsMdCheliang-update.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsMdCheliang.js create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsMdCheliangList.js create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsMdCheliangList.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsMdDz-add.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsMdDz-update.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsMdDz.js create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsMdDzChoose.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsMdDzList.js create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsMdDzList.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdan-add.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdan-addbak.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdan-update.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdan-updatebak.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdan.js create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdanList.js create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdanList.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdanhd-update.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdanhdList.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdanjs-update.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdanjsList.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdanpcList.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/tms/tmsYwDingdanzcList.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/tmsv/vYsddList.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/wm/print/jianhuorenwuzhuisu.jsp create mode 100644 src/main/webapp/webpage/com/zzjee/wm/print/zhuisuitem-print.jsp diff --git a/pom.xml b/pom.xml index 938e7851..774e4c85 100644 --- a/pom.xml +++ b/pom.xml @@ -937,6 +937,31 @@ system ${project.basedir}/src/main/webapp/WEB-INF/lib/jodconverter-3.0-beta-4-20170917.jar + + + + + io.springfox + springfox-swagger2 + 2.4.0 + + + com.fasterxml.jackson.core + jackson-core + 2.5.1 + + + com.fasterxml.jackson.core + jackson-databind + 2.5.1 + + + com.fasterxml.jackson.core + jackson-annotations + 2.5.1 + + + diff --git a/src/main/java/com/zzjee/api/TokenController.java b/src/main/java/com/zzjee/api/TokenController.java index 9e625573..8ba697ec 100644 --- a/src/main/java/com/zzjee/api/TokenController.java +++ b/src/main/java/com/zzjee/api/TokenController.java @@ -147,7 +147,18 @@ public class TokenController { // 生成一个token，保存用户登录状态 return new ResponseEntity(D0, HttpStatus.OK); } + @RequestMapping(value = "/callback", method = RequestMethod.POST) + @ResponseBody + public ResponseEntity callback(@RequestParam String devEui, @RequestParam String type, @RequestParam String obj) { + logger.info("获取TOKEN[{}]" + devEui); + ResultDO D0 = new ResultDO(); + D0.setObj(""); + D0.setOK(true); + + // 生成一个token，保存用户登录状态 + return new ResponseEntity(D0, HttpStatus.OK); + } @RequestMapping(value = "/lighrcallback", method = RequestMethod.POST) @ResponseBody public ResponseEntity lighrcallback(@RequestParam String devEui, @RequestParam String ctlLedStatus ) { diff --git a/src/main/java/com/zzjee/md/entity/MdGoodsEntity.java b/src/main/java/com/zzjee/md/entity/MdGoodsEntity.java index fc3e5ad2..3e1ad235 100644 --- a/src/main/java/com/zzjee/md/entity/MdGoodsEntity.java +++ b/src/main/java/com/zzjee/md/entity/MdGoodsEntity.java @@ -87,6 +87,7 @@ public class MdGoodsEntity implements java.io.Serializable { @Excel(name="计费商品类") private java.lang.String jfShpLei; /**商品品牌*/ + @Excel(name="商品品牌") private java.lang.String shpPinPai; /**商品条码*/ @Excel(name="商品条码") diff --git a/src/main/java/com/zzjee/md/entity/MvGoodsEntity.java b/src/main/java/com/zzjee/md/entity/MvGoodsEntity.java index db9b0e09..75412148 100644 --- a/src/main/java/com/zzjee/md/entity/MvGoodsEntity.java +++ b/src/main/java/com/zzjee/md/entity/MvGoodsEntity.java @@ -77,7 +77,17 @@ public class MvGoodsEntity implements java.io.Serializable { @Excel(name="商品规格") private java.lang.String shpGuiGe; - + /**商品品牌*/ + @Excel(name="商品品牌") + private java.lang.String shpPinPai; + @Excel(name="长") + private java.lang.String chZhXiang; + /**宽整箱*/ + @Excel(name="宽") + private java.lang.String kuZhXiang; + /**高整箱*/ + @Excel(name="高") + private java.lang.String gaoZhXiang; @Id @GeneratedValue(generator = "paymentableGenerator") @GenericGenerator(name = "paymentableGenerator", strategy = "uuid") @@ -347,4 +357,70 @@ public class MvGoodsEntity implements java.io.Serializable { public void setShpGuiGe(java.lang.String shpGuiGe){ this.shpGuiGe = shpGuiGe; } + + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 长整箱 + */ + @Column(name ="CH_ZH_XIANG",nullable=true,length=32) + public java.lang.String getChZhXiang(){ + return this.chZhXiang; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 长整箱 + */ + public void setChZhXiang(java.lang.String chZhXiang){ + this.chZhXiang = chZhXiang; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 宽整箱 + */ + @Column(name ="KU_ZH_XIANG",nullable=true,length=32) + public java.lang.String getKuZhXiang(){ + return this.kuZhXiang; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 宽整箱 + */ + public void setKuZhXiang(java.lang.String kuZhXiang){ + this.kuZhXiang = kuZhXiang; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 高整箱 + */ + @Column(name ="GAO_ZH_XIANG",nullable=true,length=32) + public java.lang.String getGaoZhXiang(){ + return this.gaoZhXiang; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 高整箱 + */ + public void setGaoZhXiang(java.lang.String gaoZhXiang){ + this.gaoZhXiang = gaoZhXiang; + } + @Column(name ="SHP_PIN_PAI",nullable=true,length=35) + public java.lang.String getShpPinPai(){ + return this.shpPinPai; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 商品品牌 + */ + public void setShpPinPai(java.lang.String shpPinPai){ + this.shpPinPai = shpPinPai; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 商品条码 + */ } diff --git a/src/main/java/com/zzjee/tms/controller/TmsMdCheliangController.java b/src/main/java/com/zzjee/tms/controller/TmsMdCheliangController.java new file mode 100644 index 00000000..f9f082cb --- /dev/null +++ b/src/main/java/com/zzjee/tms/controller/TmsMdCheliangController.java @@ -0,0 +1,416 @@ +package com.zzjee.tms.controller; + +import com.alibaba.fastjson.JSONArray; +import com.zzjee.tms.entity.TmsMdCheliangEntity; +import com.zzjee.tms.service.TmsMdCheliangServiceI; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.Logger; +import org.jeecgframework.core.beanvalidator.BeanValidators; +import org.jeecgframework.core.common.controller.BaseController; +import org.jeecgframework.core.common.exception.BusinessException; +import org.jeecgframework.core.common.hibernate.qbc.CriteriaQuery; +import org.jeecgframework.core.common.model.json.AjaxJson; +import org.jeecgframework.core.common.model.json.DataGrid; +import org.jeecgframework.core.constant.Globals; +import org.jeecgframework.core.util.ExceptionUtil; +import org.jeecgframework.core.util.MyBeanUtils; +import org.jeecgframework.core.util.ResourceUtil; +import org.jeecgframework.core.util.StringUtil; +import org.jeecgframework.jwt.util.ResponseMessage; +import org.jeecgframework.jwt.util.Result; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; +import org.jeecgframework.tag.core.easyui.TagUtil; +import org.jeecgframework.web.system.pojo.base.TSUser; +import org.jeecgframework.web.system.service.SystemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.util.UriComponentsBuilder; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.ConstraintViolation; +import javax.validation.Validator; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * @Title: Controller + * @Description: 车辆管理 + * @author onlineGenerator + * @date 2018-01-29 21:57:07 + * @version V1.0 + * + */ +@Api(value="TmsMdCheliang",description="车辆管理",tags="tmsMdCheliangController") +@Controller +@RequestMapping("/tmsMdCheliangController") +public class TmsMdCheliangController extends BaseController { + /** + * Logger for this class + */ + private static final Logger logger = Logger.getLogger(TmsMdCheliangController.class); + + @Autowired + private TmsMdCheliangServiceI tmsMdCheliangService; + @Autowired + private SystemService systemService; + @Autowired + private Validator validator; + + + + /** + * 车辆管理列表 页面跳转 + * + * @return + */ + @RequestMapping(params = "list") + public ModelAndView list(HttpServletRequest request) { + return new ModelAndView("com/zzjee/tms/tmsMdCheliangList"); + } + + /** + * easyui AJAX请求数据 + * + * @param request + * @param response + * @param dataGrid + * @param user + */ + + @RequestMapping(params = "datagrid") + public void datagrid(TmsMdCheliangEntity tmsMdCheliang, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { + CriteriaQuery cq = new CriteriaQuery(TmsMdCheliangEntity.class, dataGrid); + //查询条件组装器 + org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tmsMdCheliang, request.getParameterMap()); + try{ + //自定义追加查询条件 + }catch (Exception e) { + throw new BusinessException(e.getMessage()); + } + TSUser user = ResourceUtil.getSessionUser(); + if(!StringUtil.isEmpty(user.getCurrentDepart().getOrgCode())){ + cq.like("sysOrgCode",user.getCurrentDepart().getOrgCode()+"%"); + + } + if(!StringUtil.isEmpty(user.getUserType())){ + if(user.getUserType().equals("4")){ + cq.eq("createBy",user.getUserName()); + } + + } + cq.add(); + this.tmsMdCheliangService.getDataGridReturn(cq, true); + TagUtil.datagrid(response, dataGrid); + } + + /** + * 删除车辆管理 + * + * @return + */ + @RequestMapping(params = "doDel") + @ResponseBody + public AjaxJson doDel(TmsMdCheliangEntity tmsMdCheliang, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + tmsMdCheliang = systemService.getEntity(TmsMdCheliangEntity.class, tmsMdCheliang.getId()); + message = "车辆管理删除成功"; + try{ + tmsMdCheliang.setZhuangtai("N"); + tmsMdCheliangService.updateEntitie(tmsMdCheliang); + systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); + }catch(Exception e){ + e.printStackTrace(); + message = "车辆管理删除失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + /** + * 批量删除车辆管理 + * + * @return + */ + @RequestMapping(params = "doBatchDel") + @ResponseBody + public AjaxJson doBatchDel(String ids, HttpServletRequest request){ + String message = null; + AjaxJson j = new AjaxJson(); + message = "车辆管理删除成功"; + try{ + for(String id:ids.split(",")){ + TmsMdCheliangEntity tmsMdCheliang = systemService.getEntity(TmsMdCheliangEntity.class, + id + ); + tmsMdCheliang.setZhuangtai("N"); + tmsMdCheliangService.updateEntitie(tmsMdCheliang); + systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); + } + }catch(Exception e){ + e.printStackTrace(); + message = "车辆管理删除失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + + /** + * 添加车辆管理 + * + * @param ids + * @return + */ + @RequestMapping(params = "doAdd") + @ResponseBody + public AjaxJson doAdd(TmsMdCheliangEntity tmsMdCheliang, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + message = "车辆管理添加成功"; + try{ + tmsMdCheliangService.save(tmsMdCheliang); + systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); + }catch(Exception e){ + e.printStackTrace(); + message = "车辆管理添加失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + /** + * 更新车辆管理 + * + * @param ids + * @return + */ + @RequestMapping(params = "doUpdate") + @ResponseBody + public AjaxJson doUpdate(TmsMdCheliangEntity tmsMdCheliang, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + message = "车辆管理更新成功"; + TmsMdCheliangEntity t = tmsMdCheliangService.get(TmsMdCheliangEntity.class, tmsMdCheliang.getId()); + try { + MyBeanUtils.copyBeanNotNull2Bean(tmsMdCheliang, t); + tmsMdCheliangService.saveOrUpdate(t); + systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); + } catch (Exception e) { + e.printStackTrace(); + message = "车辆管理更新失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + + /** + * 车辆管理新增页面跳转 + * + * @return + */ + @RequestMapping(params = "goAdd") + public ModelAndView goAdd(TmsMdCheliangEntity tmsMdCheliang, HttpServletRequest req) { + if (StringUtil.isNotEmpty(tmsMdCheliang.getId())) { + tmsMdCheliang = tmsMdCheliangService.getEntity(TmsMdCheliangEntity.class, tmsMdCheliang.getId()); + req.setAttribute("tmsMdCheliangPage", tmsMdCheliang); + } + return new ModelAndView("com/zzjee/tms/tmsMdCheliang-add"); + } + /** + * 车辆管理编辑页面跳转 + * + * @return + */ + @RequestMapping(params = "goUpdate") + public ModelAndView goUpdate(TmsMdCheliangEntity tmsMdCheliang, HttpServletRequest req) { + if (StringUtil.isNotEmpty(tmsMdCheliang.getId())) { + tmsMdCheliang = tmsMdCheliangService.getEntity(TmsMdCheliangEntity.class, tmsMdCheliang.getId()); + req.setAttribute("tmsMdCheliangPage", tmsMdCheliang); + } + return new ModelAndView("com/zzjee/tms/tmsMdCheliang-update"); + } + + /** + * 导入功能跳转 + * + * @return + */ + @RequestMapping(params = "upload") + public ModelAndView upload(HttpServletRequest req) { + req.setAttribute("controller_name","tmsMdCheliangController"); + return new ModelAndView("common/upload/pub_excel_upload"); + } + + /** + * 导出excel + * + * @param request + * @param response + */ + @RequestMapping(params = "exportXls") + public String exportXls(TmsMdCheliangEntity tmsMdCheliang, HttpServletRequest request, HttpServletResponse response + , DataGrid dataGrid, ModelMap modelMap) { + CriteriaQuery cq = new CriteriaQuery(TmsMdCheliangEntity.class, dataGrid); + org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tmsMdCheliang, request.getParameterMap()); + List tmsMdCheliangs = this.tmsMdCheliangService.getListByCriteriaQuery(cq,false); + modelMap.put(NormalExcelConstants.FILE_NAME,"车辆管理"); + modelMap.put(NormalExcelConstants.CLASS,TmsMdCheliangEntity.class); + modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("车辆管理列表", "导出人:"+ ResourceUtil.getSessionUser().getRealName(), + "导出信息")); + modelMap.put(NormalExcelConstants.DATA_LIST,tmsMdCheliangs); + return NormalExcelConstants.JEECG_EXCEL_VIEW; + } + /** + * 导出excel 使模板 + * + * @param request + * @param response + */ + @RequestMapping(params = "exportXlsByT") + public String exportXlsByT(TmsMdCheliangEntity tmsMdCheliang, HttpServletRequest request, HttpServletResponse response + , DataGrid dataGrid, ModelMap modelMap) { + modelMap.put(NormalExcelConstants.FILE_NAME,"车辆管理"); + modelMap.put(NormalExcelConstants.CLASS,TmsMdCheliangEntity.class); + modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("车辆管理列表", "导出人:"+ ResourceUtil.getSessionUser().getRealName(), + "导出信息")); + modelMap.put(NormalExcelConstants.DATA_LIST,new ArrayList()); + return NormalExcelConstants.JEECG_EXCEL_VIEW; + } + + @SuppressWarnings("unchecked") + @RequestMapping(params = "importExcel", method = RequestMethod.POST) + @ResponseBody + public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) { + AjaxJson j = new AjaxJson(); + + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue();// 获取上传文件对象 + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List listTmsMdCheliangEntitys = ExcelImportUtil.importExcel(file.getInputStream(),TmsMdCheliangEntity.class,params); + for (TmsMdCheliangEntity tmsMdCheliang : listTmsMdCheliangEntitys) { + tmsMdCheliangService.save(tmsMdCheliang); + } + j.setMsg("文件导入成功！"); + } catch (Exception e) { + j.setMsg("文件导入失败！"); + logger.error(ExceptionUtil.getExceptionMessage(e)); + }finally{ + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return j; + } + + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value="车辆管理列表信息",produces="application/json",httpMethod="GET") + public ResponseMessage> list() { + List listTmsMdCheliangs=tmsMdCheliangService.getList(TmsMdCheliangEntity.class); + return Result.success(listTmsMdCheliangs); + } + + @RequestMapping(value = "/{id}", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value="根据ID获取车辆管理信息",notes="根据ID获取车辆管理信息",httpMethod="GET",produces="application/json") + public ResponseMessage get(@ApiParam(required=true,name="id",value="ID")@PathVariable("id") String id) { + TmsMdCheliangEntity task = tmsMdCheliangService.get(TmsMdCheliangEntity.class, id); + if (task == null) { + return Result.error("根据ID获取车辆管理信息为空"); + } + return Result.success(task); + } + + @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) + @ResponseBody + @ApiOperation(value="创建车辆管理") + public ResponseMessage create(@ApiParam(name="车辆管理对象")@RequestBody TmsMdCheliangEntity tmsMdCheliang, UriComponentsBuilder uriBuilder) { + //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. + Set> failures = validator.validate(tmsMdCheliang); + if (!failures.isEmpty()) { + return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); + } + + //保存 + try{ + tmsMdCheliangService.save(tmsMdCheliang); + } catch (Exception e) { + e.printStackTrace(); + return Result.error("车辆管理信息保存失败"); + } + return Result.success(tmsMdCheliang); + } + + @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) + @ResponseBody + @ApiOperation(value="更新车辆管理",notes="更新车辆管理") + public ResponseMessage update(@ApiParam(name="车辆管理对象")@RequestBody TmsMdCheliangEntity tmsMdCheliang) { + //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. + Set> failures = validator.validate(tmsMdCheliang); + if (!failures.isEmpty()) { + return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); + } + + //保存 + try{ + tmsMdCheliangService.saveOrUpdate(tmsMdCheliang); + } catch (Exception e) { + e.printStackTrace(); + return Result.error("更新车辆管理信息失败"); + } + + //按Restful约定，返回204状态码, 无内容. 也可以返回200状态码. + return Result.success("更新车辆管理信息成功"); + } + + @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) + @ResponseStatus(HttpStatus.NO_CONTENT) + @ApiOperation(value="删除车辆管理") + public ResponseMessage delete(@ApiParam(name="id",value="ID",required=true)@PathVariable("id") String id) { + logger.info("delete[{}]" + id); + // 验证 + if (StringUtils.isEmpty(id)) { + return Result.error("ID不能为空"); + } + try { + tmsMdCheliangService.deleteEntityById(TmsMdCheliangEntity.class, id); + } catch (Exception e) { + e.printStackTrace(); + return Result.error("车辆管理删除失败"); + } + + return Result.success(); + } +} diff --git a/src/main/java/com/zzjee/tms/controller/TmsMdDzController.java b/src/main/java/com/zzjee/tms/controller/TmsMdDzController.java new file mode 100644 index 00000000..4743789a --- /dev/null +++ b/src/main/java/com/zzjee/tms/controller/TmsMdDzController.java @@ -0,0 +1,443 @@ +package com.zzjee.tms.controller; + +import com.alibaba.fastjson.JSONArray; +import com.zzjee.tms.entity.TmsMdDzEntity; +import com.zzjee.tms.service.TmsMdDzServiceI; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.Logger; +import org.jeecgframework.core.beanvalidator.BeanValidators; +import org.jeecgframework.core.common.controller.BaseController; +import org.jeecgframework.core.common.exception.BusinessException; +import org.jeecgframework.core.common.hibernate.qbc.CriteriaQuery; +import org.jeecgframework.core.common.model.json.AjaxJson; +import org.jeecgframework.core.common.model.json.DataGrid; +import org.jeecgframework.core.constant.Globals; +import org.jeecgframework.core.util.ExceptionUtil; +import org.jeecgframework.core.util.MyBeanUtils; +import org.jeecgframework.core.util.ResourceUtil; +import org.jeecgframework.core.util.StringUtil; +import org.jeecgframework.jwt.util.ResponseMessage; +import org.jeecgframework.jwt.util.Result; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; +import org.jeecgframework.tag.core.easyui.TagUtil; +import org.jeecgframework.web.system.pojo.base.TSUser; +import org.jeecgframework.web.system.service.SystemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.util.UriComponentsBuilder; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.ConstraintViolation; +import javax.validation.Validator; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * @Title: Controller + * @Description: 客户地址 + * @author onlineGenerator + * @date 2018-01-29 21:57:16 + * @version V1.0 + * + */ +@Api(value="TmsMdDz",description="客户地址",tags="tmsMdDzController") +@Controller +@RequestMapping("/tmsMdDzController") +public class TmsMdDzController extends BaseController { + /** + * Logger for this class + */ + private static final Logger logger = Logger.getLogger(TmsMdDzController.class); + + @Autowired + private TmsMdDzServiceI tmsMdDzService; + @Autowired + private SystemService systemService; + @Autowired + private Validator validator; + + + + /** + * 客户地址列表 页面跳转 + * + * @return + */ + @RequestMapping(params = "list") + public ModelAndView list(HttpServletRequest request) { + return new ModelAndView("com/zzjee/tms/tmsMdDzList"); + } + @RequestMapping(params = "listchoose") + public ModelAndView listchoose(HttpServletRequest request) { + return new ModelAndView("com/zzjee/tms/tmsMdDzChoose"); + } + /** + * easyui AJAX请求数据 + * + * @param request + * @param response + * @param dataGrid + * @param user + */ + + @RequestMapping(params = "datagrid") + public void datagrid(TmsMdDzEntity tmsMdDz, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { + CriteriaQuery cq = new CriteriaQuery(TmsMdDzEntity.class, dataGrid); + //查询条件组装器 + org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tmsMdDz, request.getParameterMap()); + try{ + //自定义追加查询条件 + }catch (Exception e) { + throw new BusinessException(e.getMessage()); + } + TSUser user = ResourceUtil.getSessionUser(); + if(!StringUtil.isEmpty(user.getCurrentDepart().getOrgCode())){ + cq.like("sysOrgCode",user.getCurrentDepart().getOrgCode()+"%"); + + } + if(!StringUtil.isEmpty(user.getUserType())){ + if(user.getUserType().equals("4")){ + cq.eq("username",user.getUserName()); + } + + } + cq.add(); + this.tmsMdDzService.getDataGridReturn(cq, true); + TagUtil.datagrid(response, dataGrid); + } + @RequestMapping(params = "datagridchoose") + public void datagridchoose(TmsMdDzEntity tmsMdDz, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { + CriteriaQuery cq = new CriteriaQuery(TmsMdDzEntity.class, dataGrid); + //查询条件组装器 + org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tmsMdDz, request.getParameterMap()); + try{ + //自定义追加查询条件 + }catch (Exception e) { + throw new BusinessException(e.getMessage()); + } + TSUser user = ResourceUtil.getSessionUser(); + if(!StringUtil.isEmpty(user.getCurrentDepart().getOrgCode())){ + cq.like("sysOrgCode",user.getCurrentDepart().getOrgCode()+"%"); + + } + if(!StringUtil.isEmpty(user.getUserType())){ + if(user.getUserType().equals("4")){ + cq.eq("username",user.getUserName()); + } + + } + cq.add(); + this.tmsMdDzService.getDataGridReturn(cq, true); + TagUtil.datagrid(response, dataGrid); + } + /** + * 删除客户地址 + * + * @return + */ + @RequestMapping(params = "doDel") + @ResponseBody + public AjaxJson doDel(TmsMdDzEntity tmsMdDz, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + tmsMdDz = systemService.getEntity(TmsMdDzEntity.class, tmsMdDz.getId()); + message = "客户地址删除成功"; + try{ + tmsMdDz.setZhuangtai("N"); + tmsMdDzService.updateEntitie(tmsMdDz); + systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); + }catch(Exception e){ + e.printStackTrace(); + message = "客户地址删除失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + /** + * 批量删除客户地址 + * + * @return + */ + @RequestMapping(params = "doBatchDel") + @ResponseBody + public AjaxJson doBatchDel(String ids, HttpServletRequest request){ + String message = null; + AjaxJson j = new AjaxJson(); + message = "客户地址删除成功"; + try{ + for(String id:ids.split(",")){ + TmsMdDzEntity tmsMdDz = systemService.getEntity(TmsMdDzEntity.class, + id + ); + tmsMdDz.setZhuangtai("N"); + tmsMdDzService.updateEntitie(tmsMdDz); + systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); + } + }catch(Exception e){ + e.printStackTrace(); + message = "客户地址删除失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + + /** + * 添加客户地址 + * + * @param ids + * @return + */ + @RequestMapping(params = "doAdd") + @ResponseBody + public AjaxJson doAdd(TmsMdDzEntity tmsMdDz, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + message = "客户地址添加成功"; + try{ + tmsMdDzService.save(tmsMdDz); + systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); + }catch(Exception e){ + e.printStackTrace(); + message = "客户地址添加失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + /** + * 更新客户地址 + * + * @param ids + * @return + */ + @RequestMapping(params = "doUpdate") + @ResponseBody + public AjaxJson doUpdate(TmsMdDzEntity tmsMdDz, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + message = "客户地址更新成功"; + TmsMdDzEntity t = tmsMdDzService.get(TmsMdDzEntity.class, tmsMdDz.getId()); + try { + MyBeanUtils.copyBeanNotNull2Bean(tmsMdDz, t); + tmsMdDzService.saveOrUpdate(t); + systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); + } catch (Exception e) { + e.printStackTrace(); + message = "客户地址更新失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + + /** + * 客户地址新增页面跳转 + * + * @return + */ + @RequestMapping(params = "goAdd") + public ModelAndView goAdd(TmsMdDzEntity tmsMdDz, HttpServletRequest req) { + if (StringUtil.isNotEmpty(tmsMdDz.getId())) { + tmsMdDz = tmsMdDzService.getEntity(TmsMdDzEntity.class, tmsMdDz.getId()); + req.setAttribute("tmsMdDzPage", tmsMdDz); + } + return new ModelAndView("com/zzjee/tms/tmsMdDz-add"); + } + /** + * 客户地址编辑页面跳转 + * + * @return + */ + @RequestMapping(params = "goUpdate") + public ModelAndView goUpdate(TmsMdDzEntity tmsMdDz, HttpServletRequest req) { + if (StringUtil.isNotEmpty(tmsMdDz.getId())) { + tmsMdDz = tmsMdDzService.getEntity(TmsMdDzEntity.class, tmsMdDz.getId()); + req.setAttribute("tmsMdDzPage", tmsMdDz); + } + return new ModelAndView("com/zzjee/tms/tmsMdDz-update"); + } + + /** + * 导入功能跳转 + * + * @return + */ + @RequestMapping(params = "upload") + public ModelAndView upload(HttpServletRequest req) { + req.setAttribute("controller_name","tmsMdDzController"); + return new ModelAndView("common/upload/pub_excel_upload"); + } + + /** + * 导出excel + * + * @param request + * @param response + */ + @RequestMapping(params = "exportXls") + public String exportXls(TmsMdDzEntity tmsMdDz, HttpServletRequest request, HttpServletResponse response + , DataGrid dataGrid, ModelMap modelMap) { + CriteriaQuery cq = new CriteriaQuery(TmsMdDzEntity.class, dataGrid); + org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tmsMdDz, request.getParameterMap()); + List tmsMdDzs = this.tmsMdDzService.getListByCriteriaQuery(cq,false); + modelMap.put(NormalExcelConstants.FILE_NAME,"客户地址"); + modelMap.put(NormalExcelConstants.CLASS,TmsMdDzEntity.class); + modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("客户地址列表", "导出人:"+ ResourceUtil.getSessionUser().getRealName(), + "导出信息")); + modelMap.put(NormalExcelConstants.DATA_LIST,tmsMdDzs); + return NormalExcelConstants.JEECG_EXCEL_VIEW; + } + /** + * 导出excel 使模板 + * + * @param request + * @param response + */ + @RequestMapping(params = "exportXlsByT") + public String exportXlsByT(TmsMdDzEntity tmsMdDz, HttpServletRequest request, HttpServletResponse response + , DataGrid dataGrid, ModelMap modelMap) { + modelMap.put(NormalExcelConstants.FILE_NAME,"客户地址"); + modelMap.put(NormalExcelConstants.CLASS,TmsMdDzEntity.class); + modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("客户地址列表", "导出人:"+ ResourceUtil.getSessionUser().getRealName(), + "导出信息")); + modelMap.put(NormalExcelConstants.DATA_LIST,new ArrayList()); + return NormalExcelConstants.JEECG_EXCEL_VIEW; + } + + @SuppressWarnings("unchecked") + @RequestMapping(params = "importExcel", method = RequestMethod.POST) + @ResponseBody + public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) { + AjaxJson j = new AjaxJson(); + + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue();// 获取上传文件对象 + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List listTmsMdDzEntitys = ExcelImportUtil.importExcel(file.getInputStream(),TmsMdDzEntity.class,params); + for (TmsMdDzEntity tmsMdDz : listTmsMdDzEntitys) { + tmsMdDzService.save(tmsMdDz); + } + j.setMsg("文件导入成功！"); + } catch (Exception e) { + j.setMsg("文件导入失败！"); + logger.error(ExceptionUtil.getExceptionMessage(e)); + }finally{ + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return j; + } + + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value="客户地址列表信息",produces="application/json",httpMethod="GET") + public ResponseMessage> list() { + List listTmsMdDzs=tmsMdDzService.getList(TmsMdDzEntity.class); + return Result.success(listTmsMdDzs); + } + + @RequestMapping(value = "/{id}", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value="根据ID获取客户地址信息",notes="根据ID获取客户地址信息",httpMethod="GET",produces="application/json") + public ResponseMessage get(@ApiParam(required=true,name="id",value="ID")@PathVariable("id") String id) { + TmsMdDzEntity task = tmsMdDzService.get(TmsMdDzEntity.class, id); + if (task == null) { + return Result.error("根据ID获取客户地址信息为空"); + } + return Result.success(task); + } + + @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) + @ResponseBody + @ApiOperation(value="创建客户地址") + public ResponseMessage create(@ApiParam(name="客户地址对象")@RequestBody TmsMdDzEntity tmsMdDz, UriComponentsBuilder uriBuilder) { + //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. + Set> failures = validator.validate(tmsMdDz); + if (!failures.isEmpty()) { + return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); + } + + //保存 + try{ + tmsMdDzService.save(tmsMdDz); + } catch (Exception e) { + e.printStackTrace(); + return Result.error("客户地址信息保存失败"); + } + return Result.success(tmsMdDz); + } + + @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) + @ResponseBody + @ApiOperation(value="更新客户地址",notes="更新客户地址") + public ResponseMessage update(@ApiParam(name="客户地址对象")@RequestBody TmsMdDzEntity tmsMdDz) { + //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. + Set> failures = validator.validate(tmsMdDz); + if (!failures.isEmpty()) { + return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); + } + + //保存 + try{ + tmsMdDzService.saveOrUpdate(tmsMdDz); + } catch (Exception e) { + e.printStackTrace(); + return Result.error("更新客户地址信息失败"); + } + + //按Restful约定，返回204状态码, 无内容. 也可以返回200状态码. + return Result.success("更新客户地址信息成功"); + } + + @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) + @ResponseStatus(HttpStatus.NO_CONTENT) + @ApiOperation(value="删除客户地址") + public ResponseMessage delete(@ApiParam(name="id",value="ID",required=true)@PathVariable("id") String id) { + logger.info("delete[{}]" + id); + // 验证 + if (StringUtils.isEmpty(id)) { + return Result.error("ID不能为空"); + } + try { + tmsMdDzService.deleteEntityById(TmsMdDzEntity.class, id); + } catch (Exception e) { + e.printStackTrace(); + return Result.error("客户地址删除失败"); + } + + return Result.success(); + } +} diff --git a/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java b/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java new file mode 100644 index 00000000..630fea3e --- /dev/null +++ b/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java @@ -0,0 +1,946 @@ +package com.zzjee.tms.controller; + +import com.alibaba.fastjson.JSONArray; +import com.zzjee.tms.entity.DdPage; +import com.zzjee.tms.entity.TmsMdDzEntity; +import com.zzjee.tms.entity.TmsYwDingdanEntity; +import com.zzjee.tms.service.TmsYwDingdanServiceI; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.Logger; +import org.jeecgframework.core.beanvalidator.BeanValidators; +import org.jeecgframework.core.common.controller.BaseController; +import org.jeecgframework.core.common.exception.BusinessException; +import org.jeecgframework.core.common.hibernate.qbc.CriteriaQuery; +import org.jeecgframework.core.common.model.json.AjaxJson; +import org.jeecgframework.core.common.model.json.DataGrid; +import org.jeecgframework.core.constant.Globals; +import org.jeecgframework.core.util.*; +import org.jeecgframework.jwt.util.ResponseMessage; +import org.jeecgframework.jwt.util.Result; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; +import org.jeecgframework.tag.core.easyui.TagUtil; +import org.jeecgframework.web.cgform.entity.upload.CgUploadEntity; +import org.jeecgframework.web.cgform.service.config.CgFormFieldServiceI; +import org.jeecgframework.web.system.pojo.base.TSUser; +import org.jeecgframework.web.system.service.SystemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.util.UriComponentsBuilder; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.ConstraintViolation; +import javax.validation.Validator; +import java.io.IOException; +import java.util.*; + +import static com.xiaoleilu.hutool.date.DateUtil.now; + +/** + * @Title: Controller + * @Description: 运输订单 + * @author onlineGenerator + * @date 2018-01-29 21:57:25 + * @version V1.0 + * + */ +@Api(value="TmsYwDingdan",description="运输订单",tags="tmsYwDingdanController") +@Controller +@RequestMapping("/tmsYwDingdanController") +public class TmsYwDingdanController extends BaseController { + /** + * Logger for this class + */ + private static final Logger logger = Logger.getLogger(TmsYwDingdanController.class); + + @Autowired + private TmsYwDingdanServiceI tmsYwDingdanService; + @Autowired + private SystemService systemService; + @Autowired + private Validator validator; + @Autowired + private CgFormFieldServiceI cgFormFieldService; + + + + /** + * 运输订单列表 页面跳转 + * + * @return + */ + @RequestMapping(params = "list") + public ModelAndView list(HttpServletRequest request) { + return new ModelAndView("com/zzjee/tms/tmsYwDingdanList"); + } + + + /** + * 运输订单列表 页面跳转 派车 + * + * @return + */ + @RequestMapping(params = "listpc") + public ModelAndView listpc(HttpServletRequest request) { + return new ModelAndView("com/zzjee/tms/tmsYwDingdanpcList"); + } + + + /** + * 运输订单列表 页面跳转 装车 + * + * @return + */ + @RequestMapping(params = "listzc") + public ModelAndView listzc(HttpServletRequest request) { + return new ModelAndView("com/zzjee/tms/tmsYwDingdanzcList"); + } + + + /** + * 运输订单列表 页面跳转 回单 + * + * @return + */ + @RequestMapping(params = "listhd") + public ModelAndView listhd(HttpServletRequest request) { + return new ModelAndView("com/zzjee/tms/tmsYwDingdanhdList"); + } + + /** + * 运输订单列表 页面跳转 回单 + * + * @return + */ + @RequestMapping(params = "listjs") + public ModelAndView listjs(HttpServletRequest request) { + return new ModelAndView("com/zzjee/tms/tmsYwDingdanjsList"); + } + + + /** + * easyui AJAX请求数据 + * + * @param request + * @param response + * @param dataGrid + */ + + @RequestMapping(params = "datagrid") + public void datagrid(TmsYwDingdanEntity tmsYwDingdan, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { + CriteriaQuery cq = new CriteriaQuery(TmsYwDingdanEntity.class, dataGrid); + //查询条件组装器 + org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tmsYwDingdan, request.getParameterMap()); + try{ + //自定义追加查询条件 + String query_sdsj_begin = request.getParameter("sdsj_begin"); + String query_sdsj_end = request.getParameter("sdsj_end"); + if(StringUtil.isNotEmpty(query_sdsj_begin)){ + cq.ge("sdsj", Integer.parseInt(query_sdsj_begin)); + } + if(StringUtil.isNotEmpty(query_sdsj_end)){ + cq.le("sdsj", Integer.parseInt(query_sdsj_end)); + } + }catch (Exception e) { + throw new BusinessException(e.getMessage()); + } + TSUser user = ResourceUtil.getSessionUser(); + if(!StringUtil.isEmpty(user.getCurrentDepart().getOrgCode())){ + cq.like("sysOrgCode",user.getCurrentDepart().getOrgCode()+"%"); + + } + cq.eq("zhuangtai","已下单"); +// cq.notEq("zhuangtai","已派车"); +// cq.notEq("zhuangtai","已装车"); + + cq.add(); + this.tmsYwDingdanService.getDataGridReturn(cq, true); + TagUtil.datagrid(response, dataGrid); + } + + + @RequestMapping(params = "datagridpc") + public void datagridpc(TmsYwDingdanEntity tmsYwDingdan, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { + CriteriaQuery cq = new CriteriaQuery(TmsYwDingdanEntity.class, dataGrid); + //查询条件组装器 + org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tmsYwDingdan, request.getParameterMap()); + try{ + //自定义追加查询条件 + String query_sdsj_begin = request.getParameter("sdsj_begin"); + String query_sdsj_end = request.getParameter("sdsj_end"); + if(StringUtil.isNotEmpty(query_sdsj_begin)){ + cq.ge("sdsj", Integer.parseInt(query_sdsj_begin)); + } + if(StringUtil.isNotEmpty(query_sdsj_end)){ + cq.le("sdsj", Integer.parseInt(query_sdsj_end)); + } + }catch (Exception e) { + throw new BusinessException(e.getMessage()); + } + cq.eq("zhuangtai","已下单"); + TSUser user = ResourceUtil.getSessionUser(); + if(!StringUtil.isEmpty(user.getCurrentDepart().getOrgCode())){ + cq.like("sysOrgCode",user.getCurrentDepart().getOrgCode()+"%"); + + } + if(!StringUtil.isEmpty(user.getUserType())){ + if(user.getUserType().equals("4")){ + cq.eq("username",user.getUserName()); + } + + } + cq.add(); + this.tmsYwDingdanService.getDataGridReturn(cq, true); + TagUtil.datagrid(response, dataGrid); + } + + @RequestMapping(params = "datagridzc") + public void datagridzc(TmsYwDingdanEntity tmsYwDingdan, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { + CriteriaQuery cq = new CriteriaQuery(TmsYwDingdanEntity.class, dataGrid); + //查询条件组装器 + org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tmsYwDingdan, request.getParameterMap()); + try{ + //自定义追加查询条件 + String query_sdsj_begin = request.getParameter("sdsj_begin"); + String query_sdsj_end = request.getParameter("sdsj_end"); + if(StringUtil.isNotEmpty(query_sdsj_begin)){ + cq.ge("sdsj", Integer.parseInt(query_sdsj_begin)); + } + if(StringUtil.isNotEmpty(query_sdsj_end)){ + cq.le("sdsj", Integer.parseInt(query_sdsj_end)); + } + }catch (Exception e) { + throw new BusinessException(e.getMessage()); + } + cq.eq("zhuangtai","已派车"); + TSUser user = ResourceUtil.getSessionUser(); +// if(!StringUtil.isEmpty(user.getCurrentDepart().getOrgCode())){ +// cq.like("sysOrgCode",user.getCurrentDepart().getOrgCode()+"%"); +// +// } + if(!StringUtil.isEmpty(user.getUserType())){ + if(user.getUserType().equals("4")){ + cq.eq("siji",user.getUserName()); + } + + } +// if(!StringUtil.isEmpty(user.getUserType())){ +// if(user.getUserType().equals("4")){ +// cq.eq("username",user.getUserName()); +// } +// +// } + + cq.add(); + this.tmsYwDingdanService.getDataGridReturn(cq, true); + TagUtil.datagrid(response, dataGrid); + } + + @RequestMapping(params = "datagridhd") + public void datagridhd(TmsYwDingdanEntity tmsYwDingdan, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { + CriteriaQuery cq = new CriteriaQuery(TmsYwDingdanEntity.class, dataGrid); + //查询条件组装器 + org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tmsYwDingdan, request.getParameterMap()); + try{ + //自定义追加查询条件 + String query_sdsj_begin = request.getParameter("sdsj_begin"); + String query_sdsj_end = request.getParameter("sdsj_end"); + if(StringUtil.isNotEmpty(query_sdsj_begin)){ + cq.ge("sdsj", Integer.parseInt(query_sdsj_begin)); + } + if(StringUtil.isNotEmpty(query_sdsj_end)){ + cq.le("sdsj", Integer.parseInt(query_sdsj_end)); + } + }catch (Exception e) { + throw new BusinessException(e.getMessage()); + } + cq.eq("zhuangtai","已装车"); + TSUser user = ResourceUtil.getSessionUser(); + if(!StringUtil.isEmpty(user.getCurrentDepart().getOrgCode())){ + cq.like("sysOrgCode",user.getCurrentDepart().getOrgCode()+"%"); + + } + if(!StringUtil.isEmpty(user.getUserType())){ + if(user.getUserType().equals("4")){ + cq.eq("username",user.getUserName()); + } + + } + cq.add(); + this.tmsYwDingdanService.getDataGridReturn(cq, true); + TagUtil.datagrid(response, dataGrid); + } + @RequestMapping(params = "datagridjs") + public void datagridjs(TmsYwDingdanEntity tmsYwDingdan, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { + CriteriaQuery cq = new CriteriaQuery(TmsYwDingdanEntity.class, dataGrid); + //查询条件组装器 + org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tmsYwDingdan, request.getParameterMap()); + try{ + //自定义追加查询条件 + String query_sdsj_begin = request.getParameter("sdsj_begin"); + String query_sdsj_end = request.getParameter("sdsj_end"); + if(StringUtil.isNotEmpty(query_sdsj_begin)){ + cq.ge("sdsj", Integer.parseInt(query_sdsj_begin)); + } + if(StringUtil.isNotEmpty(query_sdsj_end)){ + cq.le("sdsj", Integer.parseInt(query_sdsj_end)); + } + }catch (Exception e) { + throw new BusinessException(e.getMessage()); + } + cq.eq("zhuangtai","已回单"); + TSUser user = ResourceUtil.getSessionUser(); + if(!StringUtil.isEmpty(user.getCurrentDepart().getOrgCode())){ + cq.like("sysOrgCode",user.getCurrentDepart().getOrgCode()+"%"); + + } +// if(!StringUtil.isEmpty(user.getUserType())){ +// if(user.getUserType().equals("4")){ +// cq.eq("username",user.getUserName()); +// } +// +// } + cq.add(); + this.tmsYwDingdanService.getDataGridReturn(cq, true); + TagUtil.datagrid(response, dataGrid); + } + + + /** + * 保存新增/更新的行数据 + * @param page + * @return + */ + @RequestMapping(params = "saveRows") + @ResponseBody + public AjaxJson saveRows(DdPage page){ + String message = null; + List demos=page.getDemos(); + AjaxJson j = new AjaxJson(); + if(CollectionUtils.isNotEmpty(demos)){ + for(TmsYwDingdanEntity jeecgDemo:demos){ + if (StringUtil.isNotEmpty(jeecgDemo.getId())) { + TmsYwDingdanEntity t =tmsYwDingdanService.get(TmsYwDingdanEntity.class, jeecgDemo.getId()); + try { + message = jeecgDemo.getId()+ "被更新成功"; + MyBeanUtils.copyBeanNotNull2Bean(jeecgDemo, t); + if(StringUtil.isEmpty(t.getYjsdsj())){ + t.setYjsdsj(now()); + } + t.setZhuangtai("已回单"); + t.setSdsj(now()); + tmsYwDingdanService.saveOrUpdate(t); + systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + } + return j; + } + + /** + * 删除运输订单 + * + * @return + */ + @RequestMapping(params = "doDel") + @ResponseBody + public AjaxJson doDel(TmsYwDingdanEntity tmsYwDingdan, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + tmsYwDingdan = systemService.getEntity(TmsYwDingdanEntity.class, tmsYwDingdan.getId()); + message = "运输订单删除成功"; + try{ + tmsYwDingdan.setZhuangtai("已删除"); + tmsYwDingdanService.updateEntitie(tmsYwDingdan); + systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); + }catch(Exception e){ + e.printStackTrace(); + message = "运输订单删除失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + + @RequestMapping(params = "dopc") + @ResponseBody + public AjaxJson dopc(String id, String siji, String chehao, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + TmsYwDingdanEntity tmsYwDingdan = systemService.getEntity(TmsYwDingdanEntity.class, id); + message = "运输订单派车成功"; + try{ + tmsYwDingdan.setZhuangtai("已派车"); + tmsYwDingdan.setSiji(siji); + tmsYwDingdan.setChehao(chehao); +// tmsYwDingdan.setYjsdsj(DateUtils.str2Date(yjsdsj,DateUtils.datetimeFormat)); + tmsYwDingdanService.updateEntitie(tmsYwDingdan); + systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); + }catch(Exception e){ + e.printStackTrace(); + message = "运输订单派车失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + /** + * 取消派车 + * + * @return + */ + @RequestMapping(params = "doDelpc") + @ResponseBody + public AjaxJson doDelpc(TmsYwDingdanEntity tmsYwDingdan, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + tmsYwDingdan = systemService.getEntity(TmsYwDingdanEntity.class, tmsYwDingdan.getId()); + message = "运输订单取消派车成功"; + try{ + tmsYwDingdan.setZhuangtai("已下单"); + tmsYwDingdanService.updateEntitie(tmsYwDingdan); + systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); + }catch(Exception e){ + e.printStackTrace(); + message = "运输订单取消派车失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + /** + * 取消装车 + * + * @return + */ + @RequestMapping(params = "dozc") + @ResponseBody + public AjaxJson dozc(String id, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + TmsYwDingdanEntity tmsYwDingdan = systemService.getEntity(TmsYwDingdanEntity.class, id); + message = "运输订单装车成功"; + try{ + tmsYwDingdan.setZhuangtai("已装车"); + tmsYwDingdanService.updateEntitie(tmsYwDingdan); + systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); + }catch(Exception e){ + e.printStackTrace(); + message = "运输订单装车失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + + + /** + * 取消装车 + * + * @return + */ + @RequestMapping(params = "doDelzc") + @ResponseBody + public AjaxJson doDelzc(TmsYwDingdanEntity tmsYwDingdan, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + tmsYwDingdan = systemService.getEntity(TmsYwDingdanEntity.class, tmsYwDingdan.getId()); + message = "运输订单取消装车成功"; + try{ + tmsYwDingdan.setZhuangtai("已派车"); + tmsYwDingdanService.updateEntitie(tmsYwDingdan); + systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); + }catch(Exception e){ + e.printStackTrace(); + message = "运输订单取消装车失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + + /** + * 取消回单 + * + * @return + */ + @RequestMapping(params = "doDelhd") + @ResponseBody + public AjaxJson doDelhd(TmsYwDingdanEntity tmsYwDingdan, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + tmsYwDingdan = systemService.getEntity(TmsYwDingdanEntity.class, tmsYwDingdan.getId()); + message = "运输订单取消回单成功"; + try{ + tmsYwDingdan.setZhuangtai("已装车"); + tmsYwDingdanService.updateEntitie(tmsYwDingdan); + systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); + }catch(Exception e){ + e.printStackTrace(); + message = "运输订单取消回单失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + /** + * 取消派车 + * + * @return + */ + @RequestMapping(params = "doDeljs") + @ResponseBody + public AjaxJson doDeljs(TmsYwDingdanEntity tmsYwDingdan, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + tmsYwDingdan = systemService.getEntity(TmsYwDingdanEntity.class, tmsYwDingdan.getId()); + message = "运输订单取消结算成功"; + try{ + tmsYwDingdan.setZhuangtai("已回单"); + tmsYwDingdanService.updateEntitie(tmsYwDingdan); + systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); + }catch(Exception e){ + e.printStackTrace(); + message = "运输订单取消结算失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + /** + * 批量删除运输订单 + * + * @return + */ + @RequestMapping(params = "doBatchDel") + @ResponseBody + public AjaxJson doBatchDel(String ids, HttpServletRequest request){ + String message = null; + AjaxJson j = new AjaxJson(); + message = "运输订单删除成功"; + try{ + for(String id:ids.split(",")){ + TmsYwDingdanEntity tmsYwDingdan = systemService.getEntity(TmsYwDingdanEntity.class, + id + ); + tmsYwDingdan.setZhuangtai("已删除"); + tmsYwDingdanService.updateEntitie(tmsYwDingdan); + systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); + } + }catch(Exception e){ + e.printStackTrace(); + message = "运输订单删除失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + + /** + * 添加运输订单 + * + * @param ids + * @return + */ + @RequestMapping(params = "doAdd") + @ResponseBody + public AjaxJson doAdd(TmsYwDingdanEntity tmsYwDingdan, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + message = "运输订单添加成功"; + try{ + Map countMap = systemService + .findOneForJdbc("SELECT count(*)+1 as count FROM tms_yw_dingdan t where TO_DAYS(t.create_date) = TO_DAYS(NOW());"); + String noticeid = null; + if (countMap != null) { + + noticeid = DateUtils.date2Str(new Date(), DateUtils.yyyyMMdd) + + StringUtil.leftPad( + ((Long) countMap.get("count")).intValue(), 4, + '0'); + } + tmsYwDingdan.setFadh(noticeid); +// try{ +// if(StringUtil.isEmpty(tmsYwDingdan.getUsername())){ +// TmsMdDzEntity tmsdz = new TmsMdDzEntity(); +// tmsdz.setUsername(ResourceUtil.getSessionUser().getUserName()); +// tmsdz.setLianxiren(tmsYwDingdan.getFahuoren()); +// tmsdz.setDianhua(tmsYwDingdan.getFhrdh()); +// tmsdz.setXiangxidizhi(tmsYwDingdan.getFhrdz()); +// systemService.save(tmsdz); +// TmsMdDzEntity tmsdzs = new TmsMdDzEntity(); +// tmsdzs.setUsername(ResourceUtil.getSessionUser().getUserName()); +// tmsdzs.setLianxiren(tmsYwDingdan.getShouhuoren()); +// tmsdzs.setDianhua(tmsYwDingdan.getShrsj()); +// tmsdzs.setXiangxidizhi(tmsYwDingdan.getShrdh()); +// systemService.save(tmsdzs); +// } +// }catch (Exception e){ +// +// } + try{ + if(StringUtil.isNotEmpty(tmsYwDingdan.getFahuoren())){ + String sfhr[]; + sfhr = StringUtil.splitString(tmsYwDingdan.getFahuoren(),"-"); + if(sfhr.length==4){ + tmsYwDingdan.setUsername(sfhr[0]); + tmsYwDingdan.setFahuoren(sfhr[1]); + tmsYwDingdan.setFhrdh(sfhr[2]); + tmsYwDingdan.setFhrdz(sfhr[3]); + } + if(sfhr.length==3){ + + tmsYwDingdan.setFahuoren(sfhr[0]); + tmsYwDingdan.setFhrdh(sfhr[1]); + tmsYwDingdan.setFhrdz(sfhr[2]); + TmsMdDzEntity tmsdz = new TmsMdDzEntity(); + tmsdz.setUsername(ResourceUtil.getSessionUser().getUserName()); + tmsdz.setLianxiren(tmsYwDingdan.getFahuoren()); + tmsdz.setDianhua(tmsYwDingdan.getFhrdh()); + tmsdz.setXiangxidizhi(tmsYwDingdan.getFhrdz()); + systemService.save(tmsdz); + } + } + }catch (Exception e){ + + } + try{ + if(StringUtil.isNotEmpty(tmsYwDingdan.getShouhuoren())){ + String sshr[]; + sshr = StringUtil.splitString(tmsYwDingdan.getShouhuoren(),"-"); + if(sshr.length==4){ + tmsYwDingdan.setShouhuoren(sshr[1]); + tmsYwDingdan.setShrsj(sshr[2]); + tmsYwDingdan.setShrdh(sshr[3]); + } + if(sshr.length==3){ + tmsYwDingdan.setShouhuoren(sshr[0]); + tmsYwDingdan.setShrsj(sshr[1]); + tmsYwDingdan.setShrdh(sshr[2]); + TmsMdDzEntity tmsdzs = new TmsMdDzEntity(); + tmsdzs.setUsername(ResourceUtil.getSessionUser().getUserName()); + tmsdzs.setLianxiren(tmsYwDingdan.getShouhuoren()); + tmsdzs.setDianhua(tmsYwDingdan.getShrsj()); + tmsdzs.setXiangxidizhi(tmsYwDingdan.getShrdh()); + systemService.save(tmsdzs); + } + } + }catch (Exception e){ + + } + GregorianCalendar ca = new GregorianCalendar(); + if(ca.get(GregorianCalendar.AM_PM) == 0){ + tmsYwDingdan.setBy1("上午"); + }else{ + tmsYwDingdan.setBy1("下午"); + } + tmsYwDingdanService.save(tmsYwDingdan); + + systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); + }catch(Exception e){ + e.printStackTrace(); + message = "运输订单添加失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + j.setObj(tmsYwDingdan); + return j; + } + + /** + * 更新运输订单 + * + * @param ids + * @return + */ + @RequestMapping(params = "doUpdate") + @ResponseBody + public AjaxJson doUpdate(TmsYwDingdanEntity tmsYwDingdan, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + message = "运输订单更新成功"; + TmsYwDingdanEntity t = tmsYwDingdanService.get(TmsYwDingdanEntity.class, tmsYwDingdan.getId()); + try { + MyBeanUtils.copyBeanNotNull2Bean(tmsYwDingdan, t); + tmsYwDingdanService.saveOrUpdate(t); + systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); + } catch (Exception e) { + e.printStackTrace(); + message = "运输订单更新失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + + /** + * 运输订单新增页面跳转 + * + * @return + */ + @RequestMapping(params = "goAdd") + public ModelAndView goAdd(TmsYwDingdanEntity tmsYwDingdan, HttpServletRequest req) { + if (StringUtil.isNotEmpty(tmsYwDingdan.getId())) { + tmsYwDingdan = tmsYwDingdanService.getEntity(TmsYwDingdanEntity.class, tmsYwDingdan.getId()); +// req.setAttribute("tmsYwDingdanPage", tmsYwDingdan); + } + TSUser user = ResourceUtil.getSessionUser(); + + if(!StringUtil.isEmpty(user.getUserType())){ + if(user.getUserType().equals("4")){ + tmsYwDingdan.setUsername(user.getUserName()); + tmsYwDingdan.setXdrmz(user.getRealName()); + } + + } + + req.setAttribute("tmsYwDingdanPage", tmsYwDingdan); + + return new ModelAndView("com/zzjee/tms/tmsYwDingdan-add"); + } + /** + * 运输订单编辑页面跳转 + * + * @return + */ + @RequestMapping(params = "goUpdate") + public ModelAndView goUpdate(TmsYwDingdanEntity tmsYwDingdan, String id, HttpServletRequest req) { + if (StringUtil.isNotEmpty(tmsYwDingdan.getId())|| StringUtil.isNotEmpty(id)){ + if(StringUtil.isNotEmpty(id)){ + tmsYwDingdan.setId(id); + } + tmsYwDingdan = tmsYwDingdanService.getEntity(TmsYwDingdanEntity.class, tmsYwDingdan.getId()); + req.setAttribute("tmsYwDingdanPage", tmsYwDingdan); + } + return new ModelAndView("com/zzjee/tms/tmsYwDingdan-update"); + } + + @RequestMapping(params = "goUpdatehd") + public ModelAndView goUpdatehd(TmsYwDingdanEntity tmsYwDingdan, HttpServletRequest req) { + if (StringUtil.isNotEmpty(tmsYwDingdan.getId())) { + tmsYwDingdan = tmsYwDingdanService.getEntity(TmsYwDingdanEntity.class, tmsYwDingdan.getId()); +// tmsYwDingdan.setZhuangtai("已回单"); + req.setAttribute("tmsYwDingdanPage", tmsYwDingdan); + } + return new ModelAndView("com/zzjee/tms/tmsYwDingdanhd-update"); + } + @RequestMapping(params = "goUpdatejs") + public ModelAndView goUpdatejs(TmsYwDingdanEntity tmsYwDingdan, HttpServletRequest req) { + if (StringUtil.isNotEmpty(tmsYwDingdan.getId())) { + tmsYwDingdan = tmsYwDingdanService.getEntity(TmsYwDingdanEntity.class, tmsYwDingdan.getId()); +// tmsYwDingdan.setZhuangtai("已回单"); + req.setAttribute("tmsYwDingdanPage", tmsYwDingdan); + } + return new ModelAndView("com/zzjee/tms/tmsYwDingdanjs-update"); + } + /** + * 导入功能跳转 + * + * @return + */ + @RequestMapping(params = "upload") + public ModelAndView upload(HttpServletRequest req) { + req.setAttribute("controller_name","tmsYwDingdanController"); + return new ModelAndView("common/upload/pub_excel_upload"); + } + + /** + * 导出excel + * + * @param request + * @param response + */ + @RequestMapping(params = "exportXls") + public String exportXls(TmsYwDingdanEntity tmsYwDingdan, HttpServletRequest request, HttpServletResponse response + , DataGrid dataGrid, ModelMap modelMap) { + CriteriaQuery cq = new CriteriaQuery(TmsYwDingdanEntity.class, dataGrid); + org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, tmsYwDingdan, request.getParameterMap()); + List tmsYwDingdans = this.tmsYwDingdanService.getListByCriteriaQuery(cq,false); + modelMap.put(NormalExcelConstants.FILE_NAME,"运输订单"); + modelMap.put(NormalExcelConstants.CLASS,TmsYwDingdanEntity.class); + modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("运输订单列表", "导出人:"+ ResourceUtil.getSessionUser().getRealName(), + "导出信息")); + modelMap.put(NormalExcelConstants.DATA_LIST,tmsYwDingdans); + return NormalExcelConstants.JEECG_EXCEL_VIEW; + } + /** + * 导出excel 使模板 + * + * @param request + * @param response + */ + @RequestMapping(params = "exportXlsByT") + public String exportXlsByT(TmsYwDingdanEntity tmsYwDingdan, HttpServletRequest request, HttpServletResponse response + , DataGrid dataGrid, ModelMap modelMap) { + modelMap.put(NormalExcelConstants.FILE_NAME,"运输订单"); + modelMap.put(NormalExcelConstants.CLASS,TmsYwDingdanEntity.class); + modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("运输订单列表", "导出人:"+ ResourceUtil.getSessionUser().getRealName(), + "导出信息")); + modelMap.put(NormalExcelConstants.DATA_LIST,new ArrayList()); + return NormalExcelConstants.JEECG_EXCEL_VIEW; + } + + @SuppressWarnings("unchecked") + @RequestMapping(params = "importExcel", method = RequestMethod.POST) + @ResponseBody + public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) { + AjaxJson j = new AjaxJson(); + + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue();// 获取上传文件对象 + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List listTmsYwDingdanEntitys = ExcelImportUtil.importExcel(file.getInputStream(),TmsYwDingdanEntity.class,params); + for (TmsYwDingdanEntity tmsYwDingdan : listTmsYwDingdanEntitys) { + tmsYwDingdanService.save(tmsYwDingdan); + } + j.setMsg("文件导入成功！"); + } catch (Exception e) { + j.setMsg("文件导入失败！"); + logger.error(ExceptionUtil.getExceptionMessage(e)); + }finally{ + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return j; + } + + /** + * 获取文件附件信息 + * + * @param id tmsYwDingdan主键id + */ + @RequestMapping(params = "getFiles") + @ResponseBody + public AjaxJson getFiles(String id){ + List uploadBeans = cgFormFieldService.findByProperty(CgUploadEntity.class, "cgformId", id); + List> files = new ArrayList>(0); + for(CgUploadEntity b:uploadBeans){ + String title = b.getAttachmenttitle();//附件名 + String fileKey = b.getId();//附件主键 + String path = b.getRealpath();//附件路径 + String field = b.getCgformField();//表单中作为附件控件的字段 + Map file = new HashMap(); + file.put("title", title); + file.put("fileKey", fileKey); + file.put("path", path); + file.put("field", field==null?"":field); + files.add(file); + } + AjaxJson j = new AjaxJson(); + j.setObj(files); + return j; + } + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value="运输订单列表信息",produces="application/json",httpMethod="GET") + public ResponseMessage> list() { + List listTmsYwDingdans=tmsYwDingdanService.getList(TmsYwDingdanEntity.class); + return Result.success(listTmsYwDingdans); + } + + @RequestMapping(value = "/{id}", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value="根据ID获取运输订单信息",notes="根据ID获取运输订单信息",httpMethod="GET",produces="application/json") + public ResponseMessage get(@ApiParam(required=true,name="id",value="ID")@PathVariable("id") String id) { + TmsYwDingdanEntity task = tmsYwDingdanService.get(TmsYwDingdanEntity.class, id); + if (task == null) { + return Result.error("根据ID获取运输订单信息为空"); + } + return Result.success(task); + } + + @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) + @ResponseBody + @ApiOperation(value="创建运输订单") + public ResponseMessage create(@ApiParam(name="运输订单对象")@RequestBody TmsYwDingdanEntity tmsYwDingdan, UriComponentsBuilder uriBuilder) { + //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. + Set> failures = validator.validate(tmsYwDingdan); + if (!failures.isEmpty()) { + return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); + } + + //保存 + try{ + tmsYwDingdanService.save(tmsYwDingdan); + } catch (Exception e) { + e.printStackTrace(); + return Result.error("运输订单信息保存失败"); + } + return Result.success(tmsYwDingdan); + } + + @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) + @ResponseBody + @ApiOperation(value="更新运输订单",notes="更新运输订单") + public ResponseMessage update(@ApiParam(name="运输订单对象")@RequestBody TmsYwDingdanEntity tmsYwDingdan) { + //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. + Set> failures = validator.validate(tmsYwDingdan); + if (!failures.isEmpty()) { + return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); + } + + //保存 + try{ + tmsYwDingdanService.saveOrUpdate(tmsYwDingdan); + } catch (Exception e) { + e.printStackTrace(); + return Result.error("更新运输订单信息失败"); + } + + //按Restful约定，返回204状态码, 无内容. 也可以返回200状态码. + return Result.success("更新运输订单信息成功"); + } + + @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) + @ResponseStatus(HttpStatus.NO_CONTENT) + @ApiOperation(value="删除运输订单") + public ResponseMessage delete(@ApiParam(name="id",value="ID",required=true)@PathVariable("id") String id) { + logger.info("delete[{}]" + id); + // 验证 + if (StringUtils.isEmpty(id)) { + return Result.error("ID不能为空"); + } + try { + tmsYwDingdanService.deleteEntityById(TmsYwDingdanEntity.class, id); + } catch (Exception e) { + e.printStackTrace(); + return Result.error("运输订单删除失败"); + } + + return Result.success(); + } +} diff --git a/src/main/java/com/zzjee/tms/controller/VTmsDzController.java b/src/main/java/com/zzjee/tms/controller/VTmsDzController.java new file mode 100644 index 00000000..fff28312 --- /dev/null +++ b/src/main/java/com/zzjee/tms/controller/VTmsDzController.java @@ -0,0 +1,402 @@ +package com.zzjee.tms.controller; + +import com.alibaba.fastjson.JSONArray; +import com.zzjee.tms.entity.VTmsDzEntity; +import com.zzjee.tms.service.VTmsDzServiceI; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.Logger; +import org.jeecgframework.core.beanvalidator.BeanValidators; +import org.jeecgframework.core.common.controller.BaseController; +import org.jeecgframework.core.common.exception.BusinessException; +import org.jeecgframework.core.common.hibernate.qbc.CriteriaQuery; +import org.jeecgframework.core.common.model.json.AjaxJson; +import org.jeecgframework.core.common.model.json.DataGrid; +import org.jeecgframework.core.constant.Globals; +import org.jeecgframework.core.util.ExceptionUtil; +import org.jeecgframework.core.util.MyBeanUtils; +import org.jeecgframework.core.util.ResourceUtil; +import org.jeecgframework.core.util.StringUtil; +import org.jeecgframework.jwt.util.ResponseMessage; +import org.jeecgframework.jwt.util.Result; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; +import org.jeecgframework.tag.core.easyui.TagUtil; +import org.jeecgframework.web.system.service.SystemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.util.UriComponentsBuilder; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.ConstraintViolation; +import javax.validation.Validator; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * @Title: Controller + * @Description: v_tms_dz + * @author onlineGenerator + * @date 2018-08-08 01:31:13 + * @version V1.0 + * + */ +@Api(value="VTmsDz",description="v_tms_dz",tags="vTmsDzController") +@Controller +@RequestMapping("/vTmsDzController") +public class VTmsDzController extends BaseController { + /** + * Logger for this class + */ + private static final Logger logger = Logger.getLogger(VTmsDzController.class); + + @Autowired + private VTmsDzServiceI vTmsDzService; + @Autowired + private SystemService systemService; + @Autowired + private Validator validator; + + + + /** + * v_tms_dz列表 页面跳转 + * + * @return + */ + @RequestMapping(params = "list") + public ModelAndView list(HttpServletRequest request) { + return new ModelAndView("com/zzjee/tms/vTmsDzList"); + } + + /** + * easyui AJAX请求数据 + * + * @param request + * @param response + * @param dataGrid + * @param user + */ + + @RequestMapping(params = "datagrid") + public void datagrid(VTmsDzEntity vTmsDz, HttpServletRequest request, HttpServletResponse response, DataGrid dataGrid) { + CriteriaQuery cq = new CriteriaQuery(VTmsDzEntity.class, dataGrid); + //查询条件组装器 + org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, vTmsDz, request.getParameterMap()); + try{ + //自定义追加查询条件 + }catch (Exception e) { + throw new BusinessException(e.getMessage()); + } + cq.add(); + this.vTmsDzService.getDataGridReturn(cq, true); + TagUtil.datagrid(response, dataGrid); + } + + /** + * 删除v_tms_dz + * + * @return + */ + @RequestMapping(params = "doDel") + @ResponseBody + public AjaxJson doDel(VTmsDzEntity vTmsDz, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + vTmsDz = systemService.getEntity(VTmsDzEntity.class, vTmsDz.getId()); + message = "v_tms_dz删除成功"; + try{ + vTmsDzService.delete(vTmsDz); + systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); + }catch(Exception e){ + e.printStackTrace(); + message = "v_tms_dz删除失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + /** + * 批量删除v_tms_dz + * + * @return + */ + @RequestMapping(params = "doBatchDel") + @ResponseBody + public AjaxJson doBatchDel(String ids, HttpServletRequest request){ + String message = null; + AjaxJson j = new AjaxJson(); + message = "v_tms_dz删除成功"; + try{ + for(String id:ids.split(",")){ + VTmsDzEntity vTmsDz = systemService.getEntity(VTmsDzEntity.class, + id + ); + vTmsDzService.delete(vTmsDz); + systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO); + } + }catch(Exception e){ + e.printStackTrace(); + message = "v_tms_dz删除失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + + /** + * 添加v_tms_dz + * + * @param ids + * @return + */ + @RequestMapping(params = "doAdd") + @ResponseBody + public AjaxJson doAdd(VTmsDzEntity vTmsDz, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + message = "v_tms_dz添加成功"; + try{ + vTmsDzService.save(vTmsDz); + systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO); + }catch(Exception e){ + e.printStackTrace(); + message = "v_tms_dz添加失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + /** + * 更新v_tms_dz + * + * @param ids + * @return + */ + @RequestMapping(params = "doUpdate") + @ResponseBody + public AjaxJson doUpdate(VTmsDzEntity vTmsDz, HttpServletRequest request) { + String message = null; + AjaxJson j = new AjaxJson(); + message = "v_tms_dz更新成功"; + VTmsDzEntity t = vTmsDzService.get(VTmsDzEntity.class, vTmsDz.getId()); + try { + MyBeanUtils.copyBeanNotNull2Bean(vTmsDz, t); + vTmsDzService.saveOrUpdate(t); + systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO); + } catch (Exception e) { + e.printStackTrace(); + message = "v_tms_dz更新失败"; + throw new BusinessException(e.getMessage()); + } + j.setMsg(message); + return j; + } + + + /** + * v_tms_dz新增页面跳转 + * + * @return + */ + @RequestMapping(params = "goAdd") + public ModelAndView goAdd(VTmsDzEntity vTmsDz, HttpServletRequest req) { + if (StringUtil.isNotEmpty(vTmsDz.getId())) { + vTmsDz = vTmsDzService.getEntity(VTmsDzEntity.class, vTmsDz.getId()); + req.setAttribute("vTmsDzPage", vTmsDz); + } + return new ModelAndView("com/zzjee/tms/vTmsDz-add"); + } + /** + * v_tms_dz编辑页面跳转 + * + * @return + */ + @RequestMapping(params = "goUpdate") + public ModelAndView goUpdate(VTmsDzEntity vTmsDz, HttpServletRequest req) { + if (StringUtil.isNotEmpty(vTmsDz.getId())) { + vTmsDz = vTmsDzService.getEntity(VTmsDzEntity.class, vTmsDz.getId()); + req.setAttribute("vTmsDzPage", vTmsDz); + } + return new ModelAndView("com/zzjee/tms/vTmsDz-update"); + } + + /** + * 导入功能跳转 + * + * @return + */ + @RequestMapping(params = "upload") + public ModelAndView upload(HttpServletRequest req) { + req.setAttribute("controller_name","vTmsDzController"); + return new ModelAndView("common/upload/pub_excel_upload"); + } + + /** + * 导出excel + * + * @param request + * @param response + */ + @RequestMapping(params = "exportXls") + public String exportXls(VTmsDzEntity vTmsDz, HttpServletRequest request, HttpServletResponse response + , DataGrid dataGrid, ModelMap modelMap) { + CriteriaQuery cq = new CriteriaQuery(VTmsDzEntity.class, dataGrid); + org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, vTmsDz, request.getParameterMap()); + List vTmsDzs = this.vTmsDzService.getListByCriteriaQuery(cq,false); + modelMap.put(NormalExcelConstants.FILE_NAME,"v_tms_dz"); + modelMap.put(NormalExcelConstants.CLASS,VTmsDzEntity.class); + modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("v_tms_dz列表", "导出人:"+ResourceUtil.getSessionUser().getRealName(), + "导出信息")); + modelMap.put(NormalExcelConstants.DATA_LIST,vTmsDzs); + return NormalExcelConstants.JEECG_EXCEL_VIEW; + } + /** + * 导出excel 使模板 + * + * @param request + * @param response + */ + @RequestMapping(params = "exportXlsByT") + public String exportXlsByT(VTmsDzEntity vTmsDz, HttpServletRequest request, HttpServletResponse response + , DataGrid dataGrid, ModelMap modelMap) { + modelMap.put(NormalExcelConstants.FILE_NAME,"v_tms_dz"); + modelMap.put(NormalExcelConstants.CLASS,VTmsDzEntity.class); + modelMap.put(NormalExcelConstants.PARAMS,new ExportParams("v_tms_dz列表", "导出人:"+ResourceUtil.getSessionUser().getRealName(), + "导出信息")); + modelMap.put(NormalExcelConstants.DATA_LIST,new ArrayList()); + return NormalExcelConstants.JEECG_EXCEL_VIEW; + } + + @SuppressWarnings("unchecked") + @RequestMapping(params = "importExcel", method = RequestMethod.POST) + @ResponseBody + public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) { + AjaxJson j = new AjaxJson(); + + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue();// 获取上传文件对象 + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List listVTmsDzEntitys = ExcelImportUtil.importExcel(file.getInputStream(),VTmsDzEntity.class,params); + for (VTmsDzEntity vTmsDz : listVTmsDzEntitys) { + vTmsDzService.save(vTmsDz); + } + j.setMsg("文件导入成功！"); + } catch (Exception e) { + j.setMsg("文件导入失败！"); + logger.error(ExceptionUtil.getExceptionMessage(e)); + }finally{ + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return j; + } + + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value="v_tms_dz列表信息",produces="application/json",httpMethod="GET") + public ResponseMessage> list() { + List listVTmsDzs=vTmsDzService.getList(VTmsDzEntity.class); + return Result.success(listVTmsDzs); + } + + @RequestMapping(value = "/{id}", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value="根据ID获取v_tms_dz信息",notes="根据ID获取v_tms_dz信息",httpMethod="GET",produces="application/json") + public ResponseMessage get(@ApiParam(required=true,name="id",value="ID")@PathVariable("id") String id) { + VTmsDzEntity task = vTmsDzService.get(VTmsDzEntity.class, id); + if (task == null) { + return Result.error("根据ID获取v_tms_dz信息为空"); + } + return Result.success(task); + } + + @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) + @ResponseBody + @ApiOperation(value="创建v_tms_dz") + public ResponseMessage create(@ApiParam(name="v_tms_dz对象")@RequestBody VTmsDzEntity vTmsDz, UriComponentsBuilder uriBuilder) { + //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. + Set> failures = validator.validate(vTmsDz); + if (!failures.isEmpty()) { + return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); + } + + //保存 + try{ + vTmsDzService.save(vTmsDz); + } catch (Exception e) { + e.printStackTrace(); + return Result.error("v_tms_dz信息保存失败"); + } + return Result.success(vTmsDz); + } + + @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) + @ResponseBody + @ApiOperation(value="更新v_tms_dz",notes="更新v_tms_dz") + public ResponseMessage update(@ApiParam(name="v_tms_dz对象")@RequestBody VTmsDzEntity vTmsDz) { + //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. + Set> failures = validator.validate(vTmsDz); + if (!failures.isEmpty()) { + return Result.error(JSONArray.toJSONString(BeanValidators.extractPropertyAndMessage(failures))); + } + + //保存 + try{ + vTmsDzService.saveOrUpdate(vTmsDz); + } catch (Exception e) { + e.printStackTrace(); + return Result.error("更新v_tms_dz信息失败"); + } + + //按Restful约定，返回204状态码, 无内容. 也可以返回200状态码. + return Result.success("更新v_tms_dz信息成功"); + } + + @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) + @ResponseStatus(HttpStatus.NO_CONTENT) + @ApiOperation(value="删除v_tms_dz") + public ResponseMessage delete(@ApiParam(name="id",value="ID",required=true)@PathVariable("id") String id) { + logger.info("delete[{}]" + id); + // 验证 + if (StringUtils.isEmpty(id)) { + return Result.error("ID不能为空"); + } + try { + vTmsDzService.deleteEntityById(VTmsDzEntity.class, id); + } catch (Exception e) { + e.printStackTrace(); + return Result.error("v_tms_dz删除失败"); + } + + return Result.success(); + } +} diff --git a/src/main/java/com/zzjee/tms/entity/DdPage.java b/src/main/java/com/zzjee/tms/entity/DdPage.java new file mode 100644 index 00000000..304a428d --- /dev/null +++ b/src/main/java/com/zzjee/tms/entity/DdPage.java @@ -0,0 +1,18 @@ +package com.zzjee.tms.entity; + + +import java.util.List; + +/** + */ +public class DdPage { + private List demos; + + public List getDemos() { + return demos; + } + + public void setDemos(List demos) { + this.demos = demos; + } +} diff --git a/src/main/java/com/zzjee/tms/entity/TmsMdCheliangEntity.java b/src/main/java/com/zzjee/tms/entity/TmsMdCheliangEntity.java new file mode 100644 index 00000000..48f76bf6 --- /dev/null +++ b/src/main/java/com/zzjee/tms/entity/TmsMdCheliangEntity.java @@ -0,0 +1,395 @@ +package com.zzjee.tms.entity; + +import org.hibernate.annotations.GenericGenerator; +import org.jeecgframework.poi.excel.annotation.Excel; + +import javax.persistence.*; +import java.util.Date; + +/** + * @Title: Entity + * @Description: 车辆管理 + * @author onlineGenerator + * @date 2018-01-29 21:57:07 + * @version V1.0 + * + */ +@Entity +@Table(name = "tms_md_cheliang", schema = "") +@SuppressWarnings("serial") +public class TmsMdCheliangEntity implements java.io.Serializable { + /**主键*/ + private String id; + /**创建人名称*/ + private String createName; + /**创建人登录名称*/ + private String createBy; + /**创建日期*/ + private Date createDate; + /**更新人名称*/ + private String updateName; + /**更新人登录名称*/ + private String updateBy; + /**更新日期*/ + private Date updateDate; + /**所属部门*/ + private String sysOrgCode; + /**所属公司*/ + private String sysCompanyCode; + /**流程状态*/ + private String bpmStatus; + /**车牌号*/ + @Excel(name="车牌号",width=15) + private String chepaihao; + /**车型*/ + @Excel(name="车型",width=15) + private String chexing; + /**最大体积*/ + @Excel(name="最大体积",width=15) + private String zuidatiji; + /**载重*/ + @Excel(name="载重",width=15) + private String zaizhong; + /**载人数*/ + @Excel(name="载人数",width=15) + private String zairen; + /**准假驾照*/ + @Excel(name="准假驾照",width=15) + private String jiazhao; + /**是否可用*/ + @Excel(name="是否可用",width=15,dicCode="sf_yn") + private String zhuangtai; + /**备注*/ + @Excel(name="备注",width=15) + private String beizhu; + /**默认司机*/ + @Excel(name="默认司机",width=15) + private String username; + /**gps*/ + @Excel(name="gps",width=15) + private String gpsid; + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 主键 + */ + @Id + @GeneratedValue(generator = "paymentableGenerator") + @GenericGenerator(name = "paymentableGenerator", strategy = "uuid") + @Column(name ="ID",nullable=false,length=36) + public String getId(){ + return this.id; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 主键 + */ + public void setId(String id){ + this.id = id; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 创建人名称 + */ + @Column(name ="CREATE_NAME",nullable=true,length=50) + public String getCreateName(){ + return this.createName; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 创建人名称 + */ + public void setCreateName(String createName){ + this.createName = createName; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 创建人登录名称 + */ + @Column(name ="CREATE_BY",nullable=true,length=50) + public String getCreateBy(){ + return this.createBy; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 创建人登录名称 + */ + public void setCreateBy(String createBy){ + this.createBy = createBy; + } + /** + *方法: 取得java.util.Date + *@return: java.util.Date 创建日期 + */ + @Column(name ="CREATE_DATE",nullable=true) + public Date getCreateDate(){ + return this.createDate; + } + + /** + *方法: 设置java.util.Date + *@param: java.util.Date 创建日期 + */ + public void setCreateDate(Date createDate){ + this.createDate = createDate; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 更新人名称 + */ + @Column(name ="UPDATE_NAME",nullable=true,length=50) + public String getUpdateName(){ + return this.updateName; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 更新人名称 + */ + public void setUpdateName(String updateName){ + this.updateName = updateName; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 更新人登录名称 + */ + @Column(name ="UPDATE_BY",nullable=true,length=50) + public String getUpdateBy(){ + return this.updateBy; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 更新人登录名称 + */ + public void setUpdateBy(String updateBy){ + this.updateBy = updateBy; + } + /** + *方法: 取得java.util.Date + *@return: java.util.Date 更新日期 + */ + @Column(name ="UPDATE_DATE",nullable=true) + public Date getUpdateDate(){ + return this.updateDate; + } + + /** + *方法: 设置java.util.Date + *@param: java.util.Date 更新日期 + */ + public void setUpdateDate(Date updateDate){ + this.updateDate = updateDate; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 所属部门 + */ + @Column(name ="SYS_ORG_CODE",nullable=true,length=50) + public String getSysOrgCode(){ + return this.sysOrgCode; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 所属部门 + */ + public void setSysOrgCode(String sysOrgCode){ + this.sysOrgCode = sysOrgCode; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 所属公司 + */ + @Column(name ="SYS_COMPANY_CODE",nullable=true,length=50) + public String getSysCompanyCode(){ + return this.sysCompanyCode; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 所属公司 + */ + public void setSysCompanyCode(String sysCompanyCode){ + this.sysCompanyCode = sysCompanyCode; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 流程状态 + */ + @Column(name ="BPM_STATUS",nullable=true,length=32) + public String getBpmStatus(){ + return this.bpmStatus; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 流程状态 + */ + public void setBpmStatus(String bpmStatus){ + this.bpmStatus = bpmStatus; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 车牌号 + */ + @Column(name ="CHEPAIHAO",nullable=true,length=32) + public String getChepaihao(){ + return this.chepaihao; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 车牌号 + */ + public void setChepaihao(String chepaihao){ + this.chepaihao = chepaihao; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 车型 + */ + @Column(name ="CHEXING",nullable=true,length=32) + public String getChexing(){ + return this.chexing; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 车型 + */ + public void setChexing(String chexing){ + this.chexing = chexing; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 最大体积 + */ + @Column(name ="ZUIDATIJI",nullable=true,length=32) + public String getZuidatiji(){ + return this.zuidatiji; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 最大体积 + */ + public void setZuidatiji(String zuidatiji){ + this.zuidatiji = zuidatiji; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 载重 + */ + @Column(name ="ZAIZHONG",nullable=true,length=32) + public String getZaizhong(){ + return this.zaizhong; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 载重 + */ + public void setZaizhong(String zaizhong){ + this.zaizhong = zaizhong; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 载人数 + */ + @Column(name ="ZAIREN",nullable=true,length=32) + public String getZairen(){ + return this.zairen; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 载人数 + */ + public void setZairen(String zairen){ + this.zairen = zairen; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 准假驾照 + */ + @Column(name ="JIAZHAO",nullable=true,length=32) + public String getJiazhao(){ + return this.jiazhao; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 准假驾照 + */ + public void setJiazhao(String jiazhao){ + this.jiazhao = jiazhao; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 是否可用 + */ + @Column(name ="ZHUANGTAI",nullable=true,length=32) + public String getZhuangtai(){ + return this.zhuangtai; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 是否可用 + */ + public void setZhuangtai(String zhuangtai){ + this.zhuangtai = zhuangtai; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 备注 + */ + @Column(name ="BEIZHU",nullable=true,length=32) + public String getBeizhu(){ + return this.beizhu; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 备注 + */ + public void setBeizhu(String beizhu){ + this.beizhu = beizhu; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 默认司机 + */ + @Column(name ="USERNAME",nullable=true,length=32) + public String getUsername(){ + return this.username; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 默认司机 + */ + public void setUsername(String username){ + this.username = username; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String gps + */ + @Column(name ="GPSID",nullable=true,length=32) + public String getGpsid(){ + return this.gpsid; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String gps + */ + public void setGpsid(String gpsid){ + this.gpsid = gpsid; + } +} diff --git a/src/main/java/com/zzjee/tms/entity/TmsMdDzEntity.java b/src/main/java/com/zzjee/tms/entity/TmsMdDzEntity.java new file mode 100644 index 00000000..2d7de4cb --- /dev/null +++ b/src/main/java/com/zzjee/tms/entity/TmsMdDzEntity.java @@ -0,0 +1,395 @@ +package com.zzjee.tms.entity; + +import org.hibernate.annotations.GenericGenerator; +import org.jeecgframework.poi.excel.annotation.Excel; + +import javax.persistence.*; +import java.util.Date; + +/** + * @Title: Entity + * @Description: 客户地址 + * @author onlineGenerator + * @date 2018-01-29 21:57:16 + * @version V1.0 + * + */ +@Entity +@Table(name = "tms_md_dz", schema = "") +@SuppressWarnings("serial") +public class TmsMdDzEntity implements java.io.Serializable { + /**id*/ + private String id; + /**创建人名称*/ + private String createName; + /**创建人登录名称*/ + private String createBy; + /**创建日期*/ + private Date createDate; + /**更新人名称*/ + private String updateName; + /**更新人登录名称*/ + private String updateBy; + /**更新日期*/ + private Date updateDate; + /**所属部门*/ + private String sysOrgCode; + /**所属公司*/ + private String sysCompanyCode; + /**流程状态*/ + private String bpmStatus; + /**用户*/ + @Excel(name="用户",width=15) + private String username; + /**联系人*/ + @Excel(name="联系人",width=15) + private String lianxiren; + /**联系电话*/ + @Excel(name="联系电话",width=15) + private String dianhua; + /**详细地址*/ + @Excel(name="详细地址",width=15) + private String xiangxidizhi; + /**省份*/ + @Excel(name="省份",width=15) + private String shengfen; + /**城市*/ + @Excel(name="城市",width=15) + private String chengshi; + /**区域*/ + @Excel(name="区域",width=15) + private String quyu; + /**默认地址*/ + @Excel(name="默认地址",width=15,dicCode="sf_yn") + private String morendizhi; + /**是否可用*/ + @Excel(name="是否可用",width=15,dicCode="sf_yn") + private String zhuangtai; + /**地址类型*/ + @Excel(name="地址类型",width=15) + private String dizhileixing; + + /** + *方法: 取得java.lang.String + *@return: java.lang.String id + */ + @Id + @GeneratedValue(generator = "paymentableGenerator") + @GenericGenerator(name = "paymentableGenerator", strategy = "uuid") + @Column(name ="ID",nullable=false,length=36) + public String getId(){ + return this.id; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String id + */ + public void setId(String id){ + this.id = id; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 创建人名称 + */ + @Column(name ="CREATE_NAME",nullable=true,length=50) + public String getCreateName(){ + return this.createName; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 创建人名称 + */ + public void setCreateName(String createName){ + this.createName = createName; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 创建人登录名称 + */ + @Column(name ="CREATE_BY",nullable=true,length=50) + public String getCreateBy(){ + return this.createBy; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 创建人登录名称 + */ + public void setCreateBy(String createBy){ + this.createBy = createBy; + } + /** + *方法: 取得java.util.Date + *@return: java.util.Date 创建日期 + */ + @Column(name ="CREATE_DATE",nullable=true) + public Date getCreateDate(){ + return this.createDate; + } + + /** + *方法: 设置java.util.Date + *@param: java.util.Date 创建日期 + */ + public void setCreateDate(Date createDate){ + this.createDate = createDate; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 更新人名称 + */ + @Column(name ="UPDATE_NAME",nullable=true,length=50) + public String getUpdateName(){ + return this.updateName; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 更新人名称 + */ + public void setUpdateName(String updateName){ + this.updateName = updateName; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 更新人登录名称 + */ + @Column(name ="UPDATE_BY",nullable=true,length=50) + public String getUpdateBy(){ + return this.updateBy; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 更新人登录名称 + */ + public void setUpdateBy(String updateBy){ + this.updateBy = updateBy; + } + /** + *方法: 取得java.util.Date + *@return: java.util.Date 更新日期 + */ + @Column(name ="UPDATE_DATE",nullable=true) + public Date getUpdateDate(){ + return this.updateDate; + } + + /** + *方法: 设置java.util.Date + *@param: java.util.Date 更新日期 + */ + public void setUpdateDate(Date updateDate){ + this.updateDate = updateDate; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 所属部门 + */ + @Column(name ="SYS_ORG_CODE",nullable=true,length=50) + public String getSysOrgCode(){ + return this.sysOrgCode; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 所属部门 + */ + public void setSysOrgCode(String sysOrgCode){ + this.sysOrgCode = sysOrgCode; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 所属公司 + */ + @Column(name ="SYS_COMPANY_CODE",nullable=true,length=50) + public String getSysCompanyCode(){ + return this.sysCompanyCode; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 所属公司 + */ + public void setSysCompanyCode(String sysCompanyCode){ + this.sysCompanyCode = sysCompanyCode; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 流程状态 + */ + @Column(name ="BPM_STATUS",nullable=true,length=32) + public String getBpmStatus(){ + return this.bpmStatus; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 流程状态 + */ + public void setBpmStatus(String bpmStatus){ + this.bpmStatus = bpmStatus; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 用户 + */ + @Column(name ="USERNAME",nullable=true,length=32) + public String getUsername(){ + return this.username; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 用户 + */ + public void setUsername(String username){ + this.username = username; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 联系人 + */ + @Column(name ="LIANXIREN",nullable=true,length=32) + public String getLianxiren(){ + return this.lianxiren; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 联系人 + */ + public void setLianxiren(String lianxiren){ + this.lianxiren = lianxiren; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 联系电话 + */ + @Column(name ="DIANHUA",nullable=true,length=32) + public String getDianhua(){ + return this.dianhua; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 联系电话 + */ + public void setDianhua(String dianhua){ + this.dianhua = dianhua; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 详细地址 + */ + @Column(name ="XIANGXIDIZHI",nullable=true,length=32) + public String getXiangxidizhi(){ + return this.xiangxidizhi; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 详细地址 + */ + public void setXiangxidizhi(String xiangxidizhi){ + this.xiangxidizhi = xiangxidizhi; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 省份 + */ + @Column(name ="SHENGFEN",nullable=true,length=32) + public String getShengfen(){ + return this.shengfen; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 省份 + */ + public void setShengfen(String shengfen){ + this.shengfen = shengfen; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 城市 + */ + @Column(name ="CHENGSHI",nullable=true,length=32) + public String getChengshi(){ + return this.chengshi; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 城市 + */ + public void setChengshi(String chengshi){ + this.chengshi = chengshi; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 区域 + */ + @Column(name ="QUYU",nullable=true,length=32) + public String getQuyu(){ + return this.quyu; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 区域 + */ + public void setQuyu(String quyu){ + this.quyu = quyu; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 默认地址 + */ + @Column(name ="MORENDIZHI",nullable=true,length=32) + public String getMorendizhi(){ + return this.morendizhi; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 默认地址 + */ + public void setMorendizhi(String morendizhi){ + this.morendizhi = morendizhi; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 是否可用 + */ + @Column(name ="ZHUANGTAI",nullable=true,length=32) + public String getZhuangtai(){ + return this.zhuangtai; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 是否可用 + */ + public void setZhuangtai(String zhuangtai){ + this.zhuangtai = zhuangtai; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 地址类型 + */ + @Column(name ="DIZHILEIXING",nullable=true,length=32) + public String getDizhileixing(){ + return this.dizhileixing; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 地址类型 + */ + public void setDizhileixing(String dizhileixing){ + this.dizhileixing = dizhileixing; + } +} diff --git a/src/main/java/com/zzjee/tms/entity/VTmsDzEntity.java b/src/main/java/com/zzjee/tms/entity/VTmsDzEntity.java new file mode 100644 index 00000000..2406e027 --- /dev/null +++ b/src/main/java/com/zzjee/tms/entity/VTmsDzEntity.java @@ -0,0 +1,63 @@ +package com.zzjee.tms.entity; + +import org.hibernate.annotations.GenericGenerator; +import org.jeecgframework.poi.excel.annotation.Excel; + +import javax.persistence.*; + +/** + * @Title: Entity + * @Description: v_tms_dz + * @author onlineGenerator + * @date 2018-08-08 01:31:13 + * @version V1.0 + * + */ +@Entity +@Table(name = "v_tms_dz", schema = "") +@SuppressWarnings("serial") +public class VTmsDzEntity implements java.io.Serializable { + /**id*/ + private String id; + /**dizhi*/ + @Excel(name="dizhi",width=15) + private String dizhi; + + /** + *方法: 取得java.lang.String + *@return: java.lang.String id + */ + @Id + @GeneratedValue(generator = "paymentableGenerator") + @GenericGenerator(name = "paymentableGenerator", strategy = "uuid") + + @Column(name ="ID",nullable=false,length=36) + public String getId(){ + return this.id; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String id + */ + public void setId(String id){ + this.id = id; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String dizhi + */ + + @Column(name ="DIZHI",nullable=true,length=131) + public String getDizhi(){ + return this.dizhi; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String dizhi + */ + public void setDizhi(String dizhi){ + this.dizhi = dizhi; + } +} diff --git a/src/main/java/com/zzjee/tms/service/TmsMdCheliangServiceI.java b/src/main/java/com/zzjee/tms/service/TmsMdCheliangServiceI.java new file mode 100644 index 00000000..cc64af52 --- /dev/null +++ b/src/main/java/com/zzjee/tms/service/TmsMdCheliangServiceI.java @@ -0,0 +1,15 @@ +package com.zzjee.tms.service; +import com.zzjee.tms.entity.TmsMdCheliangEntity; +import org.jeecgframework.core.common.service.CommonService; + +import java.io.Serializable; + +public interface TmsMdCheliangServiceI extends CommonService { + + public void delete(TmsMdCheliangEntity entity) throws Exception; + + public Serializable save(TmsMdCheliangEntity entity) throws Exception; + + public void saveOrUpdate(TmsMdCheliangEntity entity) throws Exception; + +} diff --git a/src/main/java/com/zzjee/tms/service/TmsMdDzServiceI.java b/src/main/java/com/zzjee/tms/service/TmsMdDzServiceI.java new file mode 100644 index 00000000..da85333a --- /dev/null +++ b/src/main/java/com/zzjee/tms/service/TmsMdDzServiceI.java @@ -0,0 +1,15 @@ +package com.zzjee.tms.service; +import com.zzjee.tms.entity.TmsMdDzEntity; +import org.jeecgframework.core.common.service.CommonService; + +import java.io.Serializable; + +public interface TmsMdDzServiceI extends CommonService { + + public void delete(TmsMdDzEntity entity) throws Exception; + + public Serializable save(TmsMdDzEntity entity) throws Exception; + + public void saveOrUpdate(TmsMdDzEntity entity) throws Exception; + +} diff --git a/src/main/java/com/zzjee/tms/service/TmsYwDingdanServiceI.java b/src/main/java/com/zzjee/tms/service/TmsYwDingdanServiceI.java new file mode 100644 index 00000000..1df8cc15 --- /dev/null +++ b/src/main/java/com/zzjee/tms/service/TmsYwDingdanServiceI.java @@ -0,0 +1,15 @@ +package com.zzjee.tms.service; +import com.zzjee.tms.entity.TmsYwDingdanEntity; +import org.jeecgframework.core.common.service.CommonService; + +import java.io.Serializable; + +public interface TmsYwDingdanServiceI extends CommonService { + + public void delete(TmsYwDingdanEntity entity) throws Exception; + + public Serializable save(TmsYwDingdanEntity entity) throws Exception; + + public void saveOrUpdate(TmsYwDingdanEntity entity) throws Exception; + +} diff --git a/src/main/java/com/zzjee/tms/service/VTmsDzServiceI.java b/src/main/java/com/zzjee/tms/service/VTmsDzServiceI.java new file mode 100644 index 00000000..eb69552e --- /dev/null +++ b/src/main/java/com/zzjee/tms/service/VTmsDzServiceI.java @@ -0,0 +1,15 @@ +package com.zzjee.tms.service; +import com.zzjee.tms.entity.VTmsDzEntity; +import org.jeecgframework.core.common.service.CommonService; + +import java.io.Serializable; + +public interface VTmsDzServiceI extends CommonService { + + public void delete(VTmsDzEntity entity) throws Exception; + + public Serializable save(VTmsDzEntity entity) throws Exception; + + public void saveOrUpdate(VTmsDzEntity entity) throws Exception; + +} diff --git a/src/main/java/com/zzjee/tms/service/impl/TmsMdCheliangServiceImpl.java b/src/main/java/com/zzjee/tms/service/impl/TmsMdCheliangServiceImpl.java new file mode 100644 index 00000000..0c88e84b --- /dev/null +++ b/src/main/java/com/zzjee/tms/service/impl/TmsMdCheliangServiceImpl.java @@ -0,0 +1,158 @@ +package com.zzjee.tms.service.impl; + +import com.zzjee.tms.entity.TmsMdCheliangEntity; +import com.zzjee.tms.service.TmsMdCheliangServiceI; +import org.jeecgframework.core.common.service.impl.CommonServiceImpl; +import org.jeecgframework.core.util.ApplicationContextUtil; +import org.jeecgframework.core.util.MyClassLoader; +import org.jeecgframework.core.util.StringUtil; +import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +@Service("tmsMdCheliangService") +@Transactional +public class TmsMdCheliangServiceImpl extends CommonServiceImpl implements TmsMdCheliangServiceI { + + + public void delete(TmsMdCheliangEntity entity) throws Exception{ + super.delete(entity); + //执行删除操作增强业务 + this.doDelBus(entity); + } + + public Serializable save(TmsMdCheliangEntity entity) throws Exception{ + Serializable t = super.save(entity); + //执行新增操作增强业务 + this.doAddBus(entity); + return t; + } + + public void saveOrUpdate(TmsMdCheliangEntity entity) throws Exception{ + super.saveOrUpdate(entity); + //执行更新操作增强业务 + this.doUpdateBus(entity); + } + + /** + * 新增操作增强业务 + * @param t + * @return + */ + private void doAddBus(TmsMdCheliangEntity t) throws Exception{ + //-----------------sql增强 start---------------------------- + //-----------------sql增强 end------------------------------ + + //-----------------java增强 start--------------------------- + //-----------------java增强 end----------------------------- + } + /** + * 更新操作增强业务 + * @param t + * @return + */ + private void doUpdateBus(TmsMdCheliangEntity t) throws Exception{ + //-----------------sql增强 start---------------------------- + //-----------------sql增强 end------------------------------ + + //-----------------java增强 start--------------------------- + //-----------------java增强 end----------------------------- + } + /** + * 删除操作增强业务 + * @param id + * @return + */ + private void doDelBus(TmsMdCheliangEntity t) throws Exception{ + //-----------------sql增强 start---------------------------- + //-----------------sql增强 end------------------------------ + + //-----------------java增强 start--------------------------- + //-----------------java增强 end----------------------------- + } + + private Map populationMap(TmsMdCheliangEntity t){ + Map map = new HashMap(); + map.put("id", t.getId()); + map.put("create_name", t.getCreateName()); + map.put("create_by", t.getCreateBy()); + map.put("create_date", t.getCreateDate()); + map.put("update_name", t.getUpdateName()); + map.put("update_by", t.getUpdateBy()); + map.put("update_date", t.getUpdateDate()); + map.put("sys_org_code", t.getSysOrgCode()); + map.put("sys_company_code", t.getSysCompanyCode()); + map.put("bpm_status", t.getBpmStatus()); + map.put("chepaihao", t.getChepaihao()); + map.put("chexing", t.getChexing()); + map.put("zuidatiji", t.getZuidatiji()); + map.put("zaizhong", t.getZaizhong()); + map.put("zairen", t.getZairen()); + map.put("jiazhao", t.getJiazhao()); + map.put("zhuangtai", t.getZhuangtai()); + map.put("beizhu", t.getBeizhu()); + map.put("username", t.getUsername()); + map.put("gpsid", t.getGpsid()); + return map; + } + + /** + * 替换sql中的变量 + * @param sql + * @param t + * @return + */ + public String replaceVal(String sql,TmsMdCheliangEntity t){ + sql = sql.replace("#{id}",String.valueOf(t.getId())); + sql = sql.replace("#{create_name}",String.valueOf(t.getCreateName())); + sql = sql.replace("#{create_by}",String.valueOf(t.getCreateBy())); + sql = sql.replace("#{create_date}",String.valueOf(t.getCreateDate())); + sql = sql.replace("#{update_name}",String.valueOf(t.getUpdateName())); + sql = sql.replace("#{update_by}",String.valueOf(t.getUpdateBy())); + sql = sql.replace("#{update_date}",String.valueOf(t.getUpdateDate())); + sql = sql.replace("#{sys_org_code}",String.valueOf(t.getSysOrgCode())); + sql = sql.replace("#{sys_company_code}",String.valueOf(t.getSysCompanyCode())); + sql = sql.replace("#{bpm_status}",String.valueOf(t.getBpmStatus())); + sql = sql.replace("#{chepaihao}",String.valueOf(t.getChepaihao())); + sql = sql.replace("#{chexing}",String.valueOf(t.getChexing())); + sql = sql.replace("#{zuidatiji}",String.valueOf(t.getZuidatiji())); + sql = sql.replace("#{zaizhong}",String.valueOf(t.getZaizhong())); + sql = sql.replace("#{zairen}",String.valueOf(t.getZairen())); + sql = sql.replace("#{jiazhao}",String.valueOf(t.getJiazhao())); + sql = sql.replace("#{zhuangtai}",String.valueOf(t.getZhuangtai())); + sql = sql.replace("#{beizhu}",String.valueOf(t.getBeizhu())); + sql = sql.replace("#{username}",String.valueOf(t.getUsername())); + sql = sql.replace("#{gpsid}",String.valueOf(t.getGpsid())); + sql = sql.replace("#{UUID}",UUID.randomUUID().toString()); + return sql; + } + + /** + * 执行JAVA增强 + */ + private void executeJavaExtend(String cgJavaType,String cgJavaValue,Map data) throws Exception { + if(StringUtil.isNotEmpty(cgJavaValue)){ + Object obj = null; + try { + if("class".equals(cgJavaType)){ + //因新增时已经校验了实例化是否可以成功，所以这块就不需要再做一次判断 + obj = MyClassLoader.getClassByScn(cgJavaValue).newInstance(); + }else if("spring".equals(cgJavaType)){ + obj = ApplicationContextUtil.getContext().getBean(cgJavaValue); + } + if(obj instanceof CgformEnhanceJavaInter){ + CgformEnhanceJavaInter javaInter = (CgformEnhanceJavaInter) obj; + javaInter.execute("tms_md_cheliang",data); + } + } catch (Exception e) { + e.printStackTrace(); + throw new Exception("执行JAVA增强出现异常！"); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/com/zzjee/tms/service/impl/TmsMdDzServiceImpl.java b/src/main/java/com/zzjee/tms/service/impl/TmsMdDzServiceImpl.java new file mode 100644 index 00000000..7fabf118 --- /dev/null +++ b/src/main/java/com/zzjee/tms/service/impl/TmsMdDzServiceImpl.java @@ -0,0 +1,158 @@ +package com.zzjee.tms.service.impl; + +import com.zzjee.tms.entity.TmsMdDzEntity; +import com.zzjee.tms.service.TmsMdDzServiceI; +import org.jeecgframework.core.common.service.impl.CommonServiceImpl; +import org.jeecgframework.core.util.ApplicationContextUtil; +import org.jeecgframework.core.util.MyClassLoader; +import org.jeecgframework.core.util.StringUtil; +import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +@Service("tmsMdDzService") +@Transactional +public class TmsMdDzServiceImpl extends CommonServiceImpl implements TmsMdDzServiceI { + + + public void delete(TmsMdDzEntity entity) throws Exception{ + super.delete(entity); + //执行删除操作增强业务 + this.doDelBus(entity); + } + + public Serializable save(TmsMdDzEntity entity) throws Exception{ + Serializable t = super.save(entity); + //执行新增操作增强业务 + this.doAddBus(entity); + return t; + } + + public void saveOrUpdate(TmsMdDzEntity entity) throws Exception{ + super.saveOrUpdate(entity); + //执行更新操作增强业务 + this.doUpdateBus(entity); + } + + /** + * 新增操作增强业务 + * @param t + * @return + */ + private void doAddBus(TmsMdDzEntity t) throws Exception{ + //-----------------sql增强 start---------------------------- + //-----------------sql增强 end------------------------------ + + //-----------------java增强 start--------------------------- + //-----------------java增强 end----------------------------- + } + /** + * 更新操作增强业务 + * @param t + * @return + */ + private void doUpdateBus(TmsMdDzEntity t) throws Exception{ + //-----------------sql增强 start---------------------------- + //-----------------sql增强 end------------------------------ + + //-----------------java增强 start--------------------------- + //-----------------java增强 end----------------------------- + } + /** + * 删除操作增强业务 + * @param id + * @return + */ + private void doDelBus(TmsMdDzEntity t) throws Exception{ + //-----------------sql增强 start---------------------------- + //-----------------sql增强 end------------------------------ + + //-----------------java增强 start--------------------------- + //-----------------java增强 end----------------------------- + } + + private Map populationMap(TmsMdDzEntity t){ + Map map = new HashMap(); + map.put("id", t.getId()); + map.put("create_name", t.getCreateName()); + map.put("create_by", t.getCreateBy()); + map.put("create_date", t.getCreateDate()); + map.put("update_name", t.getUpdateName()); + map.put("update_by", t.getUpdateBy()); + map.put("update_date", t.getUpdateDate()); + map.put("sys_org_code", t.getSysOrgCode()); + map.put("sys_company_code", t.getSysCompanyCode()); + map.put("bpm_status", t.getBpmStatus()); + map.put("username", t.getUsername()); + map.put("lianxiren", t.getLianxiren()); + map.put("dianhua", t.getDianhua()); + map.put("xiangxidizhi", t.getXiangxidizhi()); + map.put("shengfen", t.getShengfen()); + map.put("chengshi", t.getChengshi()); + map.put("quyu", t.getQuyu()); + map.put("morendizhi", t.getMorendizhi()); + map.put("zhuangtai", t.getZhuangtai()); + map.put("dizhileixing", t.getDizhileixing()); + return map; + } + + /** + * 替换sql中的变量 + * @param sql + * @param t + * @return + */ + public String replaceVal(String sql,TmsMdDzEntity t){ + sql = sql.replace("#{id}",String.valueOf(t.getId())); + sql = sql.replace("#{create_name}",String.valueOf(t.getCreateName())); + sql = sql.replace("#{create_by}",String.valueOf(t.getCreateBy())); + sql = sql.replace("#{create_date}",String.valueOf(t.getCreateDate())); + sql = sql.replace("#{update_name}",String.valueOf(t.getUpdateName())); + sql = sql.replace("#{update_by}",String.valueOf(t.getUpdateBy())); + sql = sql.replace("#{update_date}",String.valueOf(t.getUpdateDate())); + sql = sql.replace("#{sys_org_code}",String.valueOf(t.getSysOrgCode())); + sql = sql.replace("#{sys_company_code}",String.valueOf(t.getSysCompanyCode())); + sql = sql.replace("#{bpm_status}",String.valueOf(t.getBpmStatus())); + sql = sql.replace("#{username}",String.valueOf(t.getUsername())); + sql = sql.replace("#{lianxiren}",String.valueOf(t.getLianxiren())); + sql = sql.replace("#{dianhua}",String.valueOf(t.getDianhua())); + sql = sql.replace("#{xiangxidizhi}",String.valueOf(t.getXiangxidizhi())); + sql = sql.replace("#{shengfen}",String.valueOf(t.getShengfen())); + sql = sql.replace("#{chengshi}",String.valueOf(t.getChengshi())); + sql = sql.replace("#{quyu}",String.valueOf(t.getQuyu())); + sql = sql.replace("#{morendizhi}",String.valueOf(t.getMorendizhi())); + sql = sql.replace("#{zhuangtai}",String.valueOf(t.getZhuangtai())); + sql = sql.replace("#{dizhileixing}",String.valueOf(t.getDizhileixing())); + sql = sql.replace("#{UUID}",UUID.randomUUID().toString()); + return sql; + } + + /** + * 执行JAVA增强 + */ + private void executeJavaExtend(String cgJavaType,String cgJavaValue,Map data) throws Exception { + if(StringUtil.isNotEmpty(cgJavaValue)){ + Object obj = null; + try { + if("class".equals(cgJavaType)){ + //因新增时已经校验了实例化是否可以成功，所以这块就不需要再做一次判断 + obj = MyClassLoader.getClassByScn(cgJavaValue).newInstance(); + }else if("spring".equals(cgJavaType)){ + obj = ApplicationContextUtil.getContext().getBean(cgJavaValue); + } + if(obj instanceof CgformEnhanceJavaInter){ + CgformEnhanceJavaInter javaInter = (CgformEnhanceJavaInter) obj; + javaInter.execute("tms_md_dz",data); + } + } catch (Exception e) { + e.printStackTrace(); + throw new Exception("执行JAVA增强出现异常！"); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/com/zzjee/tms/service/impl/TmsYwDingdanServiceImpl.java b/src/main/java/com/zzjee/tms/service/impl/TmsYwDingdanServiceImpl.java new file mode 100644 index 00000000..b93320dd --- /dev/null +++ b/src/main/java/com/zzjee/tms/service/impl/TmsYwDingdanServiceImpl.java @@ -0,0 +1,184 @@ +package com.zzjee.tms.service.impl; + +import com.zzjee.tms.entity.TmsYwDingdanEntity; +import com.zzjee.tms.service.TmsYwDingdanServiceI; +import org.jeecgframework.core.common.service.impl.CommonServiceImpl; +import org.jeecgframework.core.util.ApplicationContextUtil; +import org.jeecgframework.core.util.MyClassLoader; +import org.jeecgframework.core.util.StringUtil; +import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +@Service("tmsYwDingdanService") +@Transactional +public class TmsYwDingdanServiceImpl extends CommonServiceImpl implements TmsYwDingdanServiceI { + + + public void delete(TmsYwDingdanEntity entity) throws Exception{ + super.delete(entity); + //执行删除操作增强业务 + this.doDelBus(entity); + } + + public Serializable save(TmsYwDingdanEntity entity) throws Exception{ + Serializable t = super.save(entity); + //执行新增操作增强业务 + this.doAddBus(entity); + return t; + } + + public void saveOrUpdate(TmsYwDingdanEntity entity) throws Exception{ + super.saveOrUpdate(entity); + //执行更新操作增强业务 + this.doUpdateBus(entity); + } + + /** + * 新增操作增强业务 + * @param t + * @return + */ + private void doAddBus(TmsYwDingdanEntity t) throws Exception{ + //-----------------sql增强 start---------------------------- + //-----------------sql增强 end------------------------------ + + //-----------------java增强 start--------------------------- + //-----------------java增强 end----------------------------- + } + /** + * 更新操作增强业务 + * @param t + * @return + */ + private void doUpdateBus(TmsYwDingdanEntity t) throws Exception{ + //-----------------sql增强 start---------------------------- + //-----------------sql增强 end------------------------------ + + //-----------------java增强 start--------------------------- + //-----------------java增强 end----------------------------- + } + /** + * 删除操作增强业务 + * @param id + * @return + */ + private void doDelBus(TmsYwDingdanEntity t) throws Exception{ + //-----------------sql增强 start---------------------------- + //-----------------sql增强 end------------------------------ + + //-----------------java增强 start--------------------------- + //-----------------java增强 end----------------------------- + } + + private Map populationMap(TmsYwDingdanEntity t){ + Map map = new HashMap(); + map.put("id", t.getId()); + map.put("create_name", t.getCreateName()); + map.put("create_by", t.getCreateBy()); + map.put("create_date", t.getCreateDate()); + map.put("update_name", t.getUpdateName()); + map.put("update_by", t.getUpdateBy()); + map.put("update_date", t.getUpdateDate()); + map.put("sys_org_code", t.getSysOrgCode()); + map.put("sys_company_code", t.getSysCompanyCode()); + map.put("fadh", t.getFadh()); + map.put("username", t.getUsername()); + map.put("fahuoren", t.getFahuoren()); + map.put("fhrdh", t.getFhrdh()); + map.put("fhrdz", t.getFhrdz()); + map.put("shouhuoren", t.getShouhuoren()); + map.put("shrdh", t.getShrdh()); + map.put("chehao", t.getChehao()); + map.put("huowu", t.getHuowu()); + map.put("chang", t.getChang()); + map.put("kuan", t.getKuan()); + map.put("gao", t.getGao()); + map.put("tiji", t.getTiji()); + map.put("zhongl", t.getZhongl()); + map.put("daishouk", t.getDaishouk()); + map.put("dengtongzhi", t.getDengtongzhi()); + map.put("jiage", t.getJiage()); + map.put("xiadanfj", t.getXiadanfj()); + map.put("huidanfj", t.getHuidanfj()); + map.put("zhuangtai", t.getZhuangtai()); + map.put("xdrmz", t.getXdrmz()); + map.put("siji", t.getSiji()); + map.put("sdsj", t.getSdsj()); + map.put("yjsdsj", t.getYjsdsj()); + return map; + } + + /** + * 替换sql中的变量 + * @param sql + * @param t + * @return + */ + public String replaceVal(String sql,TmsYwDingdanEntity t){ + sql = sql.replace("#{id}",String.valueOf(t.getId())); + sql = sql.replace("#{create_name}",String.valueOf(t.getCreateName())); + sql = sql.replace("#{create_by}",String.valueOf(t.getCreateBy())); + sql = sql.replace("#{create_date}",String.valueOf(t.getCreateDate())); + sql = sql.replace("#{update_name}",String.valueOf(t.getUpdateName())); + sql = sql.replace("#{update_by}",String.valueOf(t.getUpdateBy())); + sql = sql.replace("#{update_date}",String.valueOf(t.getUpdateDate())); + sql = sql.replace("#{sys_org_code}",String.valueOf(t.getSysOrgCode())); + sql = sql.replace("#{sys_company_code}",String.valueOf(t.getSysCompanyCode())); + sql = sql.replace("#{fadh}",String.valueOf(t.getFadh())); + sql = sql.replace("#{username}",String.valueOf(t.getUsername())); + sql = sql.replace("#{fahuoren}",String.valueOf(t.getFahuoren())); + sql = sql.replace("#{fhrdh}",String.valueOf(t.getFhrdh())); + sql = sql.replace("#{fhrdz}",String.valueOf(t.getFhrdz())); + sql = sql.replace("#{shouhuoren}",String.valueOf(t.getShouhuoren())); + sql = sql.replace("#{shrdh}",String.valueOf(t.getShrdh())); + sql = sql.replace("#{chehao}",String.valueOf(t.getChehao())); + sql = sql.replace("#{huowu}",String.valueOf(t.getHuowu())); + sql = sql.replace("#{chang}",String.valueOf(t.getChang())); + sql = sql.replace("#{kuan}",String.valueOf(t.getKuan())); + sql = sql.replace("#{gao}",String.valueOf(t.getGao())); + sql = sql.replace("#{tiji}",String.valueOf(t.getTiji())); + sql = sql.replace("#{zhongl}",String.valueOf(t.getZhongl())); + sql = sql.replace("#{daishouk}",String.valueOf(t.getDaishouk())); + sql = sql.replace("#{dengtongzhi}",String.valueOf(t.getDengtongzhi())); + sql = sql.replace("#{jiage}",String.valueOf(t.getJiage())); + sql = sql.replace("#{xiadanfj}",String.valueOf(t.getXiadanfj())); + sql = sql.replace("#{huidanfj}",String.valueOf(t.getHuidanfj())); + sql = sql.replace("#{zhuangtai}",String.valueOf(t.getZhuangtai())); + sql = sql.replace("#{xdrmz}",String.valueOf(t.getXdrmz())); + sql = sql.replace("#{siji}",String.valueOf(t.getSiji())); + sql = sql.replace("#{sdsj}",String.valueOf(t.getSdsj())); + sql = sql.replace("#{yjsdsj}",String.valueOf(t.getYjsdsj())); + sql = sql.replace("#{UUID}",UUID.randomUUID().toString()); + return sql; + } + + /** + * 执行JAVA增强 + */ + private void executeJavaExtend(String cgJavaType,String cgJavaValue,Map data) throws Exception { + if(StringUtil.isNotEmpty(cgJavaValue)){ + Object obj = null; + try { + if("class".equals(cgJavaType)){ + //因新增时已经校验了实例化是否可以成功，所以这块就不需要再做一次判断 + obj = MyClassLoader.getClassByScn(cgJavaValue).newInstance(); + }else if("spring".equals(cgJavaType)){ + obj = ApplicationContextUtil.getContext().getBean(cgJavaValue); + } + if(obj instanceof CgformEnhanceJavaInter){ + CgformEnhanceJavaInter javaInter = (CgformEnhanceJavaInter) obj; + javaInter.execute("tms_yw_dingdan",data); + } + } catch (Exception e) { + e.printStackTrace(); + throw new Exception("执行JAVA增强出现异常！"); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/com/zzjee/tms/service/impl/VTmsDzServiceImpl.java b/src/main/java/com/zzjee/tms/service/impl/VTmsDzServiceImpl.java new file mode 100644 index 00000000..bfe0d413 --- /dev/null +++ b/src/main/java/com/zzjee/tms/service/impl/VTmsDzServiceImpl.java @@ -0,0 +1,122 @@ +package com.zzjee.tms.service.impl; + +import com.zzjee.tms.entity.VTmsDzEntity; +import com.zzjee.tms.service.VTmsDzServiceI; +import org.jeecgframework.core.common.service.impl.CommonServiceImpl; +import org.jeecgframework.core.util.ApplicationContextUtil; +import org.jeecgframework.core.util.MyClassLoader; +import org.jeecgframework.core.util.StringUtil; +import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +@Service("vTmsDzService") +@Transactional +public class VTmsDzServiceImpl extends CommonServiceImpl implements VTmsDzServiceI { + + + public void delete(VTmsDzEntity entity) throws Exception{ + super.delete(entity); + //执行删除操作增强业务 + this.doDelBus(entity); + } + + public Serializable save(VTmsDzEntity entity) throws Exception{ + Serializable t = super.save(entity); + //执行新增操作增强业务 + this.doAddBus(entity); + return t; + } + + public void saveOrUpdate(VTmsDzEntity entity) throws Exception{ + super.saveOrUpdate(entity); + //执行更新操作增强业务 + this.doUpdateBus(entity); + } + + /** + * 新增操作增强业务 + * @param t + * @return + */ + private void doAddBus(VTmsDzEntity t) throws Exception{ + //-----------------sql增强 start---------------------------- + //-----------------sql增强 end------------------------------ + + //-----------------java增强 start--------------------------- + //-----------------java增强 end----------------------------- + } + /** + * 更新操作增强业务 + * @param t + * @return + */ + private void doUpdateBus(VTmsDzEntity t) throws Exception{ + //-----------------sql增强 start---------------------------- + //-----------------sql增强 end------------------------------ + + //-----------------java增强 start--------------------------- + //-----------------java增强 end----------------------------- + } + /** + * 删除操作增强业务 + * @param id + * @return + */ + private void doDelBus(VTmsDzEntity t) throws Exception{ + //-----------------sql增强 start---------------------------- + //-----------------sql增强 end------------------------------ + + //-----------------java增强 start--------------------------- + //-----------------java增强 end----------------------------- + } + + private Map populationMap(VTmsDzEntity t){ + Map map = new HashMap(); + map.put("id", t.getId()); + map.put("dizhi", t.getDizhi()); + return map; + } + + /** + * 替换sql中的变量 + * @param sql + * @param t + * @return + */ + public String replaceVal(String sql,VTmsDzEntity t){ + sql = sql.replace("#{id}",String.valueOf(t.getId())); + sql = sql.replace("#{dizhi}",String.valueOf(t.getDizhi())); + sql = sql.replace("#{UUID}",UUID.randomUUID().toString()); + return sql; + } + + /** + * 执行JAVA增强 + */ + private void executeJavaExtend(String cgJavaType,String cgJavaValue,Map data) throws Exception { + if(StringUtil.isNotEmpty(cgJavaValue)){ + Object obj = null; + try { + if("class".equals(cgJavaType)){ + //因新增时已经校验了实例化是否可以成功，所以这块就不需要再做一次判断 + obj = MyClassLoader.getClassByScn(cgJavaValue).newInstance(); + }else if("spring".equals(cgJavaType)){ + obj = ApplicationContextUtil.getContext().getBean(cgJavaValue); + } + if(obj instanceof CgformEnhanceJavaInter){ + CgformEnhanceJavaInter javaInter = (CgformEnhanceJavaInter) obj; + javaInter.execute("v_tms_dz",data); + } + } catch (Exception e) { + e.printStackTrace(); + throw new Exception("执行JAVA增强出现异常！"); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/com/zzjee/tmsv/service/VYsddServiceI.java b/src/main/java/com/zzjee/tmsv/service/VYsddServiceI.java new file mode 100644 index 00000000..f5ef0488 --- /dev/null +++ b/src/main/java/com/zzjee/tmsv/service/VYsddServiceI.java @@ -0,0 +1,15 @@ +package com.zzjee.tmsv.service; +import com.zzjee.tmsv.entity.VYsddEntity; +import org.jeecgframework.core.common.service.CommonService; + +import java.io.Serializable; + +public interface VYsddServiceI extends CommonService { + + public void delete(VYsddEntity entity) throws Exception; + + public Serializable save(VYsddEntity entity) throws Exception; + + public void saveOrUpdate(VYsddEntity entity) throws Exception; + +} diff --git a/src/main/java/com/zzjee/tmsv/service/impl/VYsddServiceImpl.java b/src/main/java/com/zzjee/tmsv/service/impl/VYsddServiceImpl.java new file mode 100644 index 00000000..8b0b95ad --- /dev/null +++ b/src/main/java/com/zzjee/tmsv/service/impl/VYsddServiceImpl.java @@ -0,0 +1,156 @@ +package com.zzjee.tmsv.service.impl; + +import com.zzjee.tmsv.entity.VYsddEntity; +import com.zzjee.tmsv.service.VYsddServiceI; +import org.jeecgframework.core.common.service.impl.CommonServiceImpl; +import org.jeecgframework.core.util.ApplicationContextUtil; +import org.jeecgframework.core.util.MyClassLoader; +import org.jeecgframework.core.util.StringUtil; +import org.jeecgframework.web.cgform.enhance.CgformEnhanceJavaInter; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +@Service("vYsddService") +@Transactional +public class VYsddServiceImpl extends CommonServiceImpl implements VYsddServiceI { + + + public void delete(VYsddEntity entity) throws Exception{ + super.delete(entity); + //执行删除操作增强业务 + this.doDelBus(entity); + } + + public Serializable save(VYsddEntity entity) throws Exception{ + Serializable t = super.save(entity); + //执行新增操作增强业务 + this.doAddBus(entity); + return t; + } + + public void saveOrUpdate(VYsddEntity entity) throws Exception{ + super.saveOrUpdate(entity); + //执行更新操作增强业务 + this.doUpdateBus(entity); + } + + /** + * 新增操作增强业务 + * @param t + * @return + */ + private void doAddBus(VYsddEntity t) throws Exception{ + //-----------------sql增强 start---------------------------- + //-----------------sql增强 end------------------------------ + + //-----------------java增强 start--------------------------- + //-----------------java增强 end----------------------------- + } + /** + * 更新操作增强业务 + * @param t + * @return + */ + private void doUpdateBus(VYsddEntity t) throws Exception{ + //-----------------sql增强 start---------------------------- + //-----------------sql增强 end------------------------------ + + //-----------------java增强 start--------------------------- + //-----------------java增强 end----------------------------- + } + /** + * 删除操作增强业务 + * @param id + * @return + */ + private void doDelBus(VYsddEntity t) throws Exception{ + //-----------------sql增强 start---------------------------- + //-----------------sql增强 end------------------------------ + + //-----------------java增强 start--------------------------- + //-----------------java增强 end----------------------------- + } + + private Map populationMap(VYsddEntity t){ + Map map = new HashMap(); + map.put("id", t.getId()); + map.put("create_date", t.getCreateDate()); + map.put("fahuoren", t.getFahuoren()); + map.put("huowu", t.getHuowu()); + map.put("hwshjs", t.getHwshjs()); + map.put("zhongl", t.getZhongl()); + map.put("tiji", t.getTiji()); + map.put("shrdh", t.getShrdh()); + map.put("shouhuoren", t.getShouhuoren()); + map.put("hwshfs", t.getHwshfs()); + map.put("shrsj", t.getShrsj()); + map.put("daishouk", t.getDaishouk()); + map.put("hwyf", t.getHwyf()); + map.put("hwzfy", t.getHwzfy()); + map.put("hwxhf", t.getHwxhf()); + map.put("chehao", t.getChehao()); + map.put("zhuangtai", t.getZhuangtai()); + map.put("ywhdbz", t.getYwhdbz()); + map.put("sdsj", t.getSdsj()); + return map; + } + + /** + * 替换sql中的变量 + * @param sql + * @param t + * @return + */ + public String replaceVal(String sql,VYsddEntity t){ + sql = sql.replace("#{id}",String.valueOf(t.getId())); + sql = sql.replace("#{create_date}",String.valueOf(t.getCreateDate())); + sql = sql.replace("#{fahuoren}",String.valueOf(t.getFahuoren())); + sql = sql.replace("#{huowu}",String.valueOf(t.getHuowu())); + sql = sql.replace("#{hwshjs}",String.valueOf(t.getHwshjs())); + sql = sql.replace("#{zhongl}",String.valueOf(t.getZhongl())); + sql = sql.replace("#{tiji}",String.valueOf(t.getTiji())); + sql = sql.replace("#{shrdh}",String.valueOf(t.getShrdh())); + sql = sql.replace("#{shouhuoren}",String.valueOf(t.getShouhuoren())); + sql = sql.replace("#{hwshfs}",String.valueOf(t.getHwshfs())); + sql = sql.replace("#{shrsj}",String.valueOf(t.getShrsj())); + sql = sql.replace("#{daishouk}",String.valueOf(t.getDaishouk())); + sql = sql.replace("#{hwyf}",String.valueOf(t.getHwyf())); + sql = sql.replace("#{hwzfy}",String.valueOf(t.getHwzfy())); + sql = sql.replace("#{hwxhf}",String.valueOf(t.getHwxhf())); + sql = sql.replace("#{chehao}",String.valueOf(t.getChehao())); + sql = sql.replace("#{zhuangtai}",String.valueOf(t.getZhuangtai())); + sql = sql.replace("#{ywhdbz}",String.valueOf(t.getYwhdbz())); + sql = sql.replace("#{sdsj}",String.valueOf(t.getSdsj())); + sql = sql.replace("#{UUID}",UUID.randomUUID().toString()); + return sql; + } + + /** + * 执行JAVA增强 + */ + private void executeJavaExtend(String cgJavaType,String cgJavaValue,Map data) throws Exception { + if(StringUtil.isNotEmpty(cgJavaValue)){ + Object obj = null; + try { + if("class".equals(cgJavaType)){ + //因新增时已经校验了实例化是否可以成功，所以这块就不需要再做一次判断 + obj = MyClassLoader.getClassByScn(cgJavaValue).newInstance(); + }else if("spring".equals(cgJavaType)){ + obj = ApplicationContextUtil.getContext().getBean(cgJavaValue); + } + if(obj instanceof CgformEnhanceJavaInter){ + CgformEnhanceJavaInter javaInter = (CgformEnhanceJavaInter) obj; + javaInter.execute("v_ysdd",data); + } + } catch (Exception e) { + e.printStackTrace(); + throw new Exception("执行JAVA增强出现异常！"); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java index d5fc6583..729fb54c 100644 --- a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java +++ b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java @@ -1,6 +1,7 @@ package com.zzjee.wm.controller; import com.zzjee.api.ResultDO; import com.zzjee.md.entity.*; +import com.zzjee.tms.entity.TmsYwDingdanEntity; import com.zzjee.wm.entity.*; import com.zzjee.wm.page.*; import com.zzjee.wm.service.WmOmNoticeHServiceI; @@ -329,7 +330,129 @@ public class WmOmNoticeHController extends BaseController { } return new ModelAndView("com/zzjee/wm/print/jianhuorenwu-print"); } + @RequestMapping(params = "doPrintzhuisu") + public ModelAndView doPrintpzhuisu(String id,HttpServletRequest request) { + WmOmNoticeHEntity wmOmNoticeHEntity = wmOmNoticeHService.getEntity(WmOmNoticeHEntity.class, id); + wmOmNoticeHEntity.setPrintStatus("已打印"); + systemService.updateEntitie(wmOmNoticeHEntity); + request.setAttribute("wmOmNoticeHPage", wmOmNoticeHEntity); + request.setAttribute("kprq",DateUtils.date2Str(wmOmNoticeHEntity.getCreateDate(),DateUtils.date_sdf)); + request.setAttribute("comname", ResourceUtil.getConfigByName("comname")); + request.setAttribute("showlisturl", ResourceUtil.getConfigByName("show.noticeurl")+id); + if(StringUtil.isNotEmpty(wmOmNoticeHEntity.getImCusCode())){ + request.setAttribute("noticeid", wmOmNoticeHEntity.getImCusCode()); + }else{ + request.setAttribute("noticeid", wmOmNoticeHEntity.getOmNoticeId()); + } + + try{ + MdCusEntity mdcus = systemService.findUniqueByProperty(MdCusEntity.class,"keHuBianMa",wmOmNoticeHEntity.getCusCode()); + MdCusOtherEntity mdcusother = systemService.findUniqueByProperty(MdCusOtherEntity.class,"keHuBianMa",wmOmNoticeHEntity.getOcusCode()); + request.setAttribute("cusname",wmOmNoticeHEntity.getCusCode()+"-"+ mdcus.getZhongWenQch()); + if(mdcusother!=null){ + request.setAttribute("ocusname",wmOmNoticeHEntity.getOcusCode()+"-"+ mdcusother.getZhongWenQch()); + }else{ + request.setAttribute("ocusname",wmOmNoticeHEntity.getOcusCode()); + } + + }catch (Exception e){ + + } + //获取参数 + Object id0 = wmOmNoticeHEntity.getOmNoticeId(); + //=================================================================================== + //查询-产品 + String hql0 = "from WmOmQmIEntity where 1 = 1 AND omNoticeId = ? order by binId"; + Double tomsum = 0.00; + Double noticesum = 0.00; + Double tijisum = 0.00; + Double zhlsum = 0.00; + try{ + List wmOmQmIEntityList = systemService.findHql(hql0, id0);//获取行项目 + List wmOmQmIEntityListnew = new ArrayList<>(); + DecimalFormat dfsum=new DecimalFormat(".##"); + String filepath = ResourceUtil.getConfigByName("webUploadpath"); + String goodsurl = ResourceUtil.getConfigByName("show.goodsurl"); + + try{ + for(WmOmQmIEntity tom:wmOmQmIEntityList){ + try{ + QRcodeUtil.encode(goodsurl+tom.getId(),filepath+ File.separator + tom.getId()+".png"); + System.out.println(goodsurl+tom.getId()); + }catch (Exception e){ + + } + tomsum = tomsum + Double.parseDouble(tom.getBaseGoodscount()); + try{ + tijisum = tijisum + Double.parseDouble(tom.getTinTj()); + + }catch ( Exception e){ + } + try{ + zhlsum = zhlsum + Double.parseDouble(tom.getTinZhl()); + }catch ( Exception e){ + } + try{ + tom.setTinZhl(dfsum.format(Double.parseDouble(tom.getTinZhl()))); + }catch ( Exception e){ + } + try{ + tom.setTinTj(dfsum.format(Double.parseDouble(tom.getTinTj()))); + }catch ( Exception e){ + } + tom.setBaseGoodscount(StringUtil.getdouble(tom.getBaseGoodscount())); + try{ + MvGoodsEntity mvgoods = systemService.findUniqueByProperty( + MvGoodsEntity.class, "goodsCode", tom.getGoodsId()); + if (mvgoods != null) { + tom.setShpGuiGe(mvgoods.getShpGuiGe()); + } + int shpguige = 0; + try{ + shpguige = Integer.parseInt(mvgoods.getShpGuiGe()); + }catch (Exception e){ + } + if(shpguige!=0){ + Double xianhshu = Math.floor(Double.parseDouble(tom.getBaseGoodscount())/shpguige); + Double jianshu = Double.parseDouble(tom.getBaseGoodscount())%shpguige; + long xiangshuint = Math.round(xianhshu); + if(xianhshu > 0){ + tom.setPickNotice(xiangshuint+"整"+jianshu+tom.getBaseUnit()); + }else{ + tom.setPickNotice(tom.getBaseGoodscount()+tom.getBaseUnit()); + } + } + }catch (Exception e){ + } + wmOmQmIEntityListnew.add(tom); + } + }catch ( Exception e){ + } + String hqlnotice = "from WmOmNoticeIEntity where 1 = 1 AND oM_NOTICE_ID = ? "; + List wmOmNoticeIEntityList = systemService.findHql(hqlnotice,id0); + for(WmOmNoticeIEntity tnotice:wmOmNoticeIEntityList){ + noticesum = noticesum + Double.parseDouble(tnotice.getBaseGoodscount()); + } + if(Double.doubleToLongBits(noticesum) != Double.doubleToLongBits(tomsum)){ + request.setAttribute("jianhuoremark", "订单："+dfsum.format(noticesum)+" 拣货："+dfsum.format(tomsum)); + }else{ + request.setAttribute("jianhuoremark", "全部拣货，共"+dfsum.format(noticesum)); + } + String tijiunit="立方分米"; + String zhongliangunit="公斤"; + try{ + tijiunit= ResourceUtil.getConfigByName("tijiunit"); + zhongliangunit=ResourceUtil.getConfigByName("zhongliangunit"); + }catch (Exception e){ + } + request.setAttribute("tijisum", dfsum.format(tijisum)+tijiunit); + request.setAttribute("zhlsum", dfsum.format(zhlsum)+zhongliangunit); + request.setAttribute("wmOmQmIList", wmOmQmIEntityList); + }catch (Exception e){ + } + return new ModelAndView("com/zzjee/wm/print/jianhuorenwuzhuisu"); + } @RequestMapping(params = "showlist") public ModelAndView showlist(String id,HttpServletRequest request) { WmOmNoticeHEntity wmOmNoticeHEntity = wmOmNoticeHService.getEntity(WmOmNoticeHEntity.class, id); @@ -435,6 +558,52 @@ public class WmOmNoticeHController extends BaseController { } return new ModelAndView("com/zzjee/wm/print/zhuisu-print"); } + + + @RequestMapping(params = "showgoods") + public ModelAndView showgoods(String id,HttpServletRequest request) { + WmOmQmIEntity wmOmQmIEntity = wmOmNoticeHService.getEntity(WmOmQmIEntity.class, id); + request.setAttribute("wmOmQmIEntity", wmOmQmIEntity); + request.setAttribute("comname", ResourceUtil.getConfigByName("comname")); + + System.out.println(id); + + try{ + MdCusEntity mdcus = systemService.findUniqueByProperty(MdCusEntity.class,"keHuBianMa",wmOmQmIEntity.getCusCode()); + request.setAttribute("cusname",wmOmQmIEntity.getCusCode()+"-"+ mdcus.getZhongWenQch()); + mdcus.setZuZhiJiGou(mdcus.getZuZhiJiGou().replace(",","")); + + request.setAttribute("MdCusEntity",mdcus); + + + }catch (Exception e){ + + } + //获取参数 + Object goodsid = wmOmQmIEntity.getGoodsId(); + Object goodspro = wmOmQmIEntity.getProData(); + + //=================================================================================== + //查询-产品 + String hql0 = "from WmInQmIEntity where proData = ? AND goodsId = ? order by createDate "; + String hql1 = "from WmImNoticeHEntity where noticeId = ? order by createDate "; + try{ + List WmInQmIEntityList = systemService.findHql(hql0, goodspro,goodsid);//获取行项目 + if(WmInQmIEntityList!=null&&WmInQmIEntityList.size()>0){ + String imnoticeid = WmInQmIEntityList.get(0).getImNoticeId(); + List WmImNoticeHEntityList = systemService.findHql(hql1, imnoticeid);//获取行项目 + if(WmInQmIEntityList!=null&&WmInQmIEntityList.size()>0) { + WmImNoticeHEntity wmImNoticeHEntity = WmImNoticeHEntityList.get(0); + wmImNoticeHEntity.setFuJian(wmImNoticeHEntity.getFuJian().replace(",","")); + request.setAttribute("wmimnoticeh",wmImNoticeHEntity); + } + } + }catch ( Exception e){ + } + + return new ModelAndView("com/zzjee/wm/print/zhuisuitem-print"); + } + // /** * easyui AJAX请求数据 @@ -724,6 +893,8 @@ public class WmOmNoticeHController extends BaseController { wmOmNoticeH.setCusCode(wmUtil.getCusCode()); } } + + List wmomNoticeIListnew = new ArrayList(); for (WmOmNoticeIEntity wmomNoticeIEntity : wmOmNoticeIList) { if(!StringUtil.isEmpty(wmomNoticeIEntity.getGoodsId())){ @@ -745,6 +916,9 @@ public class WmOmNoticeHController extends BaseController { } } wmOmNoticeHService.addMain(wmOmNoticeH, wmomNoticeIListnew); + + + Map map = new HashMap(); map.put("id", wmOmNoticeH.getOmNoticeId()); try { @@ -1476,7 +1650,7 @@ public class WmOmNoticeHController extends BaseController { try{ if("hr".equals(ResourceUtil.getConfigByName("wm.ckd"))){ // String[] columnNames1 = { "序号", "商品编码", "商品名称", "生产日期", "品质","箱数", "拆零数", "毛重/KG","库存","备注" }; - String[] columnNames1 = { "序号", "商品编码", "商品名称", "生产日期", "品质","箱数", "拆零数", "毛重/KG","体积/cm³","备注" }; + String[] columnNames1 = { "序号", "商品编码", "商品名称", "生产日期", "品质","箱数", "拆零数", "毛重/KG","库存","备注" }; columnNames = columnNames1; } @@ -1590,7 +1764,7 @@ public class WmOmNoticeHController extends BaseController { try{ if("hr".equals(ResourceUtil.getConfigByName("wm.ckd"))) { try{ -// cell9.setCellValue(wmUtil.getstock(result.get(i).get("goods_id").toString())); + cell9.setCellValue(wmUtil.getstock(result.get(i).get("goods_id").toString())); }catch (Exception e){ } diff --git a/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java index bd27dce3..146bf204 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java @@ -1,5 +1,7 @@ package com.zzjee.wm.service.impl; +import com.zzjee.md.entity.MdCusEntity; import com.zzjee.md.entity.MvGoodsEntity; +import com.zzjee.tms.entity.TmsYwDingdanEntity; import com.zzjee.wm.service.WmOmNoticeHServiceI; import org.jeecgframework.core.common.service.impl.CommonServiceImpl; @@ -7,6 +9,7 @@ import org.jeecgframework.core.common.service.impl.CommonServiceImpl; import com.zzjee.wm.entity.WmOmNoticeHEntity; import com.zzjee.wm.entity.WmOmNoticeIEntity; +import org.jeecgframework.core.util.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -14,9 +17,6 @@ import java.util.List; import org.jeecgframework.core.common.exception.BusinessException; import org.jeecgframework.core.common.service.impl.CommonServiceImpl; -import org.jeecgframework.core.util.MyBeanUtils; -import org.jeecgframework.core.util.StringUtil; -import org.jeecgframework.core.util.oConvertUtils; import java.util.ArrayList; import java.util.UUID; @@ -37,7 +37,13 @@ public class WmOmNoticeHServiceImpl extends CommonServiceImpl implements WmOmNot List wmOmNoticeIList){ //保存主信息 this.save(wmOmNoticeH); - + Double jishu = 0.00; + Double tiji=0.00; + Double zhongl = 0.00; + Double chang = 0.00; + Double kuan = 0.00; + Double gao = 0.00; + String huowu = ""; /**保存-出货商品明细*/ for(WmOmNoticeIEntity wmOmNoticeI:wmOmNoticeIList){ //外键设置 @@ -45,6 +51,7 @@ public class WmOmNoticeHServiceImpl extends CommonServiceImpl implements WmOmNot MvGoodsEntity mvgoods = new MvGoodsEntity(); mvgoods = this.findUniqueByProperty(MvGoodsEntity.class, "goodsCode", wmOmNoticeI.getGoodsId()) ; if(mvgoods!=null){ + huowu=huowu+mvgoods.getGoodsName(); wmOmNoticeI.setGoodsName(mvgoods.getGoodsName()); try{ wmOmNoticeI.setBaseUnit(mvgoods.getBaseunit()); @@ -54,6 +61,16 @@ public class WmOmNoticeHServiceImpl extends CommonServiceImpl implements WmOmNot }else{ wmOmNoticeI.setBaseGoodscount(wmOmNoticeI.getGoodsQua()); } + try{ + tiji= tiji+ Double.parseDouble(wmOmNoticeI.getBaseGoodscount())*Double.parseDouble(mvgoods.getTiJiCm()); + zhongl= zhongl+ Double.parseDouble(wmOmNoticeI.getBaseGoodscount())*Double.parseDouble(mvgoods.getZhlKg()); +// chang= chang+ Double.parseDouble(wmOmNoticeI.getBaseGoodscount())*Double.parseDouble(mvgoods.get()); +// kuan= kuan+ Double.parseDouble(wmOmNoticeI.getBaseGoodscount())*Double.parseDouble(mvgoods.getZhlKg()); +// gao= gao+ Double.parseDouble(wmOmNoticeI.getBaseGoodscount())*Double.parseDouble(mvgoods.getZhlKg()); + + jishu = jishu + Double.parseDouble(wmOmNoticeI.getBaseGoodscount()); + }catch (Exception e){ + } }catch (Exception e){ } @@ -68,6 +85,37 @@ public class WmOmNoticeHServiceImpl extends CommonServiceImpl implements WmOmNot wmOmNoticeI.setOmBeizhu(wmOmNoticeH.getOmBeizhu()); this.save(wmOmNoticeI); } + + if("yes".equals(ResourceUtil.getConfigByName("wms.totms"))){ + try{ + TmsYwDingdanEntity tmsYwDingdanEntity = new TmsYwDingdanEntity(); + MdCusEntity mdcus = this.findUniqueByProperty(MdCusEntity.class,"keHuBianMa",wmOmNoticeH.getCusCode()); + tmsYwDingdanEntity.setHwshjs(jishu.toString()); + tmsYwDingdanEntity.setTiji(tiji.toString()); + tmsYwDingdanEntity.setZhongl(zhongl.toString()); + tmsYwDingdanEntity.setChang(chang.toString()); + tmsYwDingdanEntity.setKuan(kuan.toString()); + tmsYwDingdanEntity.setGao(gao.toString()); + tmsYwDingdanEntity.setHuowu(huowu); + tmsYwDingdanEntity.setCreateDate(DateUtils.getDate()); + tmsYwDingdanEntity.setUsername(mdcus.getKeHuBianMa()); + tmsYwDingdanEntity.setFahuoren(mdcus.getZhongWenQch()); + tmsYwDingdanEntity.setFhrdh(mdcus.getDianHua()); + tmsYwDingdanEntity.setFhrdz(mdcus.getDiZhi()); + tmsYwDingdanEntity.setSiji(wmOmNoticeH.getReCarno());//司机 + tmsYwDingdanEntity.setShouhuoren(wmOmNoticeH.getDelvMember()); + tmsYwDingdanEntity.setShrdh(wmOmNoticeH.getDelvAddr()); + tmsYwDingdanEntity.setShrsj(wmOmNoticeH.getDelvMobile()); + tmsYwDingdanEntity.setYwddbz(wmOmNoticeH.getOmBeizhu()); + tmsYwDingdanEntity.setYwkhdh(wmOmNoticeH.getOmNoticeId()); + tmsYwDingdanEntity.setZhuangtai("已下单"); + this.save(tmsYwDingdanEntity); + }catch (Exception e){ + + } + + } + //执行新增操作配置的sql增强 this.doAddSql(wmOmNoticeH); } diff --git a/src/main/java/com/zzjee/wmutil/wmUtil.java b/src/main/java/com/zzjee/wmutil/wmUtil.java index 4cd4852b..da934dc2 100644 --- a/src/main/java/com/zzjee/wmutil/wmUtil.java +++ b/src/main/java/com/zzjee/wmutil/wmUtil.java @@ -462,4 +462,5 @@ public class wmUtil { return flag; } + } diff --git a/src/main/java/org/jeecgframework/core/util/ResourceUtil.java b/src/main/java/org/jeecgframework/core/util/ResourceUtil.java index 54022545..ba5d510a 100644 --- a/src/main/java/org/jeecgframework/core/util/ResourceUtil.java +++ b/src/main/java/org/jeecgframework/core/util/ResourceUtil.java @@ -86,6 +86,23 @@ public class ResourceUtil { return null; } + public static final TSUser getSessionUser() { + HttpSession session = ContextHolderUtils.getSession(); + if(ClientManager.getInstance().getClient(session.getId())!=null){ + return ClientManager.getInstance().getClient(session.getId()).getUser(); + //update-begin--update---author:scott-----------date:20151218-------for:解决分布式登录问题------- + }else{ + TSUser u = (TSUser) session.getAttribute(ResourceUtil.LOCAL_CLINET_USER); + Client client = new Client(); + client.setIp(""); + client.setLogindatetime(new Date()); + client.setUser(u); + ClientManager.getInstance().addClinet(session.getId(), client); + } + //update-end--update---author:scott-----------date:20151218-------for:解决分布式登录问题------- + return null; + } + @Deprecated public static final List getSessionTSRoleFunction(String roleId) { HttpSession session = ContextHolderUtils.getSession(); diff --git a/src/main/java/org/jeecgframework/jwt/util/ResponseMessage.java b/src/main/java/org/jeecgframework/jwt/util/ResponseMessage.java new file mode 100644 index 00000000..0c6287dd --- /dev/null +++ b/src/main/java/org/jeecgframework/jwt/util/ResponseMessage.java @@ -0,0 +1,59 @@ +package org.jeecgframework.jwt.util; + +import org.jeecgframework.jwt.util.menu.ResponseMessageCodeEnum; + +/** + * restful 接口响应返回结构 + * @author scott + * @param + */ +public class ResponseMessage { + + private String respCode; + private String respMsg; + private T data; + private boolean ok; + + public ResponseMessage() { + } + + public ResponseMessage(ResponseMessageCodeEnum codeEnum, String message) { + this.respCode = codeEnum.getCode(); + this.respMsg = message; + } + + public ResponseMessage(ResponseMessageCodeEnum codeEnum, String message, boolean ok, T data) { + this.respCode = codeEnum.getCode(); + this.respMsg = message; + this.ok = ok; + this.data = data; + } + + public String getRespCode() { + return respCode; + } + + public void setRespCode(String respCode) { + this.respCode = respCode; + } + + public String getMessage() { + return respMsg; + } + + public void setMessage(String message) { + this.respMsg = message; + } + + public T getData() { + return data; + } + + public void setData(T data) { + this.data = data; + } + + public boolean isOk() { + return ok; + } +} diff --git a/src/main/java/org/jeecgframework/jwt/util/Result.java b/src/main/java/org/jeecgframework/jwt/util/Result.java new file mode 100644 index 00000000..962cd25c --- /dev/null +++ b/src/main/java/org/jeecgframework/jwt/util/Result.java @@ -0,0 +1,55 @@ +package org.jeecgframework.jwt.util; + +import org.jeecgframework.jwt.util.menu.ResponseMessageCodeEnum; + +/** + * restful 接口响应返回结果工具类 + * @author scott + * + */ +public class Result { + + private static final ResponseMessage RESPONSE_MESSAGE_SUCCESS = new ResponseMessage(ResponseMessageCodeEnum.SUCCESS, "成功",true,null); + + public static ResponseMessage success() { + return RESPONSE_MESSAGE_SUCCESS; + } + + public static ResponseMessage success(T t) { + return new ResponseMessage(ResponseMessageCodeEnum.SUCCESS, "成功", true, t); + } + + public static ResponseMessage success(ResponseMessageCodeEnum codeEnum, T t) { + return new ResponseMessage(codeEnum, "", true, t); + } + + public static ResponseMessage success(ResponseMessageCodeEnum codeEnum, String message, T t) { + return new ResponseMessage(codeEnum, message, true, t); + } + + public static ResponseMessage error() { + return error("失败"); + } + + public static ResponseMessage error(String message) { + return error(ResponseMessageCodeEnum.ERROR, message); + } + + public static ResponseMessage error(ResponseMessageCodeEnum codeEnum, String message) { + return error(codeEnum, message, null); + } + + public static ResponseMessage error(ResponseMessageCodeEnum codeEnum, String message, T t) { + return new ResponseMessage(codeEnum, message, false, t); + } + + /** + * 校验失败错误结果 + * @param + * @param t + * @return + */ + public static ResponseMessage errorValid(T t) { + return new ResponseMessage(ResponseMessageCodeEnum.VALID_ERROR, "校验失败", false, t); + } +} diff --git a/src/main/java/org/jeecgframework/jwt/util/menu/ResponseMessageCodeEnum.java b/src/main/java/org/jeecgframework/jwt/util/menu/ResponseMessageCodeEnum.java new file mode 100644 index 00000000..f00af0ee --- /dev/null +++ b/src/main/java/org/jeecgframework/jwt/util/menu/ResponseMessageCodeEnum.java @@ -0,0 +1,30 @@ +package org.jeecgframework.jwt.util.menu; + +/** + * 接口返回状态码 + * @author scott + * + */ +public enum ResponseMessageCodeEnum { + + SUCCESS("0"), + ERROR("-1"), + VALID_ERROR("1000"),//校验失败 + SAVE_SUCCESS("r0001"), + UPDATE_SUCCESS("r0002"), + REMOVE_SUCCESS("r0003"); + + private String code; + + ResponseMessageCodeEnum(String code) { + this.code = code; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } +} diff --git a/src/main/java/org/jeecgframework/web/system/pojo/base/TSUser.java b/src/main/java/org/jeecgframework/web/system/pojo/base/TSUser.java index de93b2e6..83dae0d9 100644 --- a/src/main/java/org/jeecgframework/web/system/pojo/base/TSUser.java +++ b/src/main/java/org/jeecgframework/web/system/pojo/base/TSUser.java @@ -27,6 +27,8 @@ public class TSUser extends TSBaseUser implements java.io.Serializable { @Excel(name = "邮箱") private String email;// 邮箱 /**创建时间*/ + private String userType;//用户类型 1:系统用户 \2接口用户 3 公司权限 4 当前用户 + private java.util.Date createDate; /**创建人ID*/ private java.lang.String createBy; @@ -38,6 +40,18 @@ public class TSUser extends TSBaseUser implements java.io.Serializable { private java.lang.String updateBy; /**修改人名称*/ private java.lang.String updateName; + + + @Column(name = "user_type") + public String getUserType() { + return userType; + } + + public void setUserType(String userType) { + this.userType = userType; + } + + @Column(name = "signatureFile", length = 100) public String getSignatureFile() { return this.signatureFile; diff --git a/src/main/resources/spring-mvc.xml b/src/main/resources/spring-mvc.xml index 13a5c444..52b18a0b 100644 --- a/src/main/resources/spring-mvc.xml +++ b/src/main/resources/spring-mvc.xml @@ -135,7 +135,7 @@ - + systemController/showOrDownByurl.do wmOmNoticeHController.do diff --git a/src/main/resources/sysConfig.properties b/src/main/resources/sysConfig.properties index 09b738a1..80fdd68b 100644 --- a/src/main/resources/sysConfig.properties +++ b/src/main/resources/sysConfig.properties @@ -7,7 +7,7 @@ templatepath=docTemp timerun=run uploadpath=upload -webUploadpath=D://upFiles +webUploadpath=C://upFiles showAndDownUrl=systemController/showOrDownByurl.do?dbPath= office_home=D://OpenOffice @@ -204,8 +204,10 @@ wm.ckd=hr wm.rkd=hr -show.noticeurl=http://localhost:8081/zzjee/wmOmNoticeHController.do?showlist&id= -show.goodsurl=http://localhost:8081/zzjee/wmOmNoticeHController.do?showgoods& +show.noticeurl=http://120.78.150.43/wmstest/wmOmNoticeHController.do?showlist&id= +show.goodsurl=http://120.78.150.43/wmstest/wmOmNoticeHController.do?showgoods&id= + +wms.totms=yes diff --git a/src/main/webapp/webpage/com/zzjee/md/mdCus-add.jsp b/src/main/webapp/webpage/com/zzjee/md/mdCus-add.jsp index 8d264277..68a74be6 100644 --- a/src/main/webapp/webpage/com/zzjee/md/mdCus-add.jsp +++ b/src/main/webapp/webpage/com/zzjee/md/mdCus-add.jsp @@ -230,8 +230,17 @@ - - +
+
+ 附件： +
+
+ + + + +
+
- +
+
+ 附件： +
+
+ + + + + + + +
+