傅行帆 5 年 前
コミット
f48c04dfe3

+ 5
- 0
foyo-service/src/main/java/com/huiju/foyo/common/ConstantFoyo.java ファイルの表示

@@ -11,4 +11,9 @@ public class ConstantFoyo {
11 11
 	public static final Integer STATUS_EFFECTIVE = 1;
12 12
 	
13 13
 	public static final String USER_ADMIN = "admin";
14
+	
15
+	public static final String TYPE_CASE = "case";
16
+	
17
+	public static final String TYPE_MOVEMENT = "movement";
18
+	
14 19
 }

+ 13
- 4
foyo-service/src/main/java/com/huiju/foyo/controller/TaCaseController.java ファイルの表示

@@ -161,16 +161,25 @@ public class TaCaseController extends BaseController {
161 161
      * 分页查询列表
162 162
      * @return
163 163
      */
164
-    @RequestMapping(value="/pc/case/list",method= RequestMethod.GET)
165
-    public ResponseBean pcCaseList(){
164
+    @RequestMapping(value="/pc/case/{state}/list",method= RequestMethod.GET)
165
+    public ResponseBean pcCaseList(@PathVariable String state,
166
+                                   @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
167
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
166 168
         ResponseBean responseBean = new ResponseBean();
169
+        if (!state.equals(ConstantFoyo.TYPE_CASE) && !state.equals(ConstantFoyo.TYPE_MOVEMENT)){
170
+            responseBean.addError("不符合的类型");
171
+            return responseBean;
172
+        }
167 173
         try {
174
+            IPage<TaCase> pg = new Page<>(pageNum, pageSize);
168 175
             QueryWrapper<TaCase> queryWrapper = new QueryWrapper<>();
169 176
             queryWrapper.eq("status", ConstantFoyo.STATUS_EFFECTIVE);
177
+            queryWrapper.eq("type",state);
178
+            queryWrapper.orderByDesc("topping");
170 179
             queryWrapper.orderByDesc("sort");
171 180
             queryWrapper.orderByDesc("create_time");
172
-            queryWrapper.last("limit 3");
173
-            responseBean.addSuccess(iTaCaseService.list(queryWrapper));
181
+            IPage<TaCase> result = iTaCaseService.page(pg, queryWrapper);
182
+            responseBean.addSuccess(result);
174 183
         }catch (Exception e){
175 184
             e.printStackTrace();
176 185
             logger.error("taCaseList -=- {}",e.toString());

+ 19
- 0
foyo-service/src/main/java/com/huiju/foyo/controller/TaCaseIndexCoverController.java ファイルの表示

@@ -159,4 +159,23 @@ public class TaCaseIndexCoverController extends BaseController {
159 159
         }
160 160
         return responseBean;
161 161
     }
162
+    
163
+    /**
164
+     * 分页查询列表
165
+     * @return
166
+     */
167
+    @RequestMapping(value="/pc/case/cover",method= RequestMethod.GET)
168
+    public ResponseBean pcCaseIndexCoverList(){
169
+        ResponseBean responseBean = new ResponseBean();
170
+        try {
171
+            QueryWrapper<TaCaseIndexCover> queryWrapper = new QueryWrapper<>();
172
+            queryWrapper.last(" limit 1");
173
+            responseBean.addSuccess(iTaCaseIndexCoverService.list(queryWrapper));
174
+        }catch (Exception e){
175
+            e.printStackTrace();
176
+            logger.error("taCaseIndexCoverList -=- {}",e.toString());
177
+            responseBean.addError(e.getMessage());
178
+        }
179
+        return responseBean;
180
+    }
162 181
 }

+ 27
- 0
foyo-service/src/main/java/com/huiju/foyo/controller/TaCaseTypeController.java ファイルの表示

@@ -171,4 +171,31 @@ public class TaCaseTypeController extends BaseController {
171 171
         }
172 172
         return responseBean;
173 173
     }
174
+    
175
+    /**
176
+     * 分页查询列表
177
+     * @param pageNum
178
+     * @param pageSize
179
+     * @return
180
+     */
181
+    @RequestMapping(value="/pc/caseType/list",method= RequestMethod.GET)
182
+    public ResponseBean pcCaseTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
183
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
184
+        ResponseBean responseBean = new ResponseBean();
185
+        try {
186
+            //使用分页插件
187
+            IPage<TaCaseType> pg = new Page<>(pageNum, pageSize);
188
+            QueryWrapper<TaCaseType> queryWrapper = new QueryWrapper<>();
189
+            queryWrapper.orderByDesc("sort");
190
+            queryWrapper.orderByDesc("create_time");
191
+            
192
+            IPage<TaCaseType> result = iTaCaseTypeService.page(pg, queryWrapper);
193
+            responseBean.addSuccess(result);
194
+        }catch (Exception e){
195
+            e.printStackTrace();
196
+            logger.error("taCaseTypeList -=- {}",e.toString());
197
+            responseBean.addError(e.getMessage());
198
+        }
199
+        return responseBean;
200
+    }
174 201
 }