update CaretakerServiceImpl

backend/smartdormitory_f/dormitory/src/main/java/edu/fzu/dormitory/service/impl/CaretakerServiceImpl.java

@@ -275,6 +275,28 @@ public class CaretakerServiceImpl implements CaretakerService {
         };
     }
 
+    public static boolean isEffectiveDate(Date nowTime, Date startTime, Date endTime) {
+        if (nowTime.getTime() == startTime.getTime()
+                || nowTime.getTime() == endTime.getTime()) {
+            return true;
+        }
+
+        Calendar date = Calendar.getInstance();
+        date.setTime(nowTime);
+
+        Calendar begin = Calendar.getInstance();
+        begin.setTime(startTime);
+
+        Calendar end = Calendar.getInstance();
+        end.setTime(endTime);
+
+        if (date.after(begin) && date.before(end)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     // 添加报修信息
     @Override
     @Permession(permession = PermessionType.Caretaker)
@@ -284,10 +306,17 @@ public class CaretakerServiceImpl implements CaretakerService {
 
         // 根据报修的类型，查找出对应的维修人员列表
         List<Repairer> repairerList = repairerMapper.findRepairersByType(publicRepair.getRepairTypeId());
-        // 随机分配一个同类型的维修人员
+        // 随机分配一个同类型的维修人员（正在上班的）
         Random random = new Random();
         int index = random.nextInt(repairerList.size());
-        publicRepair.setRepairer(repairerList.get(index));
+        Date date = new Date(System.currentTimeMillis());
+        boolean effectiveDate;
+        Repairer repairer = repairerList.get(index);
+        //do
+        //{
+            //effectiveDate = isEffectiveDate(date, repairer.getStartTime(), repairer.getEndTime());
+        //}while(!effectiveDate);
+        publicRepair.setRepairer(repairer);
         Caretaker caretaker = new Caretaker();
         caretaker.setCno(goalCaretaker.getCno());
         caretaker = caretakerMapper.getCaretaker(caretaker);