试剂耗材入库消息提醒后修改原数据状态，定时任务列表取消分页

ibps-common-root/modules/org-biz/src/main/java/com/lc/ibps/common/quartz/repository/impl/JobDetailRepositoryImpl.java

@@ -37,29 +37,24 @@ public class JobDetailRepositoryImpl implements JobDetailRepository {
 	@Override
 	public List<JobDetailVo> query(String jobName, String schedGroup, Page page) throws SchedulerException {
 		List<JobDetailVo> list = findByJobNameAndGroup(jobName, schedGroup);
-
-		// 分页大小
-		final int limit = page.getPageSize();
+		// 分页大小 final
+		// int limit = page.getPageSize();
 		// 页码
-		final int pageNo = page.getPageNo();
+		// final int pageNo = page.getPageNo();
 		// 总记录数
-		final int totalCount = list.size();
-		PageResult pageResult = new PageResult(pageNo, limit, totalCount);
-		final int offset = pageResult.getOffset();
-		int totalPages = pageResult.getTotalPages();
-		int currentLimit = pageNo == totalPages ? totalCount % limit : limit;
-		logger.debug("totalCount is {}, totalPages is {}, pageNo is {}, limit is {}, offset is {}, currentLimit is {}.",
-				totalCount, totalPages, pageNo, limit, offset, currentLimit);
-
-		List<JobDetailVo> data = new ArrayList<JobDetailVo>();
-		if(totalCount > 0 && offset <= totalCount)
-		{
-			data.addAll(list.subList(offset, offset + currentLimit));
-		}
-
-		PageList<JobDetailVo> result = new PageList<JobDetailVo>(data, pageResult);
-
-		return result;
+		// final int totalCount = list.size();
+		//PageResult pageResult = new PageResult(pageNo, limit, totalCount);
+		// final int offset = pageResult.getOffset();
+		// int totalPages = pageResult.getTotalPages();
+		// int currentLimit = pageNo == totalPages ? totalCount % limit : limit;
+		// logger.debug("totalCount is {}, totalPages is {}, pageNo is {}, limit is {}, offset is {}, currentLimit is {}.",
+		// totalCount, totalPages, pageNo, limit, offset, currentLimit); //
+		// List<JobDetailVo> data = new ArrayList<JobDetailVo>();
+		// if(totalCount > 0 && offset <= totalCount){
+		// data.addAll(list.subList(offset, offset + currentLimit)); //
+		// }
+		// PageList<JobDetailVo> result = new PageList<JobDetailVo>(list, pageResult);
+		 return list;
 	}
 
 	@Override

ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/plan/job/ReagentsConsumablesJob.java

@@ -37,17 +37,17 @@ public class ReagentsConsumablesJob  extends AbstractJob {
                 context.getJobDetail().getKey().getGroup(),
                 context.getJobDetail().getKey().getName(),
                 context.getTrigger().getKey().getName());
-        String querySql = "select id_,di_dian_,bian_zhi_bu_men_,bian_hao_,ming_cheng_,bian_ma_,pi_hao_,xiao_qi_,fa_song_xiao_xi_ from t_sjhxhclrkysdjbzb where xiao_qi_ <> null and xiao_qi_ is not null";
+        String querySql = "select id_,di_dian_,bian_zhi_bu_men_,bian_hao_,ming_cheng_,bian_ma_,pi_hao_,xiao_qi_,fa_song_xiao_xi_ from t_sjhxhclrkysdjbzb where xiao_qi_ <> '' and xiao_qi_ is not null";
         List<Map<String, Object>> list = (List<Map<String, Object>>) commonDao.query(querySql);
         return list;
     }
 
     private List<Map<String, Object>> screening(List<Map<String, Object>> queryParam) {
         List<Map<String, Object>> arrayList = new ArrayList<>();
-        if (BeanUtils.isEmpty(queryParam)) {
+        if (BeanUtils.isNotEmpty(queryParam)) {
             for (Map<String, Object> item : queryParam) {
                 Map<String, Object> map = calculation(item);
-                boolean b = BeanUtils.isEmpty(map);
+                boolean b = BeanUtils.isNotEmpty(map);
                 if (b) {
                     arrayList.add(map);
                 }
@@ -63,7 +63,7 @@ public class ReagentsConsumablesJob  extends AbstractJob {
         }
         try {
             // 2. 获取并验证是否已发送消息
-            String isFs = map.get("fa_song_xiao_xi_").toString();
+            String isFs = map.containsKey("fa_song_xiao_xi_") ? map.get("fa_song_xiao_xi_").toString() : "0";
             if ("1".equals(isFs)) {
                 logger.warn("当前试剂已发送过消息提醒 id=={}", map.get("id_").toString());
                 return null; // 已经发送过消息
@@ -95,16 +95,16 @@ public class ReagentsConsumablesJob  extends AbstractJob {
 
     private Map<String, Object> findAllJSY(Map<String, Object> map) {
         String buMen = map.get("bian_zhi_bu_men_").toString();
-        String sql = "select em.ID_ from ibps_party_employee em join ibps_party_user_role ur on  em.ID_ = ur.USER_ID_ join ibps_party_role ro on ur.ROLE_ID_ = ro.ID_ where ro.ROLE_ALIAS_ = 'jcys' and em.POSITIONS_ like '%%s%%'";
+        String sql = "select em.ID_ from ibps_party_employee em join ibps_party_user_role ur on  em.ID_ = ur.USER_ID_ join ibps_party_role ro on ur.ROLE_ID_ = ro.ID_ where ro.ROLE_ALIAS_ = 'jcys' and em.POSITIONS_ like '%%%s%%'";
         sql = String.format(sql, buMen);
         List<Map<String, Object>> list = (List<Map<String, Object>>) commonDao.query(sql);
-        String result = list.stream().map(m -> m.get("ID").toString()).collect(Collectors.joining(","));
+        String result = list.stream().map(m -> m.get("ID_").toString()).collect(Collectors.joining(","));
         map.put("user", result);
         return map;
     }
 
     private void sendMessage(List<Map<String, Object>> list){
-        if(BeanUtils.isEmpty(list)){
+        if(BeanUtils.isNotEmpty(list)){
             for (Map<String,Object> item : list) {
                 //转换接收人
                 String user = item.get("user").toString();
@@ -117,6 +117,8 @@ public class ReagentsConsumablesJob  extends AbstractJob {
                                  "的试剂耗材即将过期，请及时处理";
                 MessageQueueProductorUtil.send("ReagentsConsumablesJob", "system" , "inner"
                         , receiver,null , title, neiRong, null, null, null);
+                //发消息后在改数据状态
+                commonDao.execute("update t_sjhxhclrkysdjbzb set fa_song_xiao_xi_='1' where id_= '" + item.get("id_").toString() + "'");
             }
         }