From 2172905e93bdfb797c9c07b4653f609fc9d16070 Mon Sep 17 00:00:00 2001 From: jiasudu Date: Tue, 28 May 2019 17:12:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RpWmHisStockKuController.java | 65 ++++------ .../report/controller/RpWmInQmController.java | 65 ++++------ .../controller/RpWmToDownGoodsController.java | 64 ++++------ .../controller/RpWmToUpGoodsController.java | 64 ++++------ .../controller/RpWmUpAndDownController.java | 64 ++++------ .../wm/controller/WmPlatIoController.java | 72 ++++------- .../wm/controller/WmSttInGoodsController.java | 62 +++++----- .../controller/WmToMoveGoodsController.java | 108 +++++++--------- .../wm/controller/WmToUpGoodsController.java | 115 ++++++++---------- .../controller/WvGiNoticeController.java | 77 +++++------- .../wmapi/controller/WvNoticeController.java | 77 +++++------- 11 files changed, 338 insertions(+), 495 deletions(-) diff --git a/src/main/java/com/zzjee/report/controller/RpWmHisStockKuController.java b/src/main/java/com/zzjee/report/controller/RpWmHisStockKuController.java index 9ccb9871..8eddae0b 100644 --- a/src/main/java/com/zzjee/report/controller/RpWmHisStockKuController.java +++ b/src/main/java/com/zzjee/report/controller/RpWmHisStockKuController.java @@ -1,70 +1,55 @@ package com.zzjee.report.controller; -import com.zzjee.report.entity.RpWmHisStockKuEntity; -import com.zzjee.report.service.RpWmHisStockKuServiceI; +import java.io.IOException; +import java.net.URI; import java.util.ArrayList; import java.util.List; -import java.text.SimpleDateFormat; +import java.util.Map; +import java.util.Set; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.validation.ConstraintViolation; +import javax.validation.Validator; import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.ModelAndView; - +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.common.TreeChildCount; 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.StringUtil; -import org.jeecgframework.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.pojo.base.TSDepart; -import org.jeecgframework.web.system.service.SystemService; +import org.jeecgframework.core.util.ExceptionUtil; import org.jeecgframework.core.util.MyBeanUtils; - -import java.io.OutputStream; -import org.jeecgframework.core.util.BrowserUtils; -import org.jeecgframework.poi.excel.ExcelExportUtil; +import org.jeecgframework.core.util.ResourceUtil; +import org.jeecgframework.core.util.StringUtil; 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.TemplateExportParams; import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.vo.TemplateExcelConstants; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.jeecgframework.core.util.ResourceUtil; -import java.io.IOException; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import java.util.Map; -import java.util.HashMap; -import org.jeecgframework.core.util.ExceptionUtil; - +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.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.jeecgframework.core.beanvalidator.BeanValidators; -import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import java.net.URI; -import org.springframework.http.MediaType; +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 com.zzjee.report.entity.RpWmHisStockKuEntity; +import com.zzjee.report.service.RpWmHisStockKuServiceI; + /** * @Title: Controller * @Description: rp_wm_his_stock_ku @@ -302,7 +287,7 @@ public class RpWmHisStockKuController extends BaseController { return NormalExcelConstants.JEECG_EXCEL_VIEW; } - @SuppressWarnings("unchecked") + //@SuppressWarnings("unchecked") @RequestMapping(params = "importExcel", method = RequestMethod.POST) @ResponseBody public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/src/main/java/com/zzjee/report/controller/RpWmInQmController.java b/src/main/java/com/zzjee/report/controller/RpWmInQmController.java index fc469ea3..8b139552 100644 --- a/src/main/java/com/zzjee/report/controller/RpWmInQmController.java +++ b/src/main/java/com/zzjee/report/controller/RpWmInQmController.java @@ -1,70 +1,55 @@ package com.zzjee.report.controller; -import com.zzjee.report.entity.RpWmInQmEntity; -import com.zzjee.report.service.RpWmInQmServiceI; +import java.io.IOException; +import java.net.URI; import java.util.ArrayList; import java.util.List; -import java.text.SimpleDateFormat; +import java.util.Map; +import java.util.Set; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.validation.ConstraintViolation; +import javax.validation.Validator; import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.ModelAndView; - +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.common.TreeChildCount; 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.StringUtil; -import org.jeecgframework.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.pojo.base.TSDepart; -import org.jeecgframework.web.system.service.SystemService; +import org.jeecgframework.core.util.ExceptionUtil; import org.jeecgframework.core.util.MyBeanUtils; - -import java.io.OutputStream; -import org.jeecgframework.core.util.BrowserUtils; -import org.jeecgframework.poi.excel.ExcelExportUtil; +import org.jeecgframework.core.util.ResourceUtil; +import org.jeecgframework.core.util.StringUtil; 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.TemplateExportParams; import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.vo.TemplateExcelConstants; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.jeecgframework.core.util.ResourceUtil; -import java.io.IOException; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import java.util.Map; -import java.util.HashMap; -import org.jeecgframework.core.util.ExceptionUtil; - +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.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.jeecgframework.core.beanvalidator.BeanValidators; -import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import java.net.URI; -import org.springframework.http.MediaType; +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 com.zzjee.report.entity.RpWmInQmEntity; +import com.zzjee.report.service.RpWmInQmServiceI; + /** * @Title: Controller * @Description: rp_wm_in_qm @@ -302,7 +287,7 @@ public class RpWmInQmController extends BaseController { return NormalExcelConstants.JEECG_EXCEL_VIEW; } - @SuppressWarnings("unchecked") +// @SuppressWarnings("unchecked") @RequestMapping(params = "importExcel", method = RequestMethod.POST) @ResponseBody public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/src/main/java/com/zzjee/report/controller/RpWmToDownGoodsController.java b/src/main/java/com/zzjee/report/controller/RpWmToDownGoodsController.java index 59191e67..583f489b 100644 --- a/src/main/java/com/zzjee/report/controller/RpWmToDownGoodsController.java +++ b/src/main/java/com/zzjee/report/controller/RpWmToDownGoodsController.java @@ -1,70 +1,55 @@ package com.zzjee.report.controller; -import com.zzjee.report.entity.RpWmToDownGoodsEntity; -import com.zzjee.report.service.RpWmToDownGoodsServiceI; +import java.io.IOException; +import java.net.URI; import java.util.ArrayList; import java.util.List; -import java.text.SimpleDateFormat; +import java.util.Map; +import java.util.Set; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.validation.ConstraintViolation; +import javax.validation.Validator; import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.ModelAndView; - +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.common.TreeChildCount; 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.StringUtil; -import org.jeecgframework.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.pojo.base.TSDepart; -import org.jeecgframework.web.system.service.SystemService; +import org.jeecgframework.core.util.ExceptionUtil; import org.jeecgframework.core.util.MyBeanUtils; - -import java.io.OutputStream; -import org.jeecgframework.core.util.BrowserUtils; -import org.jeecgframework.poi.excel.ExcelExportUtil; +import org.jeecgframework.core.util.ResourceUtil; +import org.jeecgframework.core.util.StringUtil; 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.TemplateExportParams; import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.vo.TemplateExcelConstants; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.jeecgframework.core.util.ResourceUtil; -import java.io.IOException; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import java.util.Map; -import java.util.HashMap; -import org.jeecgframework.core.util.ExceptionUtil; - +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.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.jeecgframework.core.beanvalidator.BeanValidators; -import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import java.net.URI; -import org.springframework.http.MediaType; +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 com.zzjee.report.entity.RpWmToDownGoodsEntity; +import com.zzjee.report.service.RpWmToDownGoodsServiceI; + /** * @Title: Controller * @Description: rp_wm_to_down_goods @@ -302,7 +287,6 @@ public class RpWmToDownGoodsController extends BaseController { return NormalExcelConstants.JEECG_EXCEL_VIEW; } - @SuppressWarnings("unchecked") @RequestMapping(params = "importExcel", method = RequestMethod.POST) @ResponseBody public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/src/main/java/com/zzjee/report/controller/RpWmToUpGoodsController.java b/src/main/java/com/zzjee/report/controller/RpWmToUpGoodsController.java index 4c0c07c7..5982f9e6 100644 --- a/src/main/java/com/zzjee/report/controller/RpWmToUpGoodsController.java +++ b/src/main/java/com/zzjee/report/controller/RpWmToUpGoodsController.java @@ -1,70 +1,55 @@ package com.zzjee.report.controller; -import com.zzjee.report.entity.RpWmToUpGoodsEntity; -import com.zzjee.report.service.RpWmToUpGoodsServiceI; +import java.io.IOException; +import java.net.URI; import java.util.ArrayList; import java.util.List; -import java.text.SimpleDateFormat; +import java.util.Map; +import java.util.Set; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.validation.ConstraintViolation; +import javax.validation.Validator; import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.ModelAndView; - +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.common.TreeChildCount; 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.StringUtil; -import org.jeecgframework.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.pojo.base.TSDepart; -import org.jeecgframework.web.system.service.SystemService; +import org.jeecgframework.core.util.ExceptionUtil; import org.jeecgframework.core.util.MyBeanUtils; - -import java.io.OutputStream; -import org.jeecgframework.core.util.BrowserUtils; -import org.jeecgframework.poi.excel.ExcelExportUtil; +import org.jeecgframework.core.util.ResourceUtil; +import org.jeecgframework.core.util.StringUtil; 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.TemplateExportParams; import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.vo.TemplateExcelConstants; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.jeecgframework.core.util.ResourceUtil; -import java.io.IOException; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import java.util.Map; -import java.util.HashMap; -import org.jeecgframework.core.util.ExceptionUtil; - +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.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.jeecgframework.core.beanvalidator.BeanValidators; -import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import java.net.URI; -import org.springframework.http.MediaType; +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 com.zzjee.report.entity.RpWmToUpGoodsEntity; +import com.zzjee.report.service.RpWmToUpGoodsServiceI; + /** * @Title: Controller * @Description: rp_wm_to_up_goods @@ -302,7 +287,6 @@ public class RpWmToUpGoodsController extends BaseController { return NormalExcelConstants.JEECG_EXCEL_VIEW; } - @SuppressWarnings("unchecked") @RequestMapping(params = "importExcel", method = RequestMethod.POST) @ResponseBody public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/src/main/java/com/zzjee/report/controller/RpWmUpAndDownController.java b/src/main/java/com/zzjee/report/controller/RpWmUpAndDownController.java index 005f119a..7cfa1181 100644 --- a/src/main/java/com/zzjee/report/controller/RpWmUpAndDownController.java +++ b/src/main/java/com/zzjee/report/controller/RpWmUpAndDownController.java @@ -1,70 +1,55 @@ package com.zzjee.report.controller; -import com.zzjee.report.entity.RpWmUpAndDownEntity; -import com.zzjee.report.service.RpWmUpAndDownServiceI; +import java.io.IOException; +import java.net.URI; import java.util.ArrayList; import java.util.List; -import java.text.SimpleDateFormat; +import java.util.Map; +import java.util.Set; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.validation.ConstraintViolation; +import javax.validation.Validator; import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.ModelAndView; - +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.common.TreeChildCount; 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.StringUtil; -import org.jeecgframework.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.pojo.base.TSDepart; -import org.jeecgframework.web.system.service.SystemService; +import org.jeecgframework.core.util.ExceptionUtil; import org.jeecgframework.core.util.MyBeanUtils; - -import java.io.OutputStream; -import org.jeecgframework.core.util.BrowserUtils; -import org.jeecgframework.poi.excel.ExcelExportUtil; +import org.jeecgframework.core.util.ResourceUtil; +import org.jeecgframework.core.util.StringUtil; 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.TemplateExportParams; import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.vo.TemplateExcelConstants; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.jeecgframework.core.util.ResourceUtil; -import java.io.IOException; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import java.util.Map; -import java.util.HashMap; -import org.jeecgframework.core.util.ExceptionUtil; - +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.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.jeecgframework.core.beanvalidator.BeanValidators; -import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import java.net.URI; -import org.springframework.http.MediaType; +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 com.zzjee.report.entity.RpWmUpAndDownEntity; +import com.zzjee.report.service.RpWmUpAndDownServiceI; + /** * @Title: Controller * @Description: rp_wm_up_and_down @@ -302,7 +287,6 @@ public class RpWmUpAndDownController extends BaseController { return NormalExcelConstants.JEECG_EXCEL_VIEW; } - @SuppressWarnings("unchecked") @RequestMapping(params = "importExcel", method = RequestMethod.POST) @ResponseBody public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/src/main/java/com/zzjee/wm/controller/WmPlatIoController.java b/src/main/java/com/zzjee/wm/controller/WmPlatIoController.java index 3faa1733..7a6b055f 100644 --- a/src/main/java/com/zzjee/wm/controller/WmPlatIoController.java +++ b/src/main/java/com/zzjee/wm/controller/WmPlatIoController.java @@ -1,83 +1,59 @@ package com.zzjee.wm.controller; -import com.zzjee.wm.entity.WmPlatIoEntity; -import com.zzjee.wm.service.WmPlatIoServiceI; - +import java.io.IOException; +import java.net.URI; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; -import java.text.SimpleDateFormat; +import java.util.Map; +import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.validation.ConstraintViolation; +import javax.validation.Validator; import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.ModelAndView; +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.common.TreeChildCount; 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.DateUtils; -import org.jeecgframework.core.util.StringUtil; -import org.jeecgframework.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.pojo.base.TSDepart; -import org.jeecgframework.web.system.service.SystemService; +import org.jeecgframework.core.util.ExceptionUtil; import org.jeecgframework.core.util.MyBeanUtils; - -import java.io.OutputStream; - -import org.jeecgframework.core.util.BrowserUtils; -import org.jeecgframework.p3.core.common.utils.DateUtil; -import org.jeecgframework.poi.excel.ExcelExportUtil; +import org.jeecgframework.core.util.ResourceUtil; +import org.jeecgframework.core.util.StringUtil; 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.TemplateExportParams; import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.vo.TemplateExcelConstants; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.jeecgframework.core.util.ResourceUtil; - -import java.io.IOException; - -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; - -import java.util.Map; -import java.util.HashMap; - -import org.jeecgframework.core.util.ExceptionUtil; +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.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.jeecgframework.core.beanvalidator.BeanValidators; - -import java.util.Set; - -import javax.validation.ConstraintViolation; -import javax.validation.Validator; - -import java.net.URI; - -import org.springframework.http.MediaType; +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 com.zzjee.wm.entity.WmPlatIoEntity; +import com.zzjee.wm.service.WmPlatIoServiceI; + /** * @Title: Controller * @Description: 月台进出 diff --git a/src/main/java/com/zzjee/wm/controller/WmSttInGoodsController.java b/src/main/java/com/zzjee/wm/controller/WmSttInGoodsController.java index 50e18f5e..27df462c 100644 --- a/src/main/java/com/zzjee/wm/controller/WmSttInGoodsController.java +++ b/src/main/java/com/zzjee/wm/controller/WmSttInGoodsController.java @@ -1,58 +1,60 @@ package com.zzjee.wm.controller; -import com.zzjee.api.ResultDO; -import com.zzjee.md.entity.MvGoodsEntity; -import com.zzjee.wm.entity.*; -import com.zzjee.wm.service.WmSttInGoodsServiceI; - +import java.io.IOException; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.validation.Validator; import org.apache.log4j.Logger; -import org.jeecgframework.core.util.*; -import org.jeecgframework.web.system.sms.util.Constants; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; 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.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.service.SystemService; -import com.zzjee.wmutil.wmUtil; - +import org.jeecgframework.core.util.ExceptionUtil; +import org.jeecgframework.core.util.JSONHelper; +import org.jeecgframework.core.util.MyBeanUtils; +import org.jeecgframework.core.util.ResourceUtil; +import org.jeecgframework.core.util.StringUtil; 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 java.io.IOException; - -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; - -import java.util.Map; -import java.util.HashMap; - +import org.jeecgframework.tag.core.easyui.TagUtil; +import org.jeecgframework.web.system.service.SystemService; +import org.jeecgframework.web.system.sms.util.Constants; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.http.HttpStatus; - -import javax.validation.Validator; - -import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.ResponseStatus; +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 com.zzjee.api.ResultDO; +import com.zzjee.md.entity.MvGoodsEntity; +import com.zzjee.wm.entity.WmSttInGoodsEntity; +import com.zzjee.wm.entity.WmToDownGoodsEntity; +import com.zzjee.wm.entity.WmToUpGoodsEntity; +import com.zzjee.wm.service.WmSttInGoodsServiceI; +import com.zzjee.wmutil.wmUtil; + /** * @Title: Controller * @Description: 库存盘点 diff --git a/src/main/java/com/zzjee/wm/controller/WmToMoveGoodsController.java b/src/main/java/com/zzjee/wm/controller/WmToMoveGoodsController.java index 77c638bf..af0f2c34 100644 --- a/src/main/java/com/zzjee/wm/controller/WmToMoveGoodsController.java +++ b/src/main/java/com/zzjee/wm/controller/WmToMoveGoodsController.java @@ -1,76 +1,62 @@ package com.zzjee.wm.controller; -import com.zzjee.api.ResultDO; -import com.zzjee.md.entity.MdGoodsEntity; -import com.zzjee.wm.entity.*; -import com.zzjee.wm.page.omqmpage; -import com.zzjee.wm.page.wmtomovepage; -import com.zzjee.wm.service.WmToMoveGoodsServiceI; - +import java.io.IOException; +import java.net.URI; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.text.SimpleDateFormat; +import java.util.Map; +import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import com.zzjee.wmutil.wmUtil; -import org.apache.commons.collections.CollectionUtils; -import org.apache.log4j.Logger; -import org.jeecgframework.core.util.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; -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.common.TreeChildCount; -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.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.pojo.base.TSDepart; -import org.jeecgframework.web.system.service.SystemService; - -import java.io.OutputStream; - -import org.jeecgframework.poi.excel.ExcelExportUtil; -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.TemplateExportParams; -import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.vo.TemplateExcelConstants; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; - -import java.io.IOException; - -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; - -import java.util.Map; -import java.util.HashMap; - -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.jeecgframework.core.beanvalidator.BeanValidators; - -import java.util.Set; - import javax.validation.ConstraintViolation; import javax.validation.Validator; -import java.net.URI; - +import org.apache.commons.collections.CollectionUtils; +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.JSONHelper; +import org.jeecgframework.core.util.MyBeanUtils; +import org.jeecgframework.core.util.ResourceUtil; +import org.jeecgframework.core.util.StringUtil; +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.HttpHeaders; +import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; +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 com.zzjee.api.ResultDO; +import com.zzjee.wm.entity.WmToMoveGoodsEntity; +import com.zzjee.wm.page.wmtomovepage; +import com.zzjee.wm.service.WmToMoveGoodsServiceI; +import com.zzjee.wmutil.wmUtil; + /** * @Title: Controller * @Description: 库存转移 diff --git a/src/main/java/com/zzjee/wm/controller/WmToUpGoodsController.java b/src/main/java/com/zzjee/wm/controller/WmToUpGoodsController.java index 8b0e1e08..1d494156 100644 --- a/src/main/java/com/zzjee/wm/controller/WmToUpGoodsController.java +++ b/src/main/java/com/zzjee/wm/controller/WmToUpGoodsController.java @@ -1,80 +1,63 @@ package com.zzjee.wm.controller; -import com.alibaba.fastjson.JSON; -import com.zzjee.api.ResultDO; -import com.zzjee.md.entity.MvGoodsEntity; -import com.zzjee.wm.entity.WmInQmIEntity; -import com.zzjee.wm.entity.WmToDownGoodsEntity; -import com.zzjee.wm.entity.WmToUpGoodsEntity; -import com.zzjee.wm.page.Delrowpage; -import com.zzjee.wm.page.wmtoupgoodspage; -import com.zzjee.wm.service.WmToUpGoodsServiceI; - +import java.io.IOException; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.text.SimpleDateFormat; +import java.util.Map; +import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import com.zzjee.wmapi.entity.WvNoticeEntity; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.io.CopyUtils; -import org.apache.log4j.Logger; -import org.jeecgframework.core.util.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; -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.common.TreeChildCount; -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.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.pojo.base.TSDepart; -import org.jeecgframework.web.system.service.SystemService; - -import java.io.OutputStream; - -import org.jeecgframework.poi.excel.ExcelExportUtil; -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.TemplateExportParams; -import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.vo.TemplateExcelConstants; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; - -import java.io.IOException; - -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; - -import java.util.Map; -import java.util.HashMap; - -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.jeecgframework.core.beanvalidator.BeanValidators; - -import java.util.Set; - import javax.validation.ConstraintViolation; import javax.validation.Validator; -import java.net.URI; - +import org.apache.commons.collections.CollectionUtils; +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.DateUtils; +import org.jeecgframework.core.util.ExceptionUtil; +import org.jeecgframework.core.util.JSONHelper; +import org.jeecgframework.core.util.MyBeanUtils; +import org.jeecgframework.core.util.ResourceUtil; +import org.jeecgframework.core.util.StringUtil; +import org.jeecgframework.core.util.oConvertUtils; +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.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; +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 com.zzjee.api.ResultDO; +import com.zzjee.md.entity.MvGoodsEntity; +import com.zzjee.wm.entity.WmInQmIEntity; +import com.zzjee.wm.entity.WmToUpGoodsEntity; +import com.zzjee.wm.page.wmtoupgoodspage; +import com.zzjee.wm.service.WmToUpGoodsServiceI; + /** * @Title: Controller * @Description: 上架列表 @@ -304,7 +287,7 @@ public class WmToUpGoodsController extends BaseController { @RequestMapping(params = "updateRows") @ResponseBody public AjaxJson updateRows(wmtoupgoodspage page){ - String message = null; +// String message = null; List demos=page.getUprows(); AjaxJson j = new AjaxJson(); if(CollectionUtils.isNotEmpty(demos)){ diff --git a/src/main/java/com/zzjee/wmapi/controller/WvGiNoticeController.java b/src/main/java/com/zzjee/wmapi/controller/WvGiNoticeController.java index 71154b92..45b1306f 100644 --- a/src/main/java/com/zzjee/wmapi/controller/WvGiNoticeController.java +++ b/src/main/java/com/zzjee/wmapi/controller/WvGiNoticeController.java @@ -1,71 +1,58 @@ package com.zzjee.wmapi.controller; -import com.alibaba.fastjson.JSONObject; -import com.zzjee.api.ResultDO; -import com.zzjee.wmapi.entity.WvGiEntity; -import com.zzjee.wmapi.entity.WvGiNoticeEntity; -import com.zzjee.wmapi.entity.WvNoticeEntity; -import com.zzjee.wmapi.service.WvGiNoticeServiceI; +import java.io.IOException; +import java.net.URI; import java.util.ArrayList; import java.util.List; -import java.text.SimpleDateFormat; +import java.util.Map; +import java.util.Set; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.validation.ConstraintViolation; +import javax.validation.Validator; -import com.zzjee.wmutil.wmUtil; import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - +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.common.TreeChildCount; 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.StringUtil; -import org.jeecgframework.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.pojo.base.TSDepart; -import org.jeecgframework.web.system.service.SystemService; +import org.jeecgframework.core.util.ExceptionUtil; import org.jeecgframework.core.util.MyBeanUtils; - -import java.io.OutputStream; -import org.jeecgframework.core.util.BrowserUtils; -import org.jeecgframework.poi.excel.ExcelExportUtil; +import org.jeecgframework.core.util.ResourceUtil; +import org.jeecgframework.core.util.StringUtil; 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.TemplateExportParams; import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.vo.TemplateExcelConstants; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.jeecgframework.core.util.ResourceUtil; -import java.io.IOException; - -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import java.util.Map; -import java.util.HashMap; -import org.jeecgframework.core.util.ExceptionUtil; - -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; +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.HttpHeaders; import org.springframework.http.HttpStatus; -import org.jeecgframework.core.beanvalidator.BeanValidators; -import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import java.net.URI; import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; +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 com.zzjee.api.ResultDO; +import com.zzjee.wmapi.entity.WvGiNoticeEntity; +import com.zzjee.wmapi.service.WvGiNoticeServiceI; +import com.zzjee.wmutil.wmUtil; + /** * @Title: Controller * @Description: wv_gi_notice diff --git a/src/main/java/com/zzjee/wmapi/controller/WvNoticeController.java b/src/main/java/com/zzjee/wmapi/controller/WvNoticeController.java index 342408eb..2bd25f69 100644 --- a/src/main/java/com/zzjee/wmapi/controller/WvNoticeController.java +++ b/src/main/java/com/zzjee/wmapi/controller/WvNoticeController.java @@ -1,71 +1,58 @@ package com.zzjee.wmapi.controller; -import com.zzjee.api.ResultDO; -import com.zzjee.wm.entity.WmInQmIEntity; -import com.zzjee.wmapi.entity.WvGiEntity; -import com.zzjee.wmapi.entity.WvGiNoticeEntity; -import com.zzjee.wmapi.entity.WvNoticeEntity; -import com.zzjee.wmapi.service.WvNoticeServiceI; +import java.io.IOException; +import java.net.URI; import java.util.ArrayList; import java.util.List; -import java.text.SimpleDateFormat; +import java.util.Map; +import java.util.Set; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.validation.ConstraintViolation; +import javax.validation.Validator; -import com.zzjee.wmutil.wmUtil; import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - +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.common.TreeChildCount; 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.StringUtil; -import org.jeecgframework.tag.core.easyui.TagUtil; -import org.jeecgframework.web.system.pojo.base.TSDepart; -import org.jeecgframework.web.system.service.SystemService; +import org.jeecgframework.core.util.ExceptionUtil; import org.jeecgframework.core.util.MyBeanUtils; - -import java.io.OutputStream; -import org.jeecgframework.core.util.BrowserUtils; -import org.jeecgframework.poi.excel.ExcelExportUtil; +import org.jeecgframework.core.util.ResourceUtil; +import org.jeecgframework.core.util.StringUtil; 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.TemplateExportParams; import org.jeecgframework.poi.excel.entity.vo.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.vo.TemplateExcelConstants; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.jeecgframework.core.util.ResourceUtil; -import java.io.IOException; - -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import java.util.Map; -import java.util.HashMap; -import org.jeecgframework.core.util.ExceptionUtil; - -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; +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.HttpHeaders; import org.springframework.http.HttpStatus; -import org.jeecgframework.core.beanvalidator.BeanValidators; -import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import java.net.URI; import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; +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 com.zzjee.api.ResultDO; +import com.zzjee.wmapi.entity.WvNoticeEntity; +import com.zzjee.wmapi.service.WvNoticeServiceI; +import com.zzjee.wmutil.wmUtil; + /** * @Title: Controller * @Description: wv_notice