From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/LableAdminController.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/LableAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/LableAdminController.java
index fdaeb37..abde9e8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/LableAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/LableAdminController.java
@@ -11,6 +11,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
@@ -31,10 +32,10 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.lable.LabelGoodsService;
import com.yeshi.fanli.service.inter.lable.LabelService;
-import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.common.entity.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
@Controller
@RequestMapping("admin/new/api/v1/lable")
@@ -60,7 +61,7 @@
* @param out
*/
@RequestMapping(value = "saveAdd")
- public void saveAdd(String callback, Long uid, Label label, HttpServletRequest request, PrintWriter out) {
+ public void saveAdd(AdminAcceptData acceptData, String callback, Long uid, Label label, HttpServletRequest request, PrintWriter out) {
try {
String title = label.getTitle();
if (StringUtil.isNullOrEmpty(title)) {
@@ -109,7 +110,7 @@
* @param out
*/
@RequestMapping(value = "addBatch")
- public void addBatch(String callback, String param, HttpServletRequest request, PrintWriter out) {
+ public void addBatch(AdminAcceptData acceptData,String callback, String param, HttpServletRequest request, PrintWriter out) {
try {
Gson gson = new Gson();
@@ -154,7 +155,7 @@
* @param out
*/
@RequestMapping(value = "saveModify")
- public void saveModify(String callback, Label label, PrintWriter out) {
+ public void saveModify(AdminAcceptData acceptData,String callback, Label label, PrintWriter out) {
try {
Long id = label.getId();
@@ -205,7 +206,7 @@
* @param out
*/
@RequestMapping(value = "deleteLable")
- public void deleteLable(String callback, String ids, PrintWriter out) {
+ public void deleteLable(AdminAcceptData acceptData,String callback, String ids, PrintWriter out) {
try {
Gson gson = new Gson();
@@ -237,7 +238,7 @@
* @param response
*/
@RequestMapping(value = "uploadFile")
- public void uploadFile(@RequestParam("file") CommonsMultipartFile file, HttpServletRequest request,
+ public void uploadFile(AdminAcceptData acceptData,@RequestParam("file") CommonsMultipartFile file, HttpServletRequest request,
PrintWriter out) {
if (file == null) {
@@ -269,7 +270,7 @@
* @param response
*/
@RequestMapping(value = "uploadImg")
- public void uploadImg(Long id, @RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
+ public void uploadImg(AdminAcceptData acceptData,Long id, @RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
try {
Label label = labelService.selectByPrimaryKey(id);
@@ -309,7 +310,7 @@
* @param response
*/
@RequestMapping(value = "deleteImg")
- public void deleteImg(String callback, Long id, PrintWriter out) {
+ public void deleteImg(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
try {
Label label = labelService.selectByPrimaryKey(id);
@@ -349,7 +350,7 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, String key, String startTime,
+ public void query(AdminAcceptData acceptData,String callback, Integer pageIndex, String key, String startTime,
String endTime, String orderMode, PrintWriter out) {
try {
@@ -438,7 +439,7 @@
* @param out
*/
@RequestMapping(value = "getCountToday")
- public void getCountToday(String callback, PrintWriter out) {
+ public void getCountToday(AdminAcceptData acceptData,String callback, PrintWriter out) {
try {
--
Gitblit v1.8.0