完善

platform-dao/src/main/java/com/platform/dao/vo/tuicalendar/TuiCalendarUtil.java

@@ -11,33 +11,34 @@ import java.util.List;
 /**
  * 用于转换的工具类
  * 转换：
- *  颜色
- *  大小
- *
+ * 颜色
+ * 大小
  */
 public class TuiCalendarUtil {
-    public static String COLOR_NOT_EXECUTE = "#0000FF";// 蓝色
-    public static String COLOR_EXECUTING = "#800080";// 紫色
-    public static String COLOR_FINISHED = "#008000";// 绿色
-    public static String COLOR_OUT_OF_DATE = "#FF0000";// 红色
+    public static String COLOR_NOT_EXECUTE = "#0000FF";// 蓝色1
+    public static String COLOR_OUT_OF_DATE = "#FF0000";// 红色2
+    public static String COLOR_OUT_OF_DATE2 = "#FF0080";// 浅红色4
+    public static String COLOR_EXECUTING = "#800080";// 紫色3
+    public static String COLOR_FINISHED = "#008000";// 绿色5
 
-    public static void setScheduleInfoColor(ScheduleInfo scheduleInfo){
-        if(scheduleInfo.getCalendarId().equals(CheckJobStatusEnum.NOT_EXECUTE.getValue().toString())){
+
+    public static void setScheduleInfoColor(ScheduleInfo scheduleInfo) {
+        if (scheduleInfo.getCalendarId().equals(CheckJobStatusEnum.NOT_EXECUTE.getValue().toString())) {
             scheduleInfo.setColor("#ffffff");
             scheduleInfo.setBgColor(COLOR_NOT_EXECUTE);
             scheduleInfo.setDragBgColor(COLOR_NOT_EXECUTE);
             scheduleInfo.setBorderColor(COLOR_NOT_EXECUTE);
-        }else if(scheduleInfo.getId().equals(CheckJobStatusEnum.EXECUTING.getValue())){
+        } else if (scheduleInfo.getId().equals(CheckJobStatusEnum.EXECUTING.getValue())) {
             scheduleInfo.setColor("#ffffff");
             scheduleInfo.setBgColor(COLOR_EXECUTING);
             scheduleInfo.setDragBgColor(COLOR_EXECUTING);
             scheduleInfo.setBorderColor(COLOR_EXECUTING);
-        }else if(scheduleInfo.getId().equals(CheckJobStatusEnum.FINISHED.getValue())){
+        } else if (scheduleInfo.getId().equals(CheckJobStatusEnum.FINISHED.getValue())) {
             scheduleInfo.setColor("#ffffff");
             scheduleInfo.setBgColor(COLOR_FINISHED);
             scheduleInfo.setDragBgColor(COLOR_FINISHED);
             scheduleInfo.setBorderColor(COLOR_FINISHED);
-        }else{
+        } else {
             scheduleInfo.setColor("#ffffff");
             scheduleInfo.setBgColor(COLOR_OUT_OF_DATE);
             scheduleInfo.setDragBgColor(COLOR_OUT_OF_DATE);
@@ -50,61 +51,72 @@ public class TuiCalendarUtil {
      *
      * @return List
      */
-    public static List<CalendarInfo> getCalendarInfoList(){
+    public static List<CalendarInfo> getCalendarInfoList() {
+        // 1蓝色：待接收，未过期
         CalendarInfo calendarInfo = new CalendarInfo();
-        calendarInfo.setId(CheckJobStatusEnum.NOT_EXECUTE.getValue().toString());
-
-        // 蓝色
-        calendarInfo.setName("待接收");
+        calendarInfo.setId("1");
+        calendarInfo.setName("待接收未过期");
         calendarInfo.setColor("#ffffff");
         calendarInfo.setBgColor(COLOR_NOT_EXECUTE);
         calendarInfo.setDragBgColor(COLOR_NOT_EXECUTE);
         calendarInfo.setBorderColor(COLOR_NOT_EXECUTE);
 
+        // 2红色：待接收，未过期
         CalendarInfo calendarInfo2 = new CalendarInfo();
-        calendarInfo2.setId(CheckJobStatusEnum.EXECUTING.getValue().toString());
-        // 紫色
-        calendarInfo2.setName("执行中");
+        calendarInfo2.setId("2");
+        calendarInfo2.setName("待接收已过期");
         calendarInfo2.setColor("#ffffff");
-        calendarInfo2.setBgColor(COLOR_EXECUTING);
-        calendarInfo2.setDragBgColor(COLOR_EXECUTING);
-        calendarInfo2.setBorderColor(COLOR_EXECUTING);
+        calendarInfo2.setBgColor(COLOR_OUT_OF_DATE);
+        calendarInfo2.setDragBgColor(COLOR_OUT_OF_DATE);
+        calendarInfo2.setBorderColor(COLOR_OUT_OF_DATE);
 
+        // 3紫色：执行中，未过期
         CalendarInfo calendarInfo3 = new CalendarInfo();
-        calendarInfo3.setId(CheckJobStatusEnum.FINISHED.getValue().toString());
-        // 绿色
-        calendarInfo3.setName("已完成");
+        calendarInfo3.setId("3");
+        calendarInfo3.setName("执行中未过期");
         calendarInfo3.setColor("#ffffff");
-        calendarInfo3.setBgColor(COLOR_FINISHED);
-        calendarInfo3.setDragBgColor(COLOR_FINISHED);
-        calendarInfo3.setBorderColor(COLOR_FINISHED);
+        calendarInfo3.setBgColor(COLOR_EXECUTING);
+        calendarInfo3.setDragBgColor(COLOR_EXECUTING);
+        calendarInfo3.setBorderColor(COLOR_EXECUTING);
 
-        /*CalendarInfo calendarInfo4 = new CalendarInfo();
-        calendarInfo4.setId(CheckJobStatusEnum.OUT_OF_DATE.getValue().toString());
-        // 红色
-        calendarInfo4.setName("已过期");
+        // 4浅红色：执行中，已过期
+        CalendarInfo calendarInfo4 = new CalendarInfo();
+        calendarInfo4.setId("4");
+        calendarInfo4.setName("执行中已过期");
         calendarInfo4.setColor("#ffffff");
-        calendarInfo4.setBgColor(COLOR_OUT_OF_DATE);
-        calendarInfo4.setDragBgColor(COLOR_OUT_OF_DATE);
-        calendarInfo4.setBorderColor(COLOR_OUT_OF_DATE);*/
+        calendarInfo4.setBgColor(COLOR_OUT_OF_DATE2);
+        calendarInfo4.setDragBgColor(COLOR_OUT_OF_DATE2);
+        calendarInfo4.setBorderColor(COLOR_OUT_OF_DATE2);
+
+        // 5绿色：已完成
+        CalendarInfo calendarInfo5 = new CalendarInfo();
+        calendarInfo5.setId("5");
+        calendarInfo5.setName("已完成");
+        calendarInfo5.setColor("#ffffff");
+        calendarInfo5.setBgColor(COLOR_FINISHED);
+        calendarInfo5.setDragBgColor(COLOR_FINISHED);
+        calendarInfo5.setBorderColor(COLOR_FINISHED);
+
 
         List<CalendarInfo> list = new ArrayList<CalendarInfo>();
         list.add(calendarInfo);
         list.add(calendarInfo2);
         list.add(calendarInfo3);
-        //list.add(calendarInfo4);
+        list.add(calendarInfo4);
+        list.add(calendarInfo5);
         return list;
     }
+
     /**
      * 将任务转换为输出日历任务
      *
      * @param checkJobVOList
      * @return scheduleInfo
      */
-    public static List<ScheduleInfo> covertCheckJobToScheduleInfoList(List<CheckJobVO> checkJobVOList){
+    public static List<ScheduleInfo> covertCheckJobToScheduleInfoList(List<CheckJobVO> checkJobVOList) {
         List<ScheduleInfo> scheduleInfoList = new ArrayList<ScheduleInfo>();
-        if(CollectionUtil.isNotEmpty(checkJobVOList)){
-            for(CheckJobVO checkJobVO:checkJobVOList){
+        if (CollectionUtil.isNotEmpty(checkJobVOList)) {
+            for (CheckJobVO checkJobVO : checkJobVOList) {
                 scheduleInfoList.add(covertCheckJobToScheduleInfo(checkJobVO));
             }
         }
@@ -117,10 +129,24 @@ public class TuiCalendarUtil {
      * @param checkJobVO
      * @return scheduleInfo
      */
-    public static ScheduleInfo covertCheckJobToScheduleInfo(CheckJobVO checkJobVO){
+    public static ScheduleInfo covertCheckJobToScheduleInfo(CheckJobVO checkJobVO) {
         ScheduleInfo scheduleInfo = new ScheduleInfo();
         scheduleInfo.setId(checkJobVO.getId());
-        scheduleInfo.setCalendarId(checkJobVO.getStatus().toString());
+        if (checkJobVO.getStatus().equals(CheckJobStatusEnum.NOT_EXECUTE.getValue()) && (checkJobVO.getReceiveOvertime() == null || !checkJobVO.getReceiveOvertime())) {
+            scheduleInfo.setCalendarId("1");
+        }
+        if (checkJobVO.getStatus().equals(CheckJobStatusEnum.NOT_EXECUTE.getValue()) && (checkJobVO.getReceiveOvertime() != null && checkJobVO.getReceiveOvertime())) {
+            scheduleInfo.setCalendarId("2");
+        }
+        if (checkJobVO.getStatus().equals(CheckJobStatusEnum.EXECUTING.getValue()) && (checkJobVO.getReceiveOvertime() == null || !checkJobVO.getReceiveOvertime())) {
+            scheduleInfo.setCalendarId("3");
+        }
+        if (checkJobVO.getStatus().equals(CheckJobStatusEnum.EXECUTING.getValue()) && (checkJobVO.getReceiveOvertime() != null && checkJobVO.getReceiveOvertime())) {
+            scheduleInfo.setCalendarId("4");
+        }
+        if (checkJobVO.getStatus().equals(CheckJobStatusEnum.FINISHED.getValue())) {
+            scheduleInfo.setCalendarId("5");
+        }
         scheduleInfo.setTitle(checkJobVO.getSbNo() + ":" + checkJobVO.getSbName() + ":" + checkJobVO.getSbLevel() + "级");
         scheduleInfo.setBody(checkJobVO.getRequirement());
         scheduleInfo.setIsAllday(true);
@@ -148,6 +174,9 @@ public class TuiCalendarUtil {
 
     public static void main(String[] args) {
         LocalDate date = LocalDate.now();
-        System.out.println(date.toString());
+        Boolean ss = null;
+        if (ss) {
+            System.out.println(date.toString());
+        }
     }
 }

platform-service/src/main/java/com/platform/service/check/impl/CheckJobServiceImpl.java

@@ -156,6 +156,11 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         return new MyPage(mapper.selectList(model));
     }
 
+    /**
+     * 获取保养日历数据，日历数据默认是当前一个月的，且包括以前未完成的
+     * @param model
+     * @return
+     */
     @Override
     public TuiCalendar getTuiCalendar(CheckJobDTO model) {
         TuiCalendar tuiCalendar = new TuiCalendar();
@@ -485,6 +490,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
                     checkJob.setPartId(standard.getPart());
                     checkJob.setStandardId(standard.getId());
                     checkJob.setType(standard.getType());
+                    checkJob.setReceiveOvertime(false);
                     checkJob.setRequirement(standard.getRequirement());
                     checkJob.setRemark(standard.getRemark());
                     checkJob.setName(standard.getName());

platform-service/src/main/java/com/platform/service/sb/SbInfoService.java

@@ -37,7 +37,8 @@ public interface SbInfoService extends IBaseService<SbInfo, SbInfoDTO> {
 
     /**
      * 选择在报修状态的设备、显示的设备
-     *
+     *  显示标准
+     *      1：
      * @param model
      * @return
      */

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -214,8 +214,12 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
 
     /**
      * 获取大屏显示的有异常的设备
-     * 1：A类和b类都要显示
+     * 1：显示字段为true的进行显示
      * 2：有报修的都要显示
+     * 3：红色：非计划性维修的设备
+     *   黄色：计划性维修的设备
+     *   蓝色：正常的设备
+     *
      *
      * @param model
      * @return
@@ -252,15 +256,16 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                     }
                 }
                 if (find) {
-                    if (findRepair.getNeedStop().equals(YesNoEnum.YES.getValue())) {
+                    if (findRepair.getCategory().equals(RepairApplicationFormCategoryEnum.PLAN.getValue())) {
                         repairSbInfoListYellow.add(sbInfo);
                     } else {
                         repairSbInfoListRed.add(sbInfo);
                     }
                 } else {
-                    if (sbInfo.getLevel() != null && !sbInfo.getLevel().equals(SbInfoLevelEnum.C.getValue())) {
+                   /* if (sbInfo.getLevel() != null && !sbInfo.getLevel().equals(SbInfoLevelEnum.C.getValue())) {
                         normalSbInfoList.add(sbInfo);
-                    }
+                    }*/
+                    normalSbInfoList.add(sbInfo);
                 }
             }
         }