change

kongzy

2024-07-01 47a751cb301d05276ae5d75145d57b2d090fe4e1

 src/main/java/com/nanometer/smartlab/controller/SysAlarmsController.java

@@ -1,6 +1,7 @@
package com.nanometer.smartlab.controller;

import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -23,14 +24,14 @@
@Controller
@Scope("session")
public class SysAlarmsController extends BaseController  {
	

   /**
    * 
    *
    */
   private static final long serialVersionUID = 8009757365735077055L;

   private static Logger logger = Logger.getLogger(SysAlarmsController.class);
	

   @Resource
   private SysAlarmService sysAlarmService;
    @Resource
@@ -40,13 +41,13 @@
   private String containerCode;
    private Timestamp startTime;
    private Timestamp endTime;
    
    


    public LazyDataModel<SysAlarm> getDataModel() {
        if (this.dataModel == null) {
            this.dataModel = new LazyDataModel<SysAlarm>() {
                /**
             * 
             *
             */
            private static final long serialVersionUID = 1L;

@@ -67,16 +68,16 @@

                @Override
                public SysAlarm getRowData(String rowKey) {
                    Iterator<SysAlarm> iterator = this.iterator();
                    if (iterator != null) {
                       SysAlarm oa = null;
                        while (iterator.hasNext()) {
                            oa = iterator.next();
                            if (rowKey.equals(oa.getId())) {
                                return oa;
                            }
                        }
                    }
//                    Iterator<SysAlarm> iterator = this.iterator();
//                    if (iterator != null) {
//                       SysAlarm oa = null;
//                        while (iterator.hasNext()) {
//                            oa = iterator.next();
//                            if (rowKey.equals(oa.getId())) {
//                                return oa;
//                            }
//                        }
//                    }
                    return null;
                }
            };
@@ -128,6 +129,6 @@
   public void setDataModel(LazyDataModel<SysAlarm> dataModel) {
      this.dataModel = dataModel;
   }
    
    


}