代码review

src/com/ejweb/modules/sailing/service/SailingCommandService.java

@@ -104,11 +104,7 @@ public class SailingCommandService extends CurdService<SailingCommandDao, Sailin
         if (pageInfo.getPages() < bean.getPageNo()) {// 页码大于总页数，则返回NULL
             return null;
         }
-//        List<SailingCommandEntity> products = pageInfo.getList();
-//        if (products == null || products.size() == 0) {// 如果没有数据则返回NULL
-//            return null;
-//        }
-        
+
         List<SailingCommandEntity> list = pageInfo.getList();
         if (list == null || list.size() == 0) {// 如果没有数据则返回NULL
             return null;
@@ -201,7 +197,6 @@ public class SailingCommandService extends CurdService<SailingCommandDao, Sailin
                    case "04": sb.append("条件满足");
                    break;
                    }
-                  // sb.append(route.getVerifyStatus());
                    sb.append("</td></tr><tr>");
                    sb.append("<td height=\"104\" width=\"172\">备注、注意事项</td>");
                    sb.append("<td>");
@@ -602,7 +597,6 @@ public class SailingCommandService extends CurdService<SailingCommandDao, Sailin
                 // TODO: handle exception
             }
 
-            // }
 
             dao.updateAirlineverify(bean);
 
@@ -655,19 +649,6 @@ public class SailingCommandService extends CurdService<SailingCommandDao, Sailin
             map1.put("depName", PlanUtil.GetLine(map1.get("depName"), map1.get("arrName"), map1.get("roundtripType"), map1.get("vertype")));
             map1.put("depIata", PlanUtil.GetLine(map1.get("depIata"), map1.get("arrIata"), map1.get("roundtripType"), map1.get("vertype")));
         }
-//        String CommandStatus=dao.CommandStatus(bean);
-//        if("02".equals(CommandStatus)){
-//            return false;
-//        }
-//        if("01".equals(CommandStatus)&&"01".equals(bean.getCommandStatus())){
-//            return false;
-//        }
-//        if("01".equals(bean.getCommandStatus())||"02".equals(bean.getCommandStatus())){
-//            //commandStatus为’01’时，以verifId找到foc_airline_verify对应数据中的verif_status设置为02
-//            bean.setVerifStatus("02");
-//          dao.updateVerifStatys(bean);
-//        }
-//         if(!"00".equals(bean.getCommandStatus())){
         // 该input标签不一定以 / 结尾
         Pattern pattern = Pattern.compile("(?<=routeNo\" value=\")(.+?)(?=\"/?>)");
         Matcher matcher = pattern.matcher(bean.getSailingText());
@@ -834,10 +815,6 @@ public class SailingCommandService extends CurdService<SailingCommandDao, Sailin
             sb.append("<br>");
 
             sb.append(bean.getConRemarks().replaceAll("<table", "<table width=\"80%\" "));
-            // sb.append(bean.getConRemarks());
-                    
-                  /*  sb.append("<br/><h2>开航指令:</h2>");
-                    sb.append(bean.getFormText());*/
             sb.append("<br/><h2>各部门论证单:</h2>");
             String text = bean.getVerifyText().replaceAll("<table", "<table width=\"80%\" ");
             text = text.replaceAll("100%", "80%");
@@ -882,7 +859,6 @@ public class SailingCommandService extends CurdService<SailingCommandDao, Sailin
             SailingCmFileBean sailingFileBean = new SailingCmFileBean();
             sailingFileBean.setId(IdWorker.getNextId());
             sailingFileBean.setFileName("北京首都航空关于使用" + map1.get("aircraftLabel") + "机型执行" + map1.get("depName") + map1.get("verifType") + "航线的开航指令(" + routeNo + ").doc");
-            //   sailingFileBean.setFileName(map1.get("verifType")+map1.get("depName")+"开航指令.doc");
             sailingFileBean.setExtesion(uploadFileBean.getExtesion());
             sailingFileBean.setMd5(uploadFileBean.getMd5());
             sailingFileBean.setFilePath(uploadFileBean.getPath());
@@ -895,48 +871,14 @@ public class SailingCommandService extends CurdService<SailingCommandDao, Sailin
             // TODO: handle exception
         }
 
-//           }
 
         dao.updateAirlineverify(bean);
-
-
-        // 获取论证全部参与部门
-//           List<String> lst=dao.getVerifDeparts(bean.getVerifId());       
-//           for(String departId:lst){
-//               NotifyAddBean addbean = new NotifyAddBean();
-//               StringBuffer sb = new StringBuffer();
-//          
-//            sb.append("论证单号为").append(map1.get("verifNo"))
-//            .append(map1.get("verifType")).append(map1.get("depName")).append("的航线已生成开航指令。");
-//            StringBuffer url=new StringBuffer();
-//            url.append("<<<a href='airway-argument-details.htm?verifId=").append(bean.getVerifId());
-//            url.append("&verifNo=").append(map1.get("verifNo"));
-//            url.append("&sailingDate=").append(map1.get("startTime"));
-//            url.append("'>点击查看</a>");
-//            addbean.setUrl(url.toString());
-//            addbean.setType("14");
-//            addbean.setContent(sb.toString());
-//            addbean.setTitle("开航指令下发完成提醒");
-//            addbean.setCreateBy(bean.getUserCode());
-//            addbean.setUpdateBy(bean.getUserCode());
-//            addbean.setCreateDate(new Date());
-//            addbean.setUpdateDate(new Date());
-//            addbean.setId(IdWorker.getNextId());
-//            addbean.setDepartId(departId);
-//            addbean.setVerifId(bean.getVerifId());
-//            addbean.setConId(bean.getVerifId());
-//            notifyDao.saveNotify(addbean);
-//           }
-//        }
         dao.updateSailingCommand(bean);
         return true;
 
     }
 
-    public static void main(String[] args) {
-        System.out.println(getLastDate("2017-08"));
-    }
-    
+
     private static String getLastDate(String datestr) {
     	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
     	Date date = null;
@@ -988,32 +930,10 @@ public class SailingCommandService extends CurdService<SailingCommandDao, Sailin
         }else{
             routeNo = routeNoFrex + String.format("%03d", Integer.valueOf(routeNo) + 1);
         }
-        //routeNo = getVeriNo(routeNoFrex, dao.findRouteNo(sailingCommandEntity), sailingCommandEntity, year, verifType);
         return routeNo;
     }
     
-/*    public String getVeriNo(String frex, String no, SailingCommandEntity entity, String year,String verifType) {
-        if (StringUtils.isEmpty(no)) {
-            // 去foc_startno表中查询
-            if ("2016".equals(year)) {
-                entity.setVerifType(verifType);
-                FocStartnoEntity focStartnoEntity = dao.findInitRouteNo(entity);
-                if("08".equals(verifType)){
-                    no = focStartnoEntity.getRouteNo();  
-                }else{
-                    no = focStartnoEntity.getTrainrouteNo();  
-                }
-              
-            }else{
-                no += frex +"001";
-            }
-        } else {
-            // 获取最大值+1
-            no = frex + String.format("%03d", Integer.valueOf(no) + 1);
-        }
-        return no;
-    }*/
-    
+
     public List<Map<String, String>> getCommandFile(SailingCmDetailBean bean) {
         // TODO Auto-generated method stub
         List<Map<String, String>> list=dao.getCommandFile(bean);

src/com/ejweb/modules/verify/service/AirlineVerifiedService.java

@@ -299,7 +299,7 @@ public class AirlineVerifiedService extends BaseService<AirlineVerifiedDao> {
                             addbean.setConId(bean.getVerifId());
                             notifyDao.saveNotify(addbean);
                         }
-                        SendMail(bean,verifNo);
+//                        SendMail(bean,verifNo);
                     }
                     
                     // 插入foc_route_verify 数据，开始待论证航线阶段
@@ -417,7 +417,7 @@ public class AirlineVerifiedService extends BaseService<AirlineVerifiedDao> {
      * 论证超期提醒邮件
      * @author zhanglg
      * @time  2016年12月4日
-     * @param verifId
+     * @param verifNo
      * @param departNames
      */
     
@@ -461,11 +461,9 @@ public class AirlineVerifiedService extends BaseService<AirlineVerifiedDao> {
      * 风险评估邮件
      * @author zhanglg
      * @time  2016年10月31日
-     * @param bean
-     * @param verifNo 
      */
     
-    private void SendMail(AirlineVerifiedAddBean bean, String verifNo) {
+//    private void SendMail(AirlineVerifiedAddBean bean, String verifNo) {
 /*        List<String> mails=  verifyDao.getmail("8");
         if(mails==null||mails.size()==0)return;
         String templateName = "template_8.ftl";
@@ -501,7 +499,7 @@ public class AirlineVerifiedService extends BaseService<AirlineVerifiedDao> {
         }*/
         
         
-    }
+//    }
     @Transactional(readOnly = false)
     public String updateAndGenertVeriNo(String verifType) {
         DateFormat df = new SimpleDateFormat("yyyy");
@@ -539,37 +537,9 @@ public class AirlineVerifiedService extends BaseService<AirlineVerifiedDao> {
         }else{
             verifNo = verifNoFrex + String.format("%03d", Integer.valueOf(verifNo) + 1);
         }
-      //  verifNo = getVeriNo(verifNoFrex, verifNo, entity, year, verifType);
         return verifNo;
     }
 
- /*   public String getVeriNo(String verifNoFrex, String verifNo, AirlineVerifyEntity entity, String year,
-            String verifType) {
-        if (StringUtils.isEmpty(verifNo)) {
-            // 去foc_startno表中查询
-            if ("2016".equals(year)) {
-                entity.setVerifType("01");
-                FocStartnoEntity focStartnoEntity = dao.findInitVerifNo(entity);
-                if ("03".equals(verifType) || "04".equals(verifType)) {
-                    verifNo = focStartnoEntity.getRestartNo();
-                } else if ("08".equals(verifType)) {
-                    verifNo = focStartnoEntity.getTrainNo();
-                } else {
-                    verifNo = focStartnoEntity.getStartNo();
-                }
-
-            }
-        } else {
-            // 获取最大值+1
-            if(verifNo==null){
-                verifNo = verifNoFrex + "001";
-            }
-            else{
-                verifNo = verifNoFrex + String.format("%03d", Integer.valueOf(verifNo) + 1);
-            }
-        }
-        return verifNo;
-    }*/
 
     /**
      * 

src/com/ejweb/modules/verify/service/AirlineVerifyService.java

@@ -132,11 +132,7 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao>{
 		PageInfo<com.ejweb.modules.route.entity.AirlineVerifyEntity> pageInfo = null;
         // 必须紧贴dao的查询方法
         PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
-/*        if(StringUtils.isNotBlank(bean.getSort()))
-        	PageHelper.orderBy(bean.getSort());
-        else
-        	PageHelper.orderBy("apply_no desc");*/
-        
+
         PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
         if(StringUtils.isEmpty(bean.getSort())){
             PageHelper.orderBy(" verifNo DESC");
@@ -170,7 +166,6 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao>{
             String typelist=dao.getTypeList1(entity.getVerifId());
             if(StringUtils.isNoneBlank(typelist))
                 entity.setAircraftName(entity.getAircraftName()+":"+typelist);
-       //     entity.setConnect(dao.getConnectList(entity.getVerifId()));
         }
         PageEntity<com.ejweb.modules.route.entity.AirlineVerifyEntity> page = new PageEntity<com.ejweb.modules.route.entity.AirlineVerifyEntity>();
         page.setPageNo(pageInfo.getPageNum());
@@ -289,11 +284,9 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen
 
 	@Transactional(readOnly = false)
 	public void insert(AirlineVerifyAddBean bean) {
-		//bean.setId(IdWorker.getNextId());
 		bean.setVerifiedId(IdWorker.getNextId());
 		int curYear = new GregorianCalendar().get(Calendar.YEAR);
 		String applyNoPre = "SQ" + curYear;
-		//String verifyMaxApplyNo = dao.getMaxApplyNo(applyNoPre);
 		String applyNo = null;
 		  applyNo = dao.getStartNoApplyNo(applyNoPre);
 		if(applyNo != null ){
@@ -416,9 +409,6 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen
             dao.insertConnects(bean);
         }
 		if (bean.getVerifyFile() != null && bean.getVerifyFile().size() > 0) {
-//		    for (VerifyFile verifyFile : bean.getVerifyFile()) {
-//	            verifyFile.setId(IdWorker.getNextId());
-//	        }
 		    dao.insertFiles(bean);
 		}
 		if (bean.getAirTypes() != null && bean.getAirTypes().size() > 0) {
@@ -621,46 +611,7 @@ public List<com.ejweb.modules.route.entity.AirlineVerifyEntity> getRiskAssessmen
 
     }
 
-    public static void main(String[] args) throws IOException, TemplateException {
-        String f=null;
-        StringBuffer sb1=new StringBuffer();
-        sb1.append("---");
-        sb1.append(f);
-        sb1.append("===");
-        
-        sb1.append(f==null?"":f);
-        System.out.println(sb1.toString());
-/*       String str= "0.958333333333333";
-       Double d18=Double.parseDouble(str);
-       if(d18<1){
-           Double hh=d18*24;
-           int m=(int) (d18*24*60);
-         
-           int h=m/60;
-           m=m%60;
-           if(hh-h>0.999){
-               h++;
-               m=0;
-           }
-           System.out.println(String.format("%02d", h)+":"+String.format("%02d", m)); 
-       }*/
-     /*   List<String> mails=new ArrayList<String>();
-        mails.add("271288528@qq.com");
-        VerifyEmailHandler.getInstance().sendEmail("论证提交申请审核", "测试机哦",mails);
-        List<String> mails=new ArrayList<String>();
-        mails.add("271288528@qq.com");
-        String templateName = "template_1.ftl";
-        Map<String, String> map=new HashMap<String, String>();
-       map.put("url", "https://ifos.jdair.net/im/login");
-        map.put("departName","11");
-        map.put("aircraftLabel","22");
-        map.put("depName","33");
-        map.put("applyNo","44");
-        map.put("startTime","2014-12-11");
-     //   sendMail("804158717588275200");
-       VerifyEmailHandler.getInstance().sendEmail("论证提交申请审核", com.ejweb.core.util.TemplateFactory.generateHtmlFromFtl(templateName, map), mails);*/
-        }
-    
+
     public Map<String, String> airline(String verifId) {
         Map<String, String> map=dao.getDetail(verifId);
         map.put("depName", PlanUtil.GetLine(map.get("depName"),map.get("arrName"),map.get("roundtripType"),map.get("vertype")));

src/com/ejweb/modules/verify/service/ConditionService.java

@@ -79,8 +79,8 @@ public class ConditionService  extends BaseService<ConditionDao>{
               
                 List<Map<String, String>> list1= verifyDao.getConnectList(entity.getVerifId());
                 List<Map<String, String>> list2=new ArrayList<Map<String, String>>();
-                for(Map<String, String> map:list1){
-                    Map<String, String> map2=new HashMap<String, String>();
+            Map<String, String> map2=new HashMap<String, String>();
+            for(Map<String, String> map:list1){
                     map2.put("flightNo", map.get("flightNo"));
                     map2.put("depIata", map.get("depIata"));
                     map2.put("arrIata", map.get("arrIata"));
@@ -215,4 +215,5 @@ public class ConditionService  extends BaseService<ConditionDao>{
             e.printStackTrace();
         }
     }
+
 }

src/com/ejweb/modules/verify/service/VerifyFeedbackService.java

@@ -52,8 +52,7 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao>{
             List<VerifyFeedbackEntity>  list=dao.findlist3(bean);
            
             pageInfo = new PageInfo<VerifyFeedbackEntity>(list);
-      //  }
-       
+
         
         if(pageInfo.getPages()<bean.getPageNo()){// 页码大于总页数，则返回NULL
             return null;
@@ -79,7 +78,6 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao>{
             String typelist=verifyDao.getTypeList1(entity.getVerifId());
             if(StringUtils.isNoneBlank(typelist))
                 entity.setAircraftName(entity.getAircraftName()+":"+typelist);
-        //    entity.setConnect(verifyDao.getConnectList(entity.getVerifId()));
 
         }
         PageEntity<VerifyFeedbackEntity> page = new PageEntity<VerifyFeedbackEntity>();
@@ -110,7 +108,7 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao>{
     public FullRouteVerifyEntity checkRouteVerifyExist(VerifyFeedbackUpdateBean bean){
         FullRouteVerifyEntity fullRouteVerifyEntity = dao.checkRouteVerifyExist(bean);
         if(fullRouteVerifyEntity == null)
-            throw new RecordNotExistException("updateRemote 方法不存咋verif_id:" + bean);
+            throw new RecordNotExistException("updateRemote 方法不存在verify_id:" + bean);
         return fullRouteVerifyEntity;
     }
     public Boolean updateFeedback(VerifyFeedbackUpdateBean bean){

src/com/ejweb/modules/verify/service/VerifyManageService.java

@@ -140,13 +140,6 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
     }
     @Transactional(readOnly = false)
     public void delete(String VerifId){
-   //     dao.deleteRiskFile(VerifId);
-      //  dao.deleteRouteFile(VerifId);
-        /*String[] nameList={"foc_change_extend","foc_verify_record","foc_production_feedback",
-                           "foc_production_command","foc_sailing_file","foc_sailing_command",
-                           "foc_sailingcc_file", "foc_sailing_conclusion", "foc_conclusion_file","foc_airline_conclusion",
-                           "foc_condition_feedback","foc_verify_condition",                      
-                           "foc_production_command","foc_risk_assessment"};*/
 
             VerifyManageDeleteBean bean=new VerifyManageDeleteBean();
             bean.setVerifId(VerifId);
@@ -162,28 +155,8 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
             dao.delete_airline_conclusion(bean);
             dao.delete_condition_feedback(bean);
             dao.delete_verify_condition(bean);
-          //  dao.delete_risk_assessment(bean);
-//            dao.update_risk_assessment(bean);//不需要将风险评估删掉
 
     }
-/*    @Transactional(readOnly = false)
-    public void delete(String VerifId,String tableName) {
-        VerifyManageDeleteBean bean=new VerifyManageDeleteBean();
-        bean.setTableName(tableName);
-        bean.setVerifId(VerifId);
-        dao.delete(bean);
-    }*/
-/*    @Transactional(readOnly = false)
-    public void  deleteNoCheck(String verifId, String tableName, String delFlag) {
-
-
-        VerifyManageDeleteBean bean=new VerifyManageDeleteBean();
-           bean.setDelFlag(delFlag);
-            bean.setTableName(tableName);
-            bean.setVerifId(verifId);
-            dao.delete(bean);
-        
-    }*/
     @Transactional(readOnly = false)
     public void delete_verify_file(String verifId, String tableName, String delFlag) {
 
@@ -218,18 +191,6 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
         
     }
     
-/*    @Transactional(readOnly = false)
-    public void  updateCheck(String verifId, String tableName, String delFlagFrom, String delFlagTo) {
-
-
-        ManageUpdateBean bean=new ManageUpdateBean();
-           bean.setDelFlagFrom(delFlagFrom);
-            bean.setTableName(tableName);
-            bean.setVerifId(verifId);
-            bean.setDelFlagTo(delFlagTo);
-            dao.updateCheck(bean);
-        
-    }*/
     @Transactional(readOnly = false)
     public void update_verify_file(String verifId, String tableName, String delFlagFrom, String delFlagTo) {
         ManageUpdateBean bean=new ManageUpdateBean();
@@ -308,7 +269,6 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
       //发送审核
         AirlineVerifyDetailBean verifybean=new AirlineVerifyDetailBean();
         verifybean.setVerifId(bean.getId());
-       // AirlineVerifyDetailEntity VerifyDetailEntity=verifyDao.get(verifybean);
         NotifyAddBean addbean=new NotifyAddBean();
         StringBuffer sb=new StringBuffer();
         Map<String, String> map=verifyDao.getDetail(bean.getId());
@@ -373,7 +333,6 @@ public void updateRecord(VerifyManageDetailEntity bean) {
     List<String> list2= new ArrayList<String>();
     for(AirType type :list){
         list2.add(type.getTypeId());
-     // sb.append(type.getTypeId()).append(",");
     }
     if(list2.size()!=list1.size()){
         change=true;
@@ -405,12 +364,6 @@ public void updateRecord(VerifyManageDetailEntity bean) {
     }
     if(change){
        
-    /*  for(String str:list1){
-          to.append(str).append(",");
-      }
-      for(AirType type :list){
-          sb.append(type.getTypeId()).append(",");
-      }*/
         if(list1.size()>0){
             add.setEditFrom(dao.getTypeName(list1));
         }