Merge remote-tracking branch 'origin/main'

wms/src/main/java/com/yc/wms/service/impl/DcxServiceImpl.java

@@ -44,33 +44,24 @@ public class DcxServiceImpl implements DcxService {
         int pageSize = query.getPageSize();//条数
         System.out.println("当前页：" + pageNum);
         System.out.println("条数：" + pageSize);
-        String sql = "from (SELECT ROW_NUMBER() OVER(ORDER BY it.id) AS RowNum, it.id ,"
+        String sql = " from (SELECT ROW_NUMBER() OVER(ORDER BY it.id) AS RowNum, it.id ,"
                 + "it.code,"
                 + "it.name"
                 + " from Item it ";
         sql += ")  AS subquery ";
-        String sqlCount = "select count(id) " + sql;
+        String sqlCount = "select count(id) as nums " + sql;
         sql = "select * " + sql + " WHERE RowNum BETWEEN " + (pageNum-1) * pageSize + " AND " + (pageNum) * pageSize;
-        log.info("sqlCount:"+sqlCount);
-        log.info("sql:"+sql);
-
-        //查询单挑数据
-        Map<String,Object> userMap2 = jdbcTemplate.queryForMap("select * from Container where ID=1", new HashMap<>());
-
+        //查询单数据
+        Map<String,Object> listCount = jdbcTemplate.queryForMap(sqlCount, new HashMap<>());
         //查询多条数据据
-        List<Map<String,Object>> userMap = jdbcTemplate.queryForList("select * from Container ", new HashMap<>());
-        System.out.println(userMap);
-
-
-        /*List<Object[]> list=entity.createNativeQuery(sql).getResultList();
-        List listCount=entity.createNativeQuery(sqlCount).getResultList();
+        List<Map<String,Object>> maps = jdbcTemplate.queryForList(sql, new HashMap<>());
         JSONArray data = new JSONArray();
-        for(Object[] obj:list){
+        for(Map<String,Object> m:maps){
             int i=0;
             JSONObject d = new JSONObject();
-            d.put("id",obj[i++]==null?"":obj[i-1]);
-            d.put("userNo",obj[i++]==null?"":obj[i-1]);
-            d.put("userName", obj[i++]==null?"":obj[i-1]);
+            d.put("id",m.get("id"));
+            d.put("userNo",m.get("code"));
+            d.put("userName", m.get("name"));
             d.put("passWord","123456");
             d.put("age",19);
             d.put("sex",1);
@@ -78,8 +69,8 @@ public class DcxServiceImpl implements DcxService {
             d.put("roleId", 2);
             d.put("isValid", false);
             data.add(d);
-        }*/
-       return  Result.success(userMap.size(),userMap);
+        }
+       return  Result.success(Long.parseLong(listCount.get("nums").toString()),data);
     }
 
 }