设备统计

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/xml/HyMapper.xml

@@ -150,7 +150,10 @@
 			from bl_order_info a
 			inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
 			inner join bl_device_info c on a.imei = c.imei
-			where a.phone = #{phone}
+			<where>
+				<if test="phone!=null and phone!=''">
+					and a.phone = #{phone}
+				</if>
 				<if test="beginTime != null and beginTime !=''">
 					and a.add_time  >= #{beginTime}
 				</if>
@@ -163,6 +166,10 @@
 				<if test="housingestateId!=null and housingestateId!=''">
 					and a.housingestate_id = #{housingestateId}
 				</if>
+				<if test="imei!=null and imei!=''">
+					and a.imei = #{imei}
+				</if>
+			</where>
 		) t
 		order by t.addTime desc
 	</select>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/controller/ShebeiController.java

@@ -68,8 +68,11 @@ public class ShebeiController extends JeecgController<Shebei, IShebeiService> {
 	 * 设备投递次数排行榜
 	 */
 	@RequestMapping(value = "/querySheBeiTdcsList", method = RequestMethod.GET)
-	public Result querySheBeiTdcsList(Shebei shebei) {
+	public Result querySheBeiTdcsList(Shebei shebei,
-		List<Shebei> list = service.querySheBeiTdcsList(shebei);
+		  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+		  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+		Page<Shebei> page = new Page<Shebei>(pageNo, pageSize);
+		IPage<Shebei> list = service.querySheBeiTdcsList(page,shebei);
 		return Result.ok(list);
 	}
 
@@ -83,8 +86,11 @@ public class ShebeiController extends JeecgController<Shebei, IShebeiService> {
 	 * 设备投递重量排行榜
 	 */
 	@RequestMapping(value = "/querySheBeiTdzlList", method = RequestMethod.GET)
-	public Result querySheBeiTdzlList(Shebei shebei) {
+	public Result querySheBeiTdzlList(Shebei shebei,
-		List<Shebei> list = service.querySheBeiTdzlList(shebei);
+		  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+		  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+		Page<Shebei> page = new Page<Shebei>(pageNo, pageSize);
+		IPage<Shebei> list = service.querySheBeiTdzlList(page,shebei);
 		return Result.ok(list);
 	}
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/entity/Shebei.java

@@ -113,4 +113,6 @@ public class Shebei implements Serializable {
     private String shortDay;
     @TableField(exist = false)
     private String money;
+    @TableField(exist = false)
+    private Integer rowNumber;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/ShebeiMapper.java

@@ -20,9 +20,9 @@ public interface ShebeiMapper extends BaseMapper<Shebei> {
     Shebei getHousingestate(Shebei shebei);
     Shebei getDevice(Shebei shebei);
     List<Shebei> deviceList(Shebei shebei);
-    List<Shebei> querySheBeiTdcsList(Shebei shebei);
+    IPage<Shebei> querySheBeiTdcsList(Page<Shebei> page,@Param("params") Shebei shebei);
     List<Shebei> queryAllSheBeiTdcsList(Shebei shebei);
-    List<Shebei> querySheBeiTdzlList(Shebei shebei);
+    IPage<Shebei> querySheBeiTdzlList(Page<Shebei> page,@Param("params") Shebei shebei);
     List<Shebei> querySheBeiTdjetjList(Shebei shebei);
     List<Shebei> querySheBeiTdcstjList(Shebei shebei);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/xml/ShebeiMapper.xml

@@ -92,27 +92,27 @@
 
     <select id="querySheBeiTdcsList" parameterType="org.jeecg.modules.zh.view.shebei.entity.Shebei" resultType="org.jeecg.modules.zh.view.shebei.entity.Shebei">
         select
-        b.name as housingestateName,
+        @row_num := @row_num + 1 AS rowNumber,
-        c.content,
+        t.*
-        a.imei,
+        from (SELECT @row_num := 0) r,
-        a.cn
+        (
-        from (
             select
-        housingestate_id,
+                a.housingestate_id,
-        imei,
+                b.name as housingestateName,
+                a.imei,
+                c.content,
                 count(*) as cn
-        from bl_order_info
+            from bl_order_info a
-        where add_time  >= #{beginTime}
+            inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
-        and add_time  &lt;= #{endTime}
+            inner join bl_device_info c on a.imei = c.imei
-        <if test="housingestateId!=null and housingestateId!=''">
+            where a.add_time  >= #{params.beginTime}
-            and housingestate_id = #{housingestateId}
+            and a.add_time  &lt;= #{params.endTime}
+            <if test="params.housingestateId!=null and params.housingestateId!=''">
+                and a.housingestate_id = #{params.housingestateId}
             </if>
-        group by housingestate_id,imei
+            group by a.housingestate_id,b.name,a.imei,c.content
-        order by cn desc
+        ) t
-        limit 10
+        order by t.cn desc
-        ) a
-        left join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
-        left join bl_device_info c on a.imei = c.imei
     </select>
 
     <select id="queryAllSheBeiTdcsList" parameterType="org.jeecg.modules.zh.view.shebei.entity.Shebei" resultType="org.jeecg.modules.zh.view.shebei.entity.Shebei">
@@ -141,27 +141,27 @@
 
     <select id="querySheBeiTdzlList" parameterType="org.jeecg.modules.zh.view.shebei.entity.Shebei" resultType="org.jeecg.modules.zh.view.shebei.entity.Shebei">
         select
-        b.name as housingestateName,
+        @row_num := @row_num + 1 AS rowNumber,
-        c.content,
+        t.*
-        a.imei,
+        from (SELECT @row_num := 0) r,
-        a.weight
+        (
-        from (
             select
-        housingestate_id,
+                a.housingestate_id,
-        imei,
+                b.name as housingestateName,
+                a.imei,
+                c.content,
                 round(sum(weight),2) as weight
-        from bl_order_info
+            from bl_order_info a
-        where add_time  >= #{beginTime}
+            inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
-        and add_time  &lt;= #{endTime}
+            inner join bl_device_info c on a.imei = c.imei
-        <if test="housingestateId!=null and housingestateId!=''">
+            where a.add_time  >= #{params.beginTime}
-            and housingestate_id = #{housingestateId}
+            and a.add_time  &lt;= #{params.endTime}
+            <if test="params.housingestateId!=null and params.housingestateId!=''">
+                and a.housingestate_id = #{params.housingestateId}
             </if>
-        group by housingestate_id,imei
+            group by a.housingestate_id,b.name,a.imei,c.content
-        order by weight desc
+        ) t
-        limit 10
+        order by t.weight desc
-        ) a
-        left join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
-        left join bl_device_info c on a.imei = c.imei
     </select>
 
     <select id="querySheBeiTdjetjList" parameterType="org.jeecg.modules.zh.view.shebei.entity.Shebei" resultType="org.jeecg.modules.zh.view.shebei.entity.Shebei">

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/service/IShebeiService.java

@@ -4,7 +4,6 @@ package org.jeecg.modules.zh.view.shebei.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.zh.view.hy.entity.Hy;
 import org.jeecg.modules.zh.view.shebei.entity.Shebei;
 
 import java.util.List;
@@ -19,9 +18,9 @@ public interface IShebeiService extends IService<Shebei> {
 
     IPage<Shebei> queryDeviceInfo(Page<Shebei> page, Shebei shebei);
     List<Shebei> deviceList(Shebei shebei);
-    List<Shebei> querySheBeiTdcsList(Shebei shebei);
+    IPage<Shebei> querySheBeiTdcsList(Page<Shebei> page,Shebei shebei);
     List<Shebei> queryAllSheBeiTdcsList(Shebei shebei);
-    List<Shebei> querySheBeiTdzlList(Shebei shebei);
+    IPage<Shebei> querySheBeiTdzlList(Page<Shebei> page,Shebei shebei);
     List<Shebei> querySheBeiTdjetjList(Shebei shebei);
     List<Shebei> querySheBeiTdcstjList(Shebei shebei);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/service/impl/ShebeiServiceImpl.java

@@ -36,8 +36,8 @@ public class ShebeiServiceImpl extends ServiceImpl<ShebeiMapper, Shebei> impleme
      * 设备投递次数排行榜
      */
     @Override
-    public List<Shebei> querySheBeiTdcsList(Shebei shebei) {
+    public IPage<Shebei> querySheBeiTdcsList(Page<Shebei> page, Shebei shebei) {
-        return baseMapper.querySheBeiTdcsList(shebei);
+        return baseMapper.querySheBeiTdcsList(page,shebei);
     }
 
     /**
@@ -52,8 +52,8 @@ public class ShebeiServiceImpl extends ServiceImpl<ShebeiMapper, Shebei> impleme
      * 设备投递重量排行榜
      */
     @Override
-    public List<Shebei> querySheBeiTdzlList(Shebei shebei) {
+    public IPage<Shebei> querySheBeiTdzlList(Page<Shebei> page,Shebei shebei) {
-        return baseMapper.querySheBeiTdzlList(shebei);
+        return baseMapper.querySheBeiTdzlList(page,shebei);
     }
 
     /**