传感器管理有效期过期查询

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/chuanganqi/controller/ItdmChuanganqiController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.chuanganqi.controller;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -53,6 +54,44 @@ public class ItdmChuanganqiController extends JeecgController<ItdmChuanganqi, II
 	@Autowired
 	private IItdmChuanganqiService itdmChuanganqiService;
 
+	/**
+	 * 传感器管理-过期总数查询
+	 * */
+	 @ApiOperation(value="传感器管理-过期总数查询", notes="传感器管理-过期总数查询")
+	 @GetMapping(value = "/queryTotal")
+	 public Result<Integer> queryTotal() {
+		 int total = itdmChuanganqiService.total();
+		 return Result.OK(total);
+	 }
+
+
+	 /**
+	  * 过期分页列表查询
+	  *
+	  * @param itdmChuanganqi
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "传感器管理-分页列表查询")
+	 @ApiOperation(value="传感器管理-过期分页列表查询", notes="传感器管理-过期分页列表查询")
+	 @GetMapping(value = "/expireList")
+	 public Result<IPage<ItdmChuanganqi>> queryExpirePageList(ItdmChuanganqi itdmChuanganqi,
+														@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														HttpServletRequest req) {
+		 ItdmChuanganqi itdmChuanganqi1 = new ItdmChuanganqi();
+		 QueryWrapper<ItdmChuanganqi> queryWrapper = QueryGenerator.initQueryWrapper(itdmChuanganqi1, req.getParameterMap());
+		 queryWrapper.lambda().like(StringUtils.isNoneBlank(itdmChuanganqi.getXuliehao()),ItdmChuanganqi::getXuliehao,itdmChuanganqi.getXuliehao());
+
+		 queryWrapper.le("youxiaoqi", new Date()); // 查询有效期小于等于当前时间的设备
+
+		 Page<ItdmChuanganqi> page = new Page<ItdmChuanganqi>(pageNo, pageSize);
+		 IPage<ItdmChuanganqi> pageList = itdmChuanganqiService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
 	 /**
 	  * 传感器下拉列表
 	  */

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/chuanganqi/mapper/ItdmChuanganqiMapper.java

@@ -17,6 +17,12 @@ public interface ItdmChuanganqiMapper extends BaseMapper<ItdmChuanganqi> {
 
 
     /**
+     * 过期传感器总数
+     */
+    @Select("select count(*) from itdm_chuanganqi where youxiaoqi <= now()")
+    public int total();
+
+    /**
      * 传感器下拉列表
      */
     @Select("select * from itdm_chuanganqi" )

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/chuanganqi/service/IItdmChuanganqiService.java

@@ -16,6 +16,11 @@ public interface IItdmChuanganqiService extends IService<ItdmChuanganqi> {
     /**
      * 传感器下拉列表
      */
+    public int total();
+
+    /**
+     * 传感器下拉列表
+     */
     public List<ItdmChuanganqi> queryList();
 
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/chuanganqi/service/impl/ItdmChuanganqiServiceImpl.java

@@ -24,6 +24,13 @@ public class ItdmChuanganqiServiceImpl extends ServiceImpl<ItdmChuanganqiMapper,
     private ItdmChuanganqiMapper chuanganqiMapper;
 
     /**
+     * 过期传感器总数
+     */
+    public int total(){
+        return chuanganqiMapper.total();
+    }
+
+    /**
      * 传感器下拉列表
      */
     public List<ItdmChuanganqi> queryList(){

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/controller/ItdmDeviceController.java

@@ -45,6 +45,17 @@ public class ItdmDeviceController extends JeecgController<ItdmDevice, IItdmDevic
 
 
 	/**
+	 * 设备管理-过期总数查询
+	 * */
+	@ApiOperation(value="设备管理-过期总数查询", notes="设备管理-过期总数查询")
+	@GetMapping(value = "/queryTotal")
+	public Result<Integer> queryTotal() {
+		int total = itdmDeviceService.total();
+		return Result.OK(total);
+	}
+
+
+	/**
 	 * 分页列表设备过期查询
 	 *
 	 * @param itdmDevice

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/mapper/ItdmDeviceMapper.java

@@ -15,6 +15,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ItdmDeviceMapper extends BaseMapper<ItdmDevice> {
 
+
+    /**
+     * 过期设备总数
+     */
+    @Select("select count(*) from itdm_device where device_life <= now()")
+    public int total();
+
     /**
      * 设备下拉列表
      */

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/service/IItdmDeviceService.java

@@ -1,8 +1,8 @@
 package org.jeecg.modules.itdmDevice.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.itdmDevice.entity.ItdmDevice;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
@@ -15,6 +15,11 @@ import java.util.List;
 public interface IItdmDeviceService extends IService<ItdmDevice> {
 
     /**
+     * 过期设备总数
+     */
+    public int total();
+
+    /**
      * 设备下拉列表
      */
     public List<ItdmDevice> queryList();

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/service/impl/ItdmDeviceServiceImpl.java

@@ -25,6 +25,13 @@ public class ItdmDeviceServiceImpl extends ServiceImpl<ItdmDeviceMapper, ItdmDev
     private ItdmDeviceMapper itdmDeviceMapper;
 
     /**
+     * 过期设备总数
+     */
+    public int total(){
+        return itdmDeviceMapper.total();
+    }
+
+    /**
      * 设备下拉列表
      */
     public List<ItdmDevice> queryList(){