change - 数据源修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/scada/UShellMesController.java

@@ -226,7 +226,7 @@ public class UShellMesController {
         calendar.set(Calendar.SECOND, 0);
         Date endTime = calendar.getTime();
 
-//        List<ScadaUkHourData> info = iScadaUkHourDataRepository.findByRecordTimeBetween(beginTime,endTime);
+        //List<ScadaUkHourData> info = iScadaUkHourDataRepository.findByRecordTimeBetween(beginTime,endTime);
         List<ScadaUkHourData> info = imosPrPlanService.findByRecordTimeBetweenNew();
         List<ScadaUkHourData> infoList = info.stream().sorted(Comparator.comparing(ScadaUkHourData:: getRecordTime)).collect(Collectors.toList());
 
@@ -250,11 +250,17 @@ public class UShellMesController {
     @ResponseBody
     public String getPlanData(){
 
+        String jsonInfo  = "";
+
+        try{
             OrderInfo planInfoList = imosPrPlanService.getSumUHullPlanInfo().get(0);
 
-        String jsonInfo = JSONArray.toJSONString(planInfoList);
+            jsonInfo = JSONArray.toJSONString(planInfoList);
 
             System.out.println("U壳计划汇总："+jsonInfo);
+        }catch (Exception ex) {
+            System.out.println("U壳计划汇总异常："+ex.getMessage());
+        }
         return jsonInfo;
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/scada/ScadaUkHourData.java

@@ -33,6 +33,6 @@ public class ScadaUkHourData {
 //    @Column(name = "DEVICESTATE")
 //    public int DEVICESTATE;
 
-    @Column(name = "RECORDTIME")
+    @Column(name = "recordTime")
     public Date recordTime;
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImosPrPlanServiceImpl.java

@@ -768,6 +768,7 @@ public class ImosPrPlanServiceImpl implements IImosPrPlanService
     }
 
     @Override
+    @DataSource(value = DataSourceType.MASTER)
     public List<ScadaUkHourData> findByRecordTimeBetweenNew() {
         return imosPrPlanMapper.findByRecordTimeBetweenNew(in_id);
     }