From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/HomeNavbarAdminController.java | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/HomeNavbarAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/HomeNavbarAdminController.java
index e0b5b5a..6efcb76 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/HomeNavbarAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/HomeNavbarAdminController.java
@@ -17,9 +17,7 @@
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.entity.bus.homemodule.HomeNavbar;
import com.yeshi.fanli.exception.homemodule.HomeNavbarException;
-import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.homemodule.HomeNavbarService;
-import com.yeshi.fanli.service.inter.homemodule.SuperHomeNavbarService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@@ -29,18 +27,10 @@
@Controller
@RequestMapping("admin/new/api/v1/navbar")
public class HomeNavbarAdminController {
-
- @Resource
- private AdminUserService adminUserService;
@Resource
private HomeNavbarService homeNavbarService;
- @Resource
- private SuperHomeNavbarService superHomeNavbarService;
-
-
-
/**
* 淇濆瓨淇℃伅
@@ -50,7 +40,7 @@
* @param out
*/
@RequestMapping(value = "save")
- public void save(String callback, HomeNavbar homeNavbar, String jumpType, HttpServletRequest request,PrintWriter out) {
+ public void save(String callback, HomeNavbar homeNavbar, HttpServletRequest request, PrintWriter out) {
try {
// 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
if (request instanceof MultipartHttpServletRequest) {
@@ -79,9 +69,9 @@
* @param out
*/
@RequestMapping(value = "updateOrder")
- public void updateOrder(String callback, Long id, Integer moveType, PrintWriter out) {
+ public void updateOrder(String callback, Long id, Integer moveType, Integer sex, PrintWriter out) {
try {
- homeNavbarService.updateOrder(id, moveType);
+ homeNavbarService.updateOrder(id, moveType, sex);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
} catch (HomeNavbarException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -102,8 +92,7 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key,
- Integer sort, PrintWriter out) {
+ public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer sex, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -114,14 +103,14 @@
}
try {
- List<HomeNavbar> list = homeNavbarService.listQuery((pageIndex - 1) * pageSize, pageSize, key);
+ List<HomeNavbar> list = homeNavbarService.listQuery((pageIndex - 1) * pageSize, pageSize, key, sex);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
- long count = homeNavbarService.countlistQuery(key);
+ long count = homeNavbarService.countlistQuery(key, sex);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
--
Gitblit v1.8.0