Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/bioreader/dwr/table/BioreaderTableManager.java =================================================================== diff -u -r35940 -r35944 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/bioreader/dwr/table/BioreaderTableManager.java (.../BioreaderTableManager.java) (revision 35940) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/bioreader/dwr/table/BioreaderTableManager.java (.../BioreaderTableManager.java) (revision 35944) @@ -1,24 +1,17 @@ package com.forgon.disinfectsystem.sterilizationmanager.bioreader.dwr.table; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; -import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; -import org.quartz.Job; -import org.quartz.SchedulerException; import com.forgon.component.grid.GridManager; import com.forgon.disinfectsystem.entity.basedatamanager.bioreader.Bioreader; -import com.forgon.disinfectsystem.entity.basedatamanager.scheduledTask.ScheduledTask; import com.forgon.tools.hibernate.ObjectDao; -import com.forgon.tools.util.SchedulerUtils; public class BioreaderTableManager { @@ -45,43 +38,6 @@ return gridManager.renderGrid(parameterMap, Bioreader.class .getSimpleName(), sql, new String[] {}); } - public String findScheduledTaskTableList(Map> parameterMap) { - Map sqlWhereParamMap = gridManager - .getParamFromView(parameterMap); - //String bioreaderSearch = sqlWhereParamMap.get("bioreaderSearch"); - String sql = "where 1=1 "; - String json = gridManager.renderGrid(parameterMap, ScheduledTask.class - .getSimpleName(), sql, new String[] {}); - - return updateResult(json); - } - private String updateResult(String json){ - JSONObject jsonObject = JSONObject.fromObject(json); - if(jsonObject == null){ - return json; - } - JSONArray jsonArray = jsonObject.optJSONArray("rows"); - if (jsonArray == null || jsonArray.size() == 0) { - return json; - } - Set triggerNames = null; - try { - triggerNames = SchedulerUtils.getAllTriggerName(); - } catch (SchedulerException e) { - e.printStackTrace(); - } - for (int i=0 ; i < jsonArray.size() ; i++) { - JSONObject rowObject = jsonArray.getJSONObject(i); - String name = rowObject.optString("name"); - if(triggerNames.contains(name)){ - rowObject.put("runningState", "运行中"); - }else{ - rowObject.put("runningState", "未运行"); - } - } - System.out.println(jsonObject.toString()); - return jsonObject.toString(); - } /** * 通过灭菌炉名称获取灭菌炉绑定的生物阅读器 * @param sterilizerName 灭菌炉名称