修补分页参数错误

src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java

@@ -20,7 +20,7 @@ import java.util.Map;
 
 
 @RestController
-@RequestMapping(value = "/admin/goods.Goods",method = RequestMethod.POST)
+@RequestMapping(value = "/admin/goods.Goods")
 public class AdminGoodsController extends BaseController {
     @Autowired
     private GoodsService goodsService;
@@ -34,51 +34,53 @@ public class AdminGoodsController extends BaseController {
      * @return
      */
     @RequestMapping("/list")
-    public JSONObject list(HttpServletRequest request){
+    public JSONObject list(@RequestBody String jsonStr){
+        JSONObject request =JSONObject.parseObject(jsonStr);
         // 查询条件
         Map qmap = new HashMap();
 
         //分页
-        String page = request.getParameter("page");
+        String page = request.getString("page");
         if(StringUtils.isBlank(page)){
             page="1";
         }
         int ipage=Integer.parseInt(page);
+
         // 查询
-        String limit = request.getParameter("limit");
+        String limit = request.getString("limit");
         int ilimit=(StringUtils.isBlank(limit))?10:Integer.valueOf(limit);
 
         int start= ipage>1?(ipage-1)*ilimit:0;
         qmap.put("id",start);
 
         // 委托编码
-        String islicode=request.getParameter("islicode");
+        String islicode=request.getString("islicode");
         if(!StringUtils.isBlank(islicode)){
             qmap.put("islicode",islicode);
         }
         // 商品名称
-        String gname=request.getParameter("goods_name");
+        String gname=request.getString("goods_name");
         if(!StringUtils.isBlank(gname)){
             qmap.put("goods_name",gname);
         }
         //
-        String entrust_name =request.getParameter("entrust_name");
+        String entrust_name =request.getString("entrust_name");
         if(StringUtils.isNotBlank(entrust_name)){
             qmap.put("entrust_name",entrust_name);
         }
 
         //
-        String goods_entrust = request.getParameter("goods_entrust");
+        String goods_entrust = request.getString("goods_entrust");
         if(StringUtils.isNotBlank(goods_entrust)){
             qmap.put("goods_entrust",goods_entrust);
         }
         //
-        String goods_type= request.getParameter("goods_type");
+        String goods_type= request.getString("goods_type");
         if(StringUtils.isNotBlank(goods_type)){
             qmap.put("goods_type",goods_type);
         }
         //
-        String data_type= request.getParameter("data_type");
+        String data_type= request.getString("data_type");
         if (StringUtils.isNotBlank(data_type)) {
             qmap.put("data_type",data_type);
         }
@@ -90,12 +92,12 @@ public class AdminGoodsController extends BaseController {
 //            qmap.put("createtime","between "+aa[0]+" and "+aa[1]);
 //        }
         // 委托状态
-        String entrust_status = request.getParameter("entrust_status");
+        String entrust_status = request.getString("entrust_status");
         if(StringUtils.isNotBlank(entrust_status)){
             qmap.put("entrust_status",entrust_status);
         }
         // 交易
-        String transaction = request.getParameter("transaction");
+        String transaction = request.getString("transaction");
         if(StringUtils.isNotBlank(transaction)){
             qmap.put("transaction",transaction);
         }
@@ -114,7 +116,7 @@ public class AdminGoodsController extends BaseController {
      * @param request
      * @return
      */
-    @RequestMapping("/goodsDetail")
+    @PostMapping("/goodsDetail")
     public JSONObject goodsDetail(@RequestBody String jstr, HttpServletRequest request){
         String token = request.getHeader("token");
         // 需要返回的结果

src/main/java/cn/chjyj/szwh/controller/admin/AdminUserController.java

@@ -115,7 +115,7 @@ public class AdminUserController extends BaseController {
      * @param request
      * @return
      */
-    @PostMapping("/getUser")
+    @RequestMapping("/getUser")
     public JSONObject getUser(HttpServletRequest request){
         String token = request.getHeader("token");
         //从token中抽取出accout_id

src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java

@@ -35,6 +35,12 @@ public interface GoodsMapper {
      */
     int goodsCount(@Param("map") Map map);
 
+    /**
+     * 统计所有的信息
+     * @return
+     */
+    int countAllGoods();
+
     /**
      * 指定时间段内委托方排名
      * @param dtzone

src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java

@@ -167,7 +167,7 @@ public class GoodsServiceImpl implements GoodsService {
         retmap.put("data",nglist);
 
         // 总的记录
-        int total = goodsMapper.goodsCount(gmap);
+        int total = goodsMapper.countAllGoods();
         retmap.put("total",total);
 
         int start = page>1?(page-1)*limit:0;
@@ -208,11 +208,13 @@ public class GoodsServiceImpl implements GoodsService {
         List gatherarr=new ArrayList();
         List oneSource=new ArrayList();
         List<GoodsSource> goodsSourceList = goodsSourceMapper.getGoodsSourceByIsli(gdv.getGoods_islicode());
-        if(goodsSourceList!=null){ //not null
+        //if(goodsSourceList!=null){ //not null
             for(GoodsSource gs:goodsSourceList){
                 // 解析json
                 JSONObject sdjson = JSONObject.parseObject(gs.getSourceData());
-                Integer datatype=sdjson.getInteger("datatype");
+                log.info("goods source data :"+gs.getSourceData());
+                Integer datatype=gs.getDatatype();
+                log.info("goods source datatype :"+datatype);
                 Map info = new HashMap();
                 if(datatype==1){ //机构数据
                     info.put("name",gs.getSourceName());
@@ -235,11 +237,10 @@ public class GoodsServiceImpl implements GoodsService {
                     oneSource.add(info);
                 }
             }
-        }
-
-        //
-        retmap.put("gather_arr",gatherarr);
-        retmap.put("oneSource",oneSource);
+            //
+            retmap.put("gather_arr",gatherarr);
+            retmap.put("oneSource",oneSource);
+        //}
 
         return retmap;
     }

src/main/resources/application.properties

@@ -13,6 +13,9 @@ spring.redis.host=localhost
 spring.redis.port=6379
 #没有密码可以不用配置这个
 #spring.redis.password=123456
+
+spring.datasource.validationQuery=SELECT 'x'
+
 # 连接池配置
 spring.redis.jedis.pool.enabled=true
 # 最大连接

src/main/resources/mapper/szwh/GoodsMapper.xml

@@ -24,6 +24,11 @@
         </where>
     </select>
 
+    <!--统计所有的-->
+    <select id="countAllGoods" resultType="java.lang.Integer">
+        SELECT count(*) FROM <include refid="tbName"/>;
+    </select>
+
     <!--根据map组装条件进行查询-->
     <select id="getGoodsListByMap" parameterType="java.util.Map" resultType="cn.chjyj.szwh.bean.Goods">
         SELECT <include refid="column"/>

src/test/java/cn/chjyj/szwh/mapper/GoodsMapperTest.java

@@ -76,4 +76,10 @@ public class GoodsMapperTest {
             System.out.println(g.getUsername());
         }
     }
+
+    @Test
+    public void testCountAll(){
+        Integer axx = goodsMapper.countAllGoods();
+        System.out.println(axx);
+    }
 }