MSI\liwei před 7 roky
rodič
revize
8f0d3b5fd6

binární
VisualInspection/images/login/bg.png


+ 9 - 9
VisualInspection/js/config.js

@@ -20,8 +20,8 @@ function getserveraddr() {
     } else if (base_ui_url.indexOf("localhost") != -1) {
     } else if (base_ui_url.indexOf("localhost") != -1) {
         // return "http://server_release_yanhai.jsxt.jsjtyxt.com/"
         // return "http://server_release_yanhai.jsxt.jsjtyxt.com/"
         return "http://localhost:8089/"
         return "http://localhost:8089/"
-    } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
-        return "http://192.168.8.236:8089/"
+    } else if (base_ui_url.indexOf("http://172.28.2.6") != -1) {
+        return "http://172.28.2.6:8089/"
     } else if (base_ui_url.indexOf("200.200.19.126") != -1) {
     } else if (base_ui_url.indexOf("200.200.19.126") != -1) {
         return "http://200.200.19.126:8089/"
         return "http://200.200.19.126:8089/"
     }
     }
@@ -33,10 +33,10 @@ function getImageaddr() {
     } else if (base_ui_url.indexOf("file_release_yanhai") != -1) {
     } else if (base_ui_url.indexOf("file_release_yanhai") != -1) {
         return "http://file_release_yanhai.jsxt.jsjtyxt.com/";
         return "http://file_release_yanhai.jsxt.jsjtyxt.com/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
     } else if (base_ui_url.indexOf("localhost") != -1) {
-        // return "http://10.112.0.199:7000/"
-        return "http://200.200.19.126:8080/";
-    } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
-        return "http://192.168.8.236/"
+         return "http://172.28.2.6:8080/"
+       // return "http://200.200.19.126:8080/";
+    } else if (base_ui_url.indexOf("http://172.28.2.6") != -1) {
+        return "http://172.28.2.6:8080/"
     } else if(base_ui_url.indexOf("200.200.19.126") != -1){
     } else if(base_ui_url.indexOf("200.200.19.126") != -1){
         return "http://200.200.19.126:8080/"
         return "http://200.200.19.126:8080/"
     }
     }
@@ -47,9 +47,9 @@ function getTaskaddr() {
         return "http://njyt.xt.wenhq.top:8083/";
         return "http://njyt.xt.wenhq.top:8083/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
     } else if (base_ui_url.indexOf("localhost") != -1) {
         // return "http://10.112.0.199:8099/"
         // return "http://10.112.0.199:8099/"
-        return "http://localhost:8100/"
-    } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
-        return "http://192.168.8.236:8099/"
+        return "http://localhost:8080/"
+    } else if (base_ui_url.indexOf("http://172.28.2.6") != -1) {
+        return "http://172.28.2.6:8099/"
     } else if(base_ui_url.indexOf("200.200.19.126") != -1){
     } else if(base_ui_url.indexOf("200.200.19.126") != -1){
         return "http://200.200.19.126:8100/"
         return "http://200.200.19.126:8100/"
     }
     }

+ 1 - 1
VisualInspection_server/src/main/java/com/xintong/GetOffWork.java

@@ -18,7 +18,7 @@ public class GetOffWork {
 
 
     private static final org.slf4j.Logger logger = LoggerFactory.getLogger(GetOffWork.class);
     private static final org.slf4j.Logger logger = LoggerFactory.getLogger(GetOffWork.class);
 
 
-   // @Scheduled(cron = "0/10 * * * * ?")
+    @Scheduled(cron = "0 20 00 * * ?")
     public void confirmTasks() {
     public void confirmTasks() {
       // Date now = new Date();
       // Date now = new Date();
 
 

+ 10 - 10
VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/OffWorkServiceImpl.java

@@ -60,6 +60,9 @@ public class OffWorkServiceImpl extends BaseService implements OffWorkService {
                     for(int i =0;i<list.size();i++){
                     for(int i =0;i<list.size();i++){
                         if(list.get(i).getRecordtype() == 64){
                         if(list.get(i).getRecordtype() == 64){
                             User user =  userDao.findByUserName(list.get(i).getOperator());
                             User user =  userDao.findByUserName(list.get(i).getOperator());
+                            if(user == null){
+                                user = userDao.getOne(3232);
+                            }
                             uc.setUser_id((long)user.getId());
                             uc.setUser_id((long)user.getId());
                             uc.setTeam_id(teamList.get(0).getId());
                             uc.setTeam_id(teamList.get(0).getId());
                             uc.setMonitor_user_id((long)teamList.get(0).getMonitor());
                             uc.setMonitor_user_id((long)teamList.get(0).getMonitor());
@@ -101,9 +104,6 @@ public class OffWorkServiceImpl extends BaseService implements OffWorkService {
             }
             }
         }
         }
 
 
-
-
-        System.err.println("测试");
     }
     }
 
 
 
 
@@ -113,13 +113,13 @@ public class OffWorkServiceImpl extends BaseService implements OffWorkService {
         int start = calendar.get(Calendar.HOUR_OF_DAY);
         int start = calendar.get(Calendar.HOUR_OF_DAY);
         calendar.setTime(end_date);
         calendar.setTime(end_date);
         int end = calendar.get(Calendar.HOUR_OF_DAY);
         int end = calendar.get(Calendar.HOUR_OF_DAY);
-        if(start<8 && end>8){
+        if(start<=8 && end>=8){
             return  1;
             return  1;
-        }else if(start > 8 && 8 < end  &&  end  <16){
+        }else if(start >= 8 && 8 <= end  &&  end <= 15){
             return  1;
             return  1;
-        }else if(start <16 && end > 16 ){
+        }else if(start <=15 && end >= 15 ){
            return  2;
            return  2;
-        }else if(start >16 && end <23 && end >16){
+        }else if(start >=15 && end <=23 && end >=15){
             return  2;
             return  2;
         }else{
         }else{
             return  3;
             return  3;
@@ -132,7 +132,7 @@ public class OffWorkServiceImpl extends BaseService implements OffWorkService {
        try{
        try{
            work_date = simpleDateFormat.parse(simpleDateFormat.format(work_date));
            work_date = simpleDateFormat.parse(simpleDateFormat.format(work_date));
        }catch (Exception e ){
        }catch (Exception e ){
-
+           e.printStackTrace();
        }
        }
         calendar.setTime(work_date);
         calendar.setTime(work_date);
 
 
@@ -164,7 +164,7 @@ public class OffWorkServiceImpl extends BaseService implements OffWorkService {
            teamClassDao.insert(teamClass);
            teamClassDao.insert(teamClass);
            insertUserClass(teamClass);
            insertUserClass(teamClass);
        }catch (Exception e){
        }catch (Exception e){
-
+           e.printStackTrace();
        }
        }
 
 
     }
     }
@@ -190,7 +190,7 @@ public class OffWorkServiceImpl extends BaseService implements OffWorkService {
                 classDao.insert(user);
                 classDao.insert(user);
             }
             }
         }catch (Exception e){
         }catch (Exception e){
-
+            e.printStackTrace();
         }
         }
 
 
     }
     }