去掉老系统接口代理...

潘钊
1 parent 5acbd6d6
Showing 13 changed files with 38 additions and 451 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/controller/Line2SystemController.java
src/main/java/com/bsth/entity/Line2System.java
src/main/java/com/bsth/redis/ScheduleRedisService.java
src/main/java/com/bsth/repository/Line2SystemRepository.java
src/main/java/com/bsth/server_rs/base_info/line/buffer/LineBufferData.java
src/main/java/com/bsth/server_ws/WebServiceProxy.java
src/main/java/com/bsth/server_ws/attendance/AttendanceServiceSoap.java
src/main/java/com/bsth/server_ws/park_station/CompanyServiceSoap.java
src/main/java/com/bsth/server_ws/waybill/LD_ServiceSoap.java
src/main/java/com/bsth/service/Line2SystemService.java
src/main/java/com/bsth/service/impl/Line2SystemServiceImpl.java
src/main/resources/static/index.html
@@ -3,7 +3,6 @@ package com.bsth;
 import com.bsth.server_rs.schedule.real.thread.SchInOutDataRefreshThread;
 import com.bsth.server_rs.thread.RfidCardInfoPersistenceThread;
-import com.bsth.service.Line2SystemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
@@ -20,8 +19,6 @@ import java.util.concurrent.TimeUnit;
 @Component
 public class StartCommand implements CommandLineRunner{
-	@Autowired
-	Line2SystemService line2SystemService;
 	@Autowired
 	RfidCardInfoPersistenceThread rfidCardInfoPersistenceThread;
@@ -33,9 +30,6 @@ public class StartCommand implements CommandLineRunner{
 	public void run(String... arg0){
 		try {
-			//将增量的线路load到对照清单
-			line2SystemService.loadByLineInfo();
-
 			ScheduledExecutorService sexec = Application.mainServices;
 			//定时将人车卡数据入库
 			sexec.scheduleWithFixedDelay(rfidCardInfoPersistenceThread, 120, 60 * 10, TimeUnit.SECONDS);
-package com.bsth.controller;
-
-import com.bsth.entity.Line2System;
-import com.bsth.service.Line2SystemService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Created by panzhao on 2017/3/14.
- */
-@RestController
-@RequestMapping("/line2System")
-public class Line2SystemController {
-
-    @Autowired
-    Line2SystemService line2SystemService;
-
-    @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public Line2System update(Line2System line2System){
-        return line2SystemService.update(line2System);
-    }
-
-    @RequestMapping("/all")
-    public Iterable<Line2System> findAll(){
-        return line2SystemService.findAll();
-    }
-}
-package com.bsth.entity;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 线路映射到某个系统（新老系统并行时需要这个对照）
- * Created by panzhao on 2017/3/14.
- */
-@Entity
-@Table(name = "interface_line_system_mapp")
-public class Line2System {
-
-    @Id
-    private String lineCode;
-
-    private String lineName;
-
-    /**
-     * 是否从新系统接入数据
-     */
-    private boolean isNew;
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public boolean isNew() {
-        return isNew;
-    }
-
-    public void setNew(boolean aNew) {
-        isNew = aNew;
-    }
-
-    public String getLineName() {
-        return lineName;
-    }
-
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
-    }
-}
@@ -7,7 +7,6 @@ import com.bsth.redis.util.RedisUtils;
 import com.bsth.repository.ScheduleRealInfoRepository;
 import com.bsth.server_rs.base_info.line.Line;
 import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
-import com.bsth.server_ws.WebServiceProxy;
 import com.bsth.util.ConfigUtil;
 import com.bsth.util.ConvertUtil;
 import com.google.common.collect.ArrayListMultimap;
@@ -48,9 +47,6 @@ public class ScheduleRedisService implements CommandLineRunner {
     private RedisTemplate redisTemplate;
     @Autowired
-    WebServiceProxy webServiceProxy;
-
-    @Autowired
     RedisUtils redisUtils;
     static Logger logger = LoggerFactory.getLogger(ScheduleRedisService.class);
@@ -143,7 +139,7 @@ public class ScheduleRedisService implements CommandLineRunner {
      * @param rq
      * @param companyId
      * @return
-     */
+
     public ArrayListMultimap<String, ScheduleRealInfo> findByDateAndGroupByNbbm_bingxing(String rq, String companyId) {
         List<String> lineArray = webServiceProxy.findLinesByCompany_new(companyId);
         ArrayListMultimap<String, ScheduleRealInfo> rs = ArrayListMultimap.create();
@@ -159,7 +155,7 @@ public class ScheduleRedisService implements CommandLineRunner {
             }
         }
         return rs;
-    }
+    }*/
     /**
      * 返回指定日期，公司的实际排班，并按线路_车辆分组
@@ -169,7 +165,7 @@ public class ScheduleRedisService implements CommandLineRunner {
      * @return
      */
     public ArrayListMultimap<String, ScheduleRealInfo> findByDateAndGroupByNbbm(String rq, String companyId) {
-        List<String> lineArray = webServiceProxy.findLinesByCompany(companyId);
+        List<String> lineArray = LineBufferData.findCodesByCompany(companyId);
         ArrayListMultimap<String, ScheduleRealInfo> rs = ArrayListMultimap.create();
         rq = rq.replaceAll("-", "");
@@ -194,7 +190,7 @@ public class ScheduleRedisService implements CommandLineRunner {
      */
     public ArrayListMultimap<String, ScheduleRealInfo> findByDateAndGroupByLine(String rq, String companyId) {
-        List<String> lineArray = webServiceProxy.findLinesByCompany(companyId);
+        List<String> lineArray = LineBufferData.findCodesByCompany(companyId);
         ArrayListMultimap<String, ScheduleRealInfo> rs = ArrayListMultimap.create();
         rq = rq.replaceAll("-", "");
-package com.bsth.repository;
-
-import com.bsth.entity.Line2System;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * Created by panzhao on 2017/3/14.
- */
-@Repository
-public interface Line2SystemRepository extends PagingAndSortingRepository<Line2System, String> {
-
-    @Query(value = "select line_code, name as line_name, 0 as is_new from bsth_c_line where line_code not in(select line_code from interface_line_system_mapp)", nativeQuery = true)
-    List<Line2System> loadByLineInfo();
-}
@@ -8,6 +8,7 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -58,4 +59,13 @@ public class LineBufferData implements CommandLineRunner {
     public void run(String... strings) throws Exception {
         Application.mainServices.scheduleWithFixedDelay(lineRefreshThread, 10, 60 * 60, TimeUnit.SECONDS);
     }
+
+    public static List<String> findCodesByCompany(String company) {
+        List<Line> list = companyListMap.get(company);
+        List<String> codes = new ArrayList<>(list.size());
+
+        for(Line line : list)
+            codes.add(line.getLineCode());
+        return codes;
+    }
 }
-package com.bsth.server_ws;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.bsth.Application;
-import com.bsth.entity.Line2System;
-import com.bsth.old_sys_wsclient.nh_ld.ClsLDInfo;
-import com.bsth.repository.Line2SystemRepository;
-import com.bsth.server_ws.waybill.entity.NH_waybill;
-import com.bsth.service.Line2SystemService;
-import com.bsth.util.ConvertUtil;
-import com.google.common.collect.ArrayListMultimap;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Created by panzhao on 2017/3/15.
- */
-@Component
-@Order(3)
-public class WebServiceProxy implements CommandLineRunner {
-
-    @Autowired
-    JdbcTemplate jdbcTemplate;
-
-    @Autowired
-    FixedRefreshThread fixedRefreshThread;
-
-    /**
-     * 人员线路配置
-     */
-    private static Map<String, String> per_lineMap;
-
-    /**
-     * 线路所属公司映射
-     */
-    private static ArrayListMultimap<String, String> company_linesMap;
-
-    /**
-     * 从老系统获取数据的线路
-     */
-    private static Map<String, Integer> oldSysLines;
-
-    @Autowired
-    Line2SystemRepository line2SystemRepository;
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-
-    /**
-     * 判断是否从新系统获取数据（根据工号）
-     * @param companyId 公司编码
-     * @param workNO 员工号
-     * @return
-     */
-    public static boolean personIsNew(String companyId, String workNO){
-        String lineCode = per_lineMap.get(companyId + "-" + workNO);
-
-        if(StringUtils.isEmpty(lineCode))
-            return false;
-
-        if(oldSysLines.containsKey(lineCode))
-            return false;
-
-        return true;
-    }
-
-    /**
-     * 获取指定公司下的线路清单
-     * @param companyId
-     * @return
-     */
-    public static List<String> findLinesByCompany(String companyId){
-        return company_linesMap.get(companyId);
-    }
-
-    /**
-     * 获取指定公司下 从新系统走的线路清单
-     * @param companyId
-     * @return
-     */
-    public static List<String> findLinesByCompany_new(String companyId){
-        List<String> array = company_linesMap.get(companyId), rs = new ArrayList<>();
-        for(String lineCode : array){
-            if(!oldSysLines.containsKey(lineCode))
-                rs.add(lineCode);
-        }
-        return rs;
-    }
-
-    /**
-     * 是否全部从新系统获取数据
-     * @param companyId
-     * @return
-     */
-    public static boolean isAllNew(String companyId){
-        if(oldSysLines == null || oldSysLines.size() == 0)
-            return true;
-
-        List<String> lines = company_linesMap.get(companyId);
-        List<String> unions = new ConvertUtil().calcUnion(lines, oldSysLines.keySet());
-        if(unions.size() == 0)
-            return true;
-        return false;
-    }
-
-    /**
-     * 合并新老系统的进出场数据
-     * @param newData
-     * @param oldData
-     * @param companyId
-     * @return
-     */
-    public static String[] mergerJccData(String[] newData, String[] oldData, String companyId){
-        if(oldSysLines == null || oldSysLines.size() == 0 || oldData == null)
-            return newData;
-
-        List<String> rs = new ArrayList<>();
-
-        List<String> lines = company_linesMap.get(companyId);
-        //补集，要从新系统出来的数据
-        List<String> comps = new ConvertUtil().calcComplement(lines, oldSysLines.keySet());
-        String lineCode;
-        for(int i = 0; i < newData.length; i ++){
-            lineCode = newData[i].split(",")[1];
-            if(comps.contains(lineCode))
-                rs.add(newData[i]);
-        }
-
-        //从老系统出来的数据
-        for(int i = 0; i < oldData.length; i ++){
-            lineCode = oldData[i].split(",")[1];
-            if(!comps.contains(lineCode))
-                rs.add(oldData[i]);
-        }
-
-        return rs.toArray(new String[rs.size()]);
-    }
-
-
-    @Override
-    public void run(String... strings) throws Exception {
-        Application.mainServices.scheduleWithFixedDelay(fixedRefreshThread, 5, 60 * 30, TimeUnit.SECONDS);
-    }
-
-    /**
-     * 合并新老系统的路单数据
-     * @param value
-     * @param oldArray
-     * @param companyId
-     * @return
-     */
-    public static NH_waybill[] mergerData(NH_waybill[] newArray, ClsLDInfo[] oldArray, String companyId) {
-        if(oldSysLines == null || oldSysLines.size() == 0)
-            return newArray;
-
-        JSONArray jsonArray = new JSONArray();
-        List<String> lines = company_linesMap.get(companyId);
-        //补集，要从新系统出来的数据
-        List<String> comps = new ConvertUtil().calcComplement(lines, oldSysLines.keySet());
-        String lineCode;
-        for(int i = 0; i < newArray.length; i ++){
-            lineCode = newArray[i].getM_strXLBM();
-            if(comps.contains(lineCode))
-                jsonArray.add(JSON.toJSON(newArray[i]));
-        }
-
-        //从老系统出来的数据
-        for(int i = 0; i < oldArray.length; i ++){
-            lineCode = oldArray[i].getM_strXLBM();
-            if(!comps.contains(lineCode))
-                jsonArray.add(JSON.toJSON(oldArray[i]));
-        }
-
-        //将jsonArray 转换成 NH_waybill[]
-        NH_waybill[] rs = new NH_waybill[jsonArray.size()];
-        List<NH_waybill> list = JSONArray.parseArray(jsonArray.toJSONString(), NH_waybill.class);
-        rs = list.toArray(rs);
-        return rs;
-    }
-
-    @Component
-    public class FixedRefreshThread extends Thread{
-
-        @Autowired
-        WebServiceProxy webServiceProxy;
-
-        @Override
-        public void run() {
-            webServiceProxy.refreshData();
-        }
-    }
-
-    @Autowired
-    Line2SystemService line2SystemService;
-
-    public void refreshData() {
-        line2SystemService.loadByLineInfo();
-        List<Map<String, Object>> list = jdbcTemplate.queryForList("select p.JOB_CODE,L.LINE_CODE from bsth_c_s_ecinfo c left join bsth_c_personnel p on c.jsy=p.id left join bsth_c_line L on c.xl=L.id where c.is_cancel=0 ");
-        Map<String, String> plMap = new HashMap<>();
-        for (Map<String, Object> map : list) {
-            try {
-                plMap.put(map.get("JOB_CODE").toString(), map.get("LINE_CODE").toString());
-            } catch (NullPointerException e) {
-                logger.error("", e);
-            }
-        }
-        per_lineMap = plMap;
-
-        list = jdbcTemplate.queryForList("select LINE_CODE,COMPANY from bsth_c_line");
-        ArrayListMultimap<String, String> multimap = ArrayListMultimap.create();
-        for (Map<String, Object> map : list) {
-            try {
-                multimap.put(map.get("COMPANY").toString(), map.get("LINE_CODE").toString());
-            } catch (NullPointerException e) {
-                logger.error("", e);
-            }
-        }
-        company_linesMap = multimap;
-
-        Iterator<Line2System> iterator = line2SystemRepository.findAll().iterator();
-        Map<String, Integer> oldSysLinesMap = new HashMap<>();
-        Line2System line2Sys;
-        while(iterator.hasNext()){
-            line2Sys = iterator.next();
-            if(!line2Sys.isNew())
-                oldSysLinesMap.put(line2Sys.getLineCode(), 1);
-        }
-        oldSysLines = oldSysLinesMap;
-    }
-
-    public void update(Line2System line2System){
-        if(line2System.isNew())
-            oldSysLines.remove(line2System.getLineCode());
-        else
-            oldSysLines.put(line2System.getLineCode(), 1);
-    }
-}
@@ -4,7 +4,7 @@ import com.bsth.entity.SchedulePlanInfo;
 import com.bsth.entity.ScheduleRealInfo;
 import com.bsth.redis.PlanScheduleRedisService;
 import com.bsth.redis.ScheduleRedisService;
-import com.bsth.server_ws.WebServiceProxy;
+import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
 import com.bsth.server_ws.attendance.entity.Jsy_attendance;
 import com.bsth.server_ws.util.WSDataConver;
 import com.bsth.service.DDYAuthorityService;
@@ -50,10 +50,8 @@ public class AttendanceServiceSoap implements AttendanceService, ApplicationCont
                 return false;
             }
-            //该调度员分管的线路
-            //List<String> lineArray = ddyAuthorityService.findLinesByDDY(ddy_id);
             //按公司编码获取线路
-            List<String> lineArray = WebServiceProxy.findLinesByCompany(company);
+            List<String> lineArray = LineBufferData.findCodesByCompany(company);
             //计划排班
             List<SchedulePlanInfo> plans = planScheduleRedisService.findByMultiLine(lineArray, rq);
             //实际排班
 package com.bsth.server_ws.park_station;
 import com.bsth.entity.ScheduleRealInfo;
-import com.bsth.old_sys_wsclient.OldWSClient;
-import com.bsth.server_ws.WebServiceProxy;
 import com.bsth.server_ws.util.Constants;
 import com.bsth.server_ws.util.ControlHttpUtils;
 import com.bsth.server_ws.util.WSDataConver;
@@ -50,11 +48,12 @@ public class CompanyServiceSoap implements CompanyService {
         }
         result.value = WSDataConver.to_returnJCCInfo(list);
-        if(!WebServiceProxy.isAllNew(companyId)){
+        //不再代理老接口数据
+        /*if(!WebServiceProxy.isAllNew(companyId)){
             String[] oldArray = OldWSClient.returnCCInfo(companyId, rq);
             //合并新老系统的数据
             result.value = WebServiceProxy.mergerJccData(result.value, oldArray, companyId);
-        }
+        }*/
         return true;
     }
@@ -76,11 +75,12 @@ public class CompanyServiceSoap implements CompanyService {
         }
         result.value = WSDataConver.to_returnJCCInfo(list);
-        if(!WebServiceProxy.isAllNew(companyId)){
+        //不再代理老接口数据
+        /*if(!WebServiceProxy.isAllNew(companyId)){
             String[] oldArray = OldWSClient.returnJCInfo(companyId, rq);
             //合并新老系统的数据
             result.value = WebServiceProxy.mergerJccData(result.value, oldArray, companyId);
-        }
+        }*/
         return true;
     }
@@ -90,23 +90,16 @@ public class CompanyServiceSoap implements CompanyService {
     public boolean getCurrentDayPlan(String ip, String userName, String password, String workId, String company, Holder<String[]> result, Holder<String> fError) {
         try{
             logger.info("getCurrentDayPlan workId: " + workId);
-            if(WebServiceProxy.personIsNew(company, workId)){
-
-                List<ScheduleRealInfo> list = null;
-                try{
-                    //从调度系统获取数据
-                    list = ControlHttpUtils.getCurrentDayPlan(company, workId);
-                    logger.info("从调度系统获取到数据 size: " + list.size());
-                }catch (Exception e){
-                    //访问调度系统异常，尝试从数据库获取
-                    logger.error("", e);
-                }
-                result.value = WSDataConver.to_getCurrentDayPlan(list);
-            }
-            else{
-                result.value = OldWSClient.getCurrentDayPlan(workId, company);
-                logger.info("从老系统获取size: " + result.value.length);
+            List<ScheduleRealInfo> list = null;
+            try{
+                //从调度系统获取数据
+                list = ControlHttpUtils.getCurrentDayPlan(company, workId);
+                logger.info("从调度系统获取到数据 size: " + list.size());
+            }catch (Exception e){
+                //访问调度系统异常，尝试从数据库获取
+                logger.error("", e);
             }
+            result.value = WSDataConver.to_getCurrentDayPlan(list);
         }catch(Exception e){
             fError.value = e.getMessage();
             logger.error("", e);
@@ -3,17 +3,14 @@ package com.bsth.server_ws.waybill;
 import com.bsth.entity.DutyEmployee;
 import com.bsth.entity.OilInfo;
 import com.bsth.entity.ScheduleRealInfo;
-import com.bsth.old_sys_wsclient.OldWSClient;
-import com.bsth.old_sys_wsclient.nh_ld.ClsLDInfo;
 import com.bsth.redis.OilRedisService;
 import com.bsth.redis.ScheduleRedisService;
 import com.bsth.repository.DutyEmployeeRepository;
-import com.bsth.service.UserService;
-import com.bsth.server_ws.WebServiceProxy;
 import com.bsth.server_ws.util.WSDataConver;
 import com.bsth.server_ws.waybill.entity.NH_waybill;
 import com.bsth.server_ws.waybill.entity.SN_lossMileage;
 import com.bsth.server_ws.waybill.entity.SN_waybill;
+import com.bsth.service.UserService;
 import com.google.common.collect.ArrayListMultimap;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -64,7 +61,7 @@ public class LD_ServiceSoap implements LD_Service, ApplicationContextAware {
             String prveRq = fmtyyyyMMdd.print(fmtyyyyMMdd.parseDateTime(rq).minusDays(1));
             //实际排班
-            ArrayListMultimap<String, ScheduleRealInfo> listMap = scheduleRedisService.findByDateAndGroupByNbbm_bingxing(prveRq, companyId);
+            ArrayListMultimap<String, ScheduleRealInfo> listMap = scheduleRedisService.findByDateAndGroupByNbbm(prveRq, companyId);
             //油耗信息
             Map<String, OilInfo> oilInfoMap = oilRedisService.findByNbbmGroup(listMap.keySet(), prveRq);
             //当班调派
@@ -74,11 +71,12 @@ public class LD_ServiceSoap implements LD_Service, ApplicationContextAware {
             NH_waybill[] array = WSDataConver.to_waybill_NH(listMap, oilInfoMap, des);
             result.value = array;
-            if(companyId.equals("26") && !WebServiceProxy.isAllNew(companyId)){
+            //不再代理老接口数据
+            /*if(companyId.equals("26") && !WebServiceProxy.isAllNew(companyId)){
                 ClsLDInfo[] oldArray = OldWSClient.getNH_LD(companyId, rq);
                 //合并新老系统的数据
                 result.value = WebServiceProxy.mergerData(result.value, oldArray, companyId);
-            }
+            }*/
         } catch (Exception e) {
             logger.error("", e);
             fError.value = "服务器出现异常！";
-package com.bsth.service;
-
-import com.bsth.entity.Line2System;
-
-/**
- * Created by panzhao on 2017/3/14.
- */
-public interface Line2SystemService {
-
-    Line2System update(Line2System line2Sys);
-
-    Iterable<Line2System> findAll();
-
-    /**
-     * 从线路表加载增量的线路
-     */
-    void loadByLineInfo();
-}
-package com.bsth.service.impl;
-
-import com.bsth.entity.Line2System;
-import com.bsth.repository.Line2SystemRepository;
-import com.bsth.service.Line2SystemService;
-import com.bsth.server_ws.WebServiceProxy;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * Created by panzhao on 2017/3/14.
- */
-@Service
-public class Line2SystemServiceImpl implements Line2SystemService {
-
-    @Autowired
-    Line2SystemRepository line2SystemRepository;
-
-    @Autowired
-    WebServiceProxy webServiceProxy;
-
-    @Override
-    public Line2System update(Line2System line2Sys) {
-        Line2System line2System = line2SystemRepository.save(line2Sys);
-        webServiceProxy.update(line2System);
-        return line2System;
-    }
-
-    @Override
-    public Iterable<Line2System> findAll() {
-        return line2SystemRepository.findAll();
-    }
-
-    @Override
-    public void loadByLineInfo() {
-        List<Line2System> list = line2SystemRepository.loadByLineInfo();
-        if(list != null && list.size() > 0)
-            line2SystemRepository.save(list);
-    }
-}
@@ -147,7 +147,7 @@
     //线路清单
     !function () {
         var f = arguments.callee;
-        $.get('/line2System/all', function (list) {
+/*        $.get('/line2System/all', function (list) {
             list.sort(function (a, b) {
                 return b.new - a.new;
             });
@@ -171,7 +171,7 @@
                     $tr.attr('class', rs.new ? 'warning' : '');
                 });
             });
-        });
+        });*/
     }();
 </script>