框架更新
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
whycrzg
2021-02-23 351b9a53cb9ecebdf8f79db0117f540d9c42c2a4 
 src/main/java/com/fgkj/services/User_taskService.java


@@ -5,6 +5,8 @@


import com.fgkj.mapper.CreatClass;


import com.fgkj.mapper.UtilityFactory;


import com.fgkj.mapper.impl.*;


import com.github.pagehelper.PageHelper;


import com.github.pagehelper.PageInfo;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.jdbc.datasource.DataSourceTransactionManager;


import org.springframework.stereotype.Service;


@@ -44,7 +46,9 @@


   private User_infMapper userInfMapper;


   @Resource


   private User_infService uservice;


	




   @Resource


   private UtilityFactoryService utilityFactoryService;


   // public User_taskService() {


   //    model=new ServiceModel();


   //    dao=BaseDAOFactory.getBaseDAO(Basemapper.USER_TASK);


@@ -249,48 +253,53 @@


     public ServiceModel delete(User_task obj) {


      TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);


      ServiceModel model = new ServiceModel();


      Boolean bl=true;


      if (obj.getTask_type()==2){


         if (!(mapper.del(obj)>0)) {


            bl=false;


      Boolean bl = true;


      try {


         if (obj.getTask_type() == 2) {


            bl = mapper.del(obj) > 0;


            if (bl) bl = mapper.delsqlC(obj) > 0;   //check


         } else {


            bl = mapper.del(obj) > 0;


            if (bl) bl = mapper.delsqlT(obj) > 0;   //test


         }


         if (!(mapper.delsqlC(obj)>0)) {


            bl=false;


         }


      }else{


         if (!(mapper.del(obj)>0)) {


            bl=false;


         }


         if (!(mapper.delsqlT(obj)>0)) {


            bl=false;


         }


      }


        if(bl){


         dataSourceTransactionManager.commit(transactionStatus);


           model.setCode(1);


           model.setMsg("删除作业成功!");


        }


        else{


      } catch (Exception e) {


         e.printStackTrace();


         dataSourceTransactionManager.rollback(transactionStatus);


           model.setMsg("删除作业失败!");


        }


        return model;	


     }


         model.setMsg("删除作业失败!");


         return model;


      }


      if (bl) {


         dataSourceTransactionManager.commit(transactionStatus);


         model.setCode(1);


         model.setMsg("删除作业成功!");


      } else {


         dataSourceTransactionManager.rollback(transactionStatus);


         model.setMsg("删除作业失败!");


      }


      return model;


   }


     


    //4.1作业管理查询user_task所有信息


    public ServiceModel serchByCondition(Task_Batt_Test obj){


    public ServiceModel serchByCondition(Task_Batt_Test tbt){


      ServiceModel model = new ServiceModel();


       Task_Batt_Test tbt = (Task_Batt_Test) obj;


      List<Task_Batt_Test> list = mapper.serchByCondition(tbt);


      //System.out.println(list.size()+"+++++");


      //用于判断作业类型   utest.getTask_usr_ids().equals("100")


      List<Task_Batt_Test> list =null;


      if(tbt.getUtask().getTask_type()==2){


         list = mapper.serchByCondition(tbt);


      }else{


         list = mapper.serchByConditionTest(tbt);


      }


//      System.out.println(list.size()+"+++++");


      //存放最终的结果


      List<Task_Batt_Test> listT=new ArrayList<Task_Batt_Test>();


      int task_id=0;                           //用于求同task_id的执行人


      String unameT="";


      if(list!=null && list.size()>0){


         for(int i=0;i<list.size();i++){	


            //System.out.println("===="+list.get(i).getUtest().getTask_usr_ids()+"====");


            String uname=UtilityFactory.UidsToUnames(list.get(i).getUtest().getTask_usr_ids());


         for(int i=0;i<list.size();i++){


            System.out.println("list.get(i) = " + list.get(i));


//            System.out.println("===="+list.get(i).getUtest().getTask_usr_ids()+"====");


//            String uname=UtilityFactory.UidsToUnames(list.get(i).getUtest().getTask_usr_ids());


            String uname=utilityFactoryService.UidsToUnames(list.get(i).getUtest().getTask_usr_ids());


            list.get(i).getUtest().setTask_usr_ids(uname);


            if(task_id==list.get(i).getUtask().getTask_id()){


               unameT = UtilityFactory.concatString(listT.get(listT.size()-1).getUtest().getTask_usr_ids(), uname);


@@ -314,11 +323,11 @@


               //   System.out.println(listL.get(j));


                  if(listL.get(j).getUsr_type()==1){


                     list.get(i).getUcheck().setBattvol_tempe_done(listL.get(j).getuId());              //获取主管姓名


                     list.get(i).getUcheck().setBattvol_tempe_done_result(UtilityFactory.UidsToUnames(listL.get(j).getuId().toString()));


                     list.get(i).getUcheck().setBattvol_tempe_done_result(utilityFactoryService.UidsToUnames(listL.get(j).getuId().toString()));


                  }


                  if(listL.get(j).getUsr_type()==2){


                     list.get(i).getUcheck().setBattvol_tempe_done_recheck(listL.get(j).getuId());      //获取指派人


                     list.get(i).getUcheck().setBattvol_tempe_done_recheck_result(UtilityFactory.UidsToUnames(listL.get(j).getuId().toString()));


                     list.get(i).getUcheck().setBattvol_tempe_done_recheck_result(utilityFactoryService.UidsToUnames(listL.get(j).getuId().toString()));


                  }


               }


            }


@@ -335,17 +344,15 @@


      return model;


   } 


    //4.1根据task_id查询user_task_test/user_task_check


    public ServiceModel serchByInfo(User_task obj){


    public ServiceModel serchByInfo(User_task utask){


      ServiceModel model = new ServiceModel();


	


      User_task utask=(User_task) obj;


      List<Task_Batt_Test> list=null;


      if(utask.getTask_type()!=2){


         list=battTestMapper.serchByCondition(utask);


         //System.out.println("查询结束");


         if(list.size()>0 && list!=null){


            for (int i = 0; i < list.size(); i++) {


               String uname=UtilityFactory.UidsToUnames(list.get(i).getUtest().getTask_usr_ids());


               String uname=utilityFactoryService.UidsToUnames(list.get(i).getUtest().getTask_usr_ids());


               list.get(i).getUtest().setNote(uname);


            }


         }


@@ -354,16 +361,16 @@


         //System.out.println("查询结束");


         if(list.size()>0 && list!=null){


            for (int i = 0; i < list.size(); i++) {


               String uname=UtilityFactory.UidsToUnames(list.get(i).getUcheck().getTask_usr_ids());


               String uname=utilityFactoryService.UidsToUnames(list.get(i).getUcheck().getTask_usr_ids());


               //System.out.println(uname);


               list.get(i).getBinf().setStationName9(uname);      //存放执行人


            }


         }


      }   


      for (Task_Batt_Test t : list) {


         System.out.println("t = " + t);


//      for (Task_Batt_Test t : list) {


//         System.out.println("t = " + t);


//         System.out.println(t.getUtest().getNote());


      }


//      }


      System.out.println(list.size());


      if(list!=null && list.size()>0){


         model.setCode(1);


@@ -372,17 +379,10 @@


      return model;


   }


    //4.1查询符合条件的电池组信息(创建作业)


    public List serchBattgroup(Batt_Maint_Dealarm obj){


//      ServiceModelImpl2 model = new ServiceModelImpl2();


        Batt_Maint_Dealarm bmd=(Batt_Maint_Dealarm) obj;


    public List serchBattgroup(Batt_Maint_Dealarm bmd){


        User_battgroup_baojigroup_battgroup ugroup=new User_battgroup_baojigroup_battgroup();


        List<Batt_Maint_Dealarm> list = battInfMapper.serchBattgroup(bmd);      //TODO 待完成


        System.out.println(list.size());


//      Batt_Maint_Dealarm e = new Batt_Maint_Dealarm();


//      BattInf battInf = new BattInf();


//      battInf.setBattGroupId(1000005);


//      e.setBinf(battInf);


//      list.add(e);//添加测试数据


        List<Batt_Maint_Dealarm> list = battInfMapper.serchBattgroup(bmd);


//      System.out.println("list.size() = " + list.size());//list.size() = 1263


        List<ServiceModel> listAll=new ArrayList<ServiceModel>();


        if(list!=null&&list.size()>=0){


           for(int i=0;i<list.size();i++){


@@ -399,7 +399,6 @@


              model.setData(list.get(i));


              if (umodel.getCode().equals(1)) {


                model.setMsg(umodel.getMsg());


                //TODO perry


                model.setMsgO(umodel.getMsgO());


             }


              listAll.add(model);


@@ -418,22 +417,23 @@


    //0.1查询指定用户的作业信息


    public ServiceModelOnce serchByUid(Task_Batt_Test tbt){


      ServiceModelOnce model = new ServiceModelOnce();


      //分页


      PageBean pageBean = tbt.getPageBean();


      PageHelper.startPage(pageBean.getPageNum(),pageBean.getPageSize(),true);


       List<Task_Batt_Test> list = mapper.serchByInfo(tbt);


      for (int i = 0; i < list.size(); i++) {


         list.get(i).setPageBean(new PageBean());//TODO 获取方式?


         list.get(i).getPageBean().setPageAll(0);


      }


//      for (int i = 0; i < list.size(); i++) {


//         list.get(i).setPageBean(new PageBean());//TODO 获取方式?


//         list.get(i).getPageBean().setPageAll(0);


//      }


       //System.out.println("&&&&   "+list.size());


       //未完成数量


       tbt.getUtask().setTask_complete(0);


       List<Task_Batt_Test> listU = mapper.serchByInfo(tbt);


      for (int i = 0; i < listU.size(); i++) {


         listU.get(i).setPageBean(new PageBean());


         listU.get(i).getPageBean().setPageAll(0);


      }


       List<Task_Batt_Test> listUBT = mapper.serchByInfo(tbt);


      System.out.println("listUBT.size = " + listUBT.size());


       //int count = 0;            //统计未完成的作业数量


       if(list!=null && list.size()>0){


          for(int i=0;i<list.size();i++){


            list.get(i).setBinf(new BattInf());


             BattInf binf=new BattInf();


             User_inf user=new User_inf();


//             if(list.get(i).getUtask().getTask_complete()!=null && list.get(i).getUtask().getTask_complete()==0){


@@ -448,9 +448,9 @@


             List<BattInf> listb=battInfMapper.serchByCondition(binf);


             if(listb!=null&&listb.size()>0){


//             System.out.println(listb.get(0).getBattGroupName()+"   "+listb.get(0).getStationName());


               System.out.println("list.get("+i+")= " + list.get(i));


               list.get(i).setBinf(new BattInf());//测试添加


                list.get(i).getBinf().setBattGroupName(listb.get(0).getBattGroupName());//TODO 数据不足 java.lang.NullPointerException: null


//               System.out.println("listb.get(0) = " + listb.get(0));


//               System.out.println("list.get(i) = " + list.get(i));


                list.get(i).getBinf().setBattGroupName(listb.get(0).getBattGroupName());


                list.get(i).getBinf().setStationName(listb.get(0).getStationName());


             //   System.out.println(i+"   "+list.get(i).getBinf().getBattGroupName()+"   "+list.get(i).getBinf().getStationName());


             }


@@ -463,6 +463,7 @@


             }


             


             List<User_inf> listu=userInfMapper.serchUname(user);


            System.out.println("listu.size() = " + listu.size());


             if(listu!=null && listu.size()>0){


                //System.out.println(listu.get(0).getuName());


                 list.get(i).getUtask().setNote(listu.get(0).getuName());


@@ -471,12 +472,14 @@


          /*for (int j=0;j<10;j++) {


             System.out.println(list.get(j).getBinf());


          }*/




         PageInfo<Task_Batt_Test> pageInfo = new PageInfo<>(list);


          model.setCode(1);


          model.setData(list);


          model.setData(pageInfo);


//         model.setSum(count);


         //TODO perry


          if(listU!=null && listU.size()>0){


             model.setSum(listU.get(0).getPageBean().getPageAll());


          if(listUBT!=null && listUBT.size()>0){


//             model.setSum(listU.get(0).getPageBean().getPageAll());


             model.setSum((int)pageInfo.getTotal());


          }else{


             model.setSum(0);


          }


@@ -496,23 +499,31 @@


    }


   


    //0.1作业管理查询user_task所有信息


    public ServiceModel serchByTask(Task_Batt_Test tbt){


    public ServiceModel serchByTask(Task_Batt_Test tbt) {


      ServiceModel model = new ServiceModel();


       List<Task_Batt_Test> list=mapper.serchByTask(tbt);


       System.out.println(list.size());


       if(list!=null&&list.size()>0){


          for(int i=0;i<list.size();i++){


             list.get(i).getUinf().setuName(UtilityFactory.UidsToUnames(list.get(i).getBinf().getStationName1()));


          }


      //分页


      PageBean pageBean = tbt.getPageBean();


      PageHelper.startPage(pageBean.getPageNum(),pageBean.getPageSize(),true);


      List<Task_Batt_Test> list = mapper.serchByTask(tbt);


//       System.out.println(list.size());




               model.setCode(1);


               model.setData(list);


        	


       }else{


          model.setCode(0);


          model.setMsg("查询失败！");


       }   


       //System.out.println(((List<Task_Batt_Test>)model.getData()).get(0).getUinf());


      int index = 0;


      if (list != null && list.size() > 0) {


//         System.out.println("tbt.getPageBean() = " + tbt.getPageBean());


         for (int i = 0; i < list.size(); i++) {


            list.get(i).setUinf(new User_inf());


            list.get(i).getUinf().setuName(utilityFactoryService.UidsToUnames(list.get(i).getBinf().getStationName1()));


         }




         PageInfo<Task_Batt_Test> pageInfo = new PageInfo<>(list);


         model.setCode(1);


         model.setData(pageInfo);




      } else {


         model.setCode(0);


         model.setMsg("查询失败！");


      }


      //System.out.println(((List<Task_Batt_Test>)model.getData()).get(0).getUinf());


      return model;


   } 


    //4.1根据维护区查询所有的电池组和对应的包机人(模板创建)和维护人员信息以及各类作业对应的电池组信息