LY 大屏 储罐

master/src/main/java/com/ruoyi/project/aspen/controller/TDashboarddataController.java

@@ -1,7 +1,11 @@
 package com.ruoyi.project.aspen.controller;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.List;
 
+import com.ruoyi.project.production.domain.TDailyProductionReport;
+import com.ruoyi.project.production.mapper.TDailyProductionReportMapper;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +26,8 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.page.TableDataInfo;
 
+import javax.annotation.Resource;
+
 /**
  * dashboard抓取数据Controller
  *
@@ -34,7 +40,8 @@ public class TDashboarddataController extends BaseController
 {
     @Autowired
     private ITDashboarddataService tDashboarddataService;
-
+    @Resource
+    private TDailyProductionReportMapper tDailyProductionReportMapper;
     /**
      * 查询dashboard抓取数据列表
      */
@@ -51,7 +58,29 @@ public class TDashboarddataController extends BaseController
     @GetMapping("/selectLast")
     public AjaxResult selectLast(TDashboarddata tDashboarddata)
     {
+        TDailyProductionReport report = tDailyProductionReportMapper.selectTDailyProductionReportByMaxDate();
         TDashboarddata dashboarddata = tDashboarddataService.selectLast(tDashboarddata);
+        //石脑油储罐
+        dashboarddata.setNapOne(new BigDecimal(report.getSctfStorageCltf1621()).divide(new BigDecimal("33000"), 3, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(1, RoundingMode.HALF_UP).toString());
+        dashboarddata.setNapTwo(new BigDecimal(report.getSctfStorageCltf1622()).divide(new BigDecimal("33000"), 3, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(1, RoundingMode.HALF_UP).toString());
+        dashboarddata.setNapThree(new BigDecimal(report.getSctfStorageCltf1623()).divide(new BigDecimal("33000"), 3, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(1, RoundingMode.HALF_UP).toString());
+        //乙烯储罐
+        dashboarddata.setEhtOne(new BigDecimal(report.getSctfStorageTk1061()).divide(new BigDecimal("517"), 3, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(1, RoundingMode.HALF_UP).toString());
+        dashboarddata.setEhtTwo(new BigDecimal(report.getSctfStorageTk1062()).divide(new BigDecimal("517"), 3, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(1, RoundingMode.HALF_UP).toString());
+        dashboarddata.setEhtThree(new BigDecimal(report.getSctfStorageTk1063()).divide(new BigDecimal("517"), 3, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(1, RoundingMode.HALF_UP).toString());
+        dashboarddata.setEhtFour(new BigDecimal(report.getSctfStorageTk1064()).divide(new BigDecimal("517"), 3, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(1, RoundingMode.HALF_UP).toString());
+        dashboarddata.setEhtFive(new BigDecimal(report.getSctfStorageTk1065Off()).divide(new BigDecimal("517"), 3, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(1, RoundingMode.HALF_UP).toString());
+        //芳烃储罐
+        dashboarddata.setProOne(new BigDecimal(report.getSctfStorageTk1510B()).divide(new BigDecimal("3900"), 3, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(1, RoundingMode.HALF_UP).toString());
+        dashboarddata.setProTwo(new BigDecimal(report.getSctfStorageTk1520Rpg()).divide(new BigDecimal("13500"), 3, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(1, RoundingMode.HALF_UP).toString());
+        dashboarddata.setProThree(new BigDecimal(report.getSctfStorageTk1360T()).divide(new BigDecimal("3800"), 3, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(1, RoundingMode.HALF_UP).toString());
+        dashboarddata.setProFour(new BigDecimal(report.getSctfStorageTk1410X()).divide(new BigDecimal("1560"), 3, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(1, RoundingMode.HALF_UP).toString());
+        //丙烯储罐
+        dashboarddata.setAcrOne(new BigDecimal(report.getSctfStorageTk1011()).divide(new BigDecimal("1200"), 3, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(1, RoundingMode.HALF_UP).toString().toString());
+        dashboarddata.setAcrTwo(new BigDecimal(report.getSctfStorageTk1012()).divide(new BigDecimal("1200"), 3, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(1, RoundingMode.HALF_UP).toString().toString());
+        dashboarddata.setAcrThree(new BigDecimal(report.getSctfStorageTk1013()).divide(new BigDecimal("1200"), 3, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(1, RoundingMode.HALF_UP).toString().toString());
+        dashboarddata.setAcrFour(new BigDecimal(report.getSctfStorageTk1014()).divide(new BigDecimal("1200"), 3, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(1, RoundingMode.HALF_UP).toString().toString());
+
         return AjaxResult.success(dashboarddata);
     }
 

master/src/main/java/com/ruoyi/project/aspen/mapper/TDashboarddataMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.aspen.domain.TDashboarddata;
 
 /**
  * dashboard抓取数据Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2022-01-06
  */
-public interface TDashboarddataMapper 
+public interface TDashboarddataMapper
 {
     /**
      * 查询dashboard抓取数据
-     * 
+     *
      * @param id dashboard抓取数据ID
      * @return dashboard抓取数据
      */
@@ -30,16 +30,15 @@ public interface TDashboarddataMapper
 
     /**
      * 查询dashboard抓取数据列表
-     * 
+     *
      * @param tDashboarddata dashboard抓取数据
      * @return dashboard抓取数据集合
      */
-    @DataScope(deptAlias = "d")
     public List<TDashboarddata> selectTDashboarddataList(TDashboarddata tDashboarddata);
 
     /**
      * 新增dashboard抓取数据
-     * 
+     *
      * @param tDashboarddata dashboard抓取数据
      * @return 结果
      */
@@ -47,7 +46,7 @@ public interface TDashboarddataMapper
 
     /**
      * 修改dashboard抓取数据
-     * 
+     *
      * @param tDashboarddata dashboard抓取数据
      * @return 结果
      */
@@ -55,7 +54,7 @@ public interface TDashboarddataMapper
 
     /**
      * 删除dashboard抓取数据
-     * 
+     *
      * @param id dashboard抓取数据ID
      * @return 结果
      */
@@ -63,7 +62,7 @@ public interface TDashboarddataMapper
 
     /**
      * 批量删除dashboard抓取数据
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

master/src/main/java/com/ruoyi/project/aspen/mapper/TDashboarddayMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.aspen.domain.TDashboardday;
 
 /**
  * DASHBOARD每日抓取数据Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2022-02-11
  */
-public interface TDashboarddayMapper 
+public interface TDashboarddayMapper
 {
     /**
      * 查询DASHBOARD每日抓取数据
-     * 
+     *
      * @param id DASHBOARD每日抓取数据ID
      * @return DASHBOARD每日抓取数据
      */
@@ -30,16 +30,15 @@ public interface TDashboarddayMapper
 
     /**
      * 查询DASHBOARD每日抓取数据列表
-     * 
+     *
      * @param tDashboardday DASHBOARD每日抓取数据
      * @return DASHBOARD每日抓取数据集合
      */
-    @DataScope(deptAlias = "d")
     public List<TDashboardday> selectTDashboarddayList(TDashboardday tDashboardday);
 
     /**
      * 新增DASHBOARD每日抓取数据
-     * 
+     *
      * @param tDashboardday DASHBOARD每日抓取数据
      * @return 结果
      */
@@ -47,7 +46,7 @@ public interface TDashboarddayMapper
 
     /**
      * 修改DASHBOARD每日抓取数据
-     * 
+     *
      * @param tDashboardday DASHBOARD每日抓取数据
      * @return 结果
      */
@@ -55,7 +54,7 @@ public interface TDashboarddayMapper
 
     /**
      * 删除DASHBOARD每日抓取数据
-     * 
+     *
      * @param id DASHBOARD每日抓取数据ID
      * @return 结果
      */
@@ -63,7 +62,7 @@ public interface TDashboarddayMapper
 
     /**
      * 批量删除DASHBOARD每日抓取数据
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

master/src/main/java/com/ruoyi/project/aspen/mapper/TDashboarddayelecMapper.java

@@ -7,15 +7,15 @@ import com.ruoyi.project.aspen.domain.TDashboarddayelec;
 
 /**
  * 电厂大屏每日0：00抓取数据Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2022-03-12
  */
-public interface TDashboarddayelecMapper 
+public interface TDashboarddayelecMapper
 {
     /**
      * 查询电厂大屏每日0：00抓取数据
-     * 
+     *
      * @param id 电厂大屏每日0：00抓取数据ID
      * @return 电厂大屏每日0：00抓取数据
      */
@@ -23,16 +23,15 @@ public interface TDashboarddayelecMapper
 
     /**
      * 查询电厂大屏每日0：00抓取数据列表
-     * 
+     *
      * @param tDashboarddayelec 电厂大屏每日0：00抓取数据
      * @return 电厂大屏每日0：00抓取数据集合
      */
-    @DataScope(deptAlias = "d")
     public List<TDashboarddayelec> selectTDashboarddayelecList(TDashboarddayelec tDashboarddayelec);
 
     /**
      * 新增电厂大屏每日0：00抓取数据
-     * 
+     *
      * @param tDashboarddayelec 电厂大屏每日0：00抓取数据
      * @return 结果
      */
@@ -40,7 +39,7 @@ public interface TDashboarddayelecMapper
 
     /**
      * 修改电厂大屏每日0：00抓取数据
-     * 
+     *
      * @param tDashboarddayelec 电厂大屏每日0：00抓取数据
      * @return 结果
      */
@@ -48,7 +47,7 @@ public interface TDashboarddayelecMapper
 
     /**
      * 删除电厂大屏每日0：00抓取数据
-     * 
+     *
      * @param id 电厂大屏每日0：00抓取数据ID
      * @return 结果
      */
@@ -56,7 +55,7 @@ public interface TDashboarddayelecMapper
 
     /**
      * 批量删除电厂大屏每日0：00抓取数据
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

master/src/main/java/com/ruoyi/project/aspen/mapper/TDashboarddayeleceightMapper.java

@@ -7,15 +7,15 @@ import com.ruoyi.project.aspen.domain.TDashboarddayeleceight;
 
 /**
  * 电厂大屏每日8：00抓取数据Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2022-03-12
  */
-public interface TDashboarddayeleceightMapper 
+public interface TDashboarddayeleceightMapper
 {
     /**
      * 查询电厂大屏每日8：00抓取数据
-     * 
+     *
      * @param id 电厂大屏每日8：00抓取数据ID
      * @return 电厂大屏每日8：00抓取数据
      */
@@ -23,16 +23,15 @@ public interface TDashboarddayeleceightMapper
 
     /**
      * 查询电厂大屏每日8：00抓取数据列表
-     * 
+     *
      * @param tDashboarddayeleceight 电厂大屏每日8：00抓取数据
      * @return 电厂大屏每日8：00抓取数据集合
      */
-    @DataScope(deptAlias = "d")
     public List<TDashboarddayeleceight> selectTDashboarddayeleceightList(TDashboarddayeleceight tDashboarddayeleceight);
 
     /**
      * 新增电厂大屏每日8：00抓取数据
-     * 
+     *
      * @param tDashboarddayeleceight 电厂大屏每日8：00抓取数据
      * @return 结果
      */
@@ -40,7 +39,7 @@ public interface TDashboarddayeleceightMapper
 
     /**
      * 修改电厂大屏每日8：00抓取数据
-     * 
+     *
      * @param tDashboarddayeleceight 电厂大屏每日8：00抓取数据
      * @return 结果
      */
@@ -48,7 +47,7 @@ public interface TDashboarddayeleceightMapper
 
     /**
      * 删除电厂大屏每日8：00抓取数据
-     * 
+     *
      * @param id 电厂大屏每日8：00抓取数据ID
      * @return 结果
      */
@@ -56,7 +55,7 @@ public interface TDashboarddayeleceightMapper
 
     /**
      * 批量删除电厂大屏每日8：00抓取数据
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

master/src/main/java/com/ruoyi/project/aspen/mapper/TElecdashboardAlarmMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.aspen.domain.TElecdashboardAlarm;
 
 /**
  * 电厂大屏预警Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2022-09-19
  */
-public interface TElecdashboardAlarmMapper 
+public interface TElecdashboardAlarmMapper
 {
     /**
      * 查询电厂大屏预警
-     * 
+     *
      * @param id 电厂大屏预警ID
      * @return 电厂大屏预警
      */
@@ -22,16 +22,15 @@ public interface TElecdashboardAlarmMapper
 
     /**
      * 查询电厂大屏预警列表
-     * 
+     *
      * @param tElecdashboardAlarm 电厂大屏预警
      * @return 电厂大屏预警集合
      */
-    @DataScope(deptAlias = "d")
     public List<TElecdashboardAlarm> selectTElecdashboardAlarmList(TElecdashboardAlarm tElecdashboardAlarm);
 
     /**
      * 新增电厂大屏预警
-     * 
+     *
      * @param tElecdashboardAlarm 电厂大屏预警
      * @return 结果
      */
@@ -39,7 +38,7 @@ public interface TElecdashboardAlarmMapper
 
     /**
      * 修改电厂大屏预警
-     * 
+     *
      * @param tElecdashboardAlarm 电厂大屏预警
      * @return 结果
      */
@@ -47,7 +46,7 @@ public interface TElecdashboardAlarmMapper
 
     /**
      * 删除电厂大屏预警
-     * 
+     *
      * @param id 电厂大屏预警ID
      * @return 结果
      */
@@ -55,7 +54,7 @@ public interface TElecdashboardAlarmMapper
 
     /**
      * 批量删除电厂大屏预警
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

master/src/main/java/com/ruoyi/project/aspen/mapper/TElecdashboardDayMapper.java

@@ -7,11 +7,11 @@ import com.ruoyi.project.aspen.domain.TElecdashboardRealtime;
 
 /**
  * 电厂大屏每日数据Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2022-09-14
  */
-public interface TElecdashboardDayMapper 
+public interface TElecdashboardDayMapper
 {
     /**
      * 查询日期最靠前的30条电厂大屏每日数据
@@ -29,7 +29,7 @@ public interface TElecdashboardDayMapper
 
     /**
      * 查询电厂大屏每日数据
-     * 
+     *
      * @param id 电厂大屏每日数据ID
      * @return 电厂大屏每日数据
      */
@@ -37,16 +37,15 @@ public interface TElecdashboardDayMapper
 
     /**
      * 查询电厂大屏每日数据列表
-     * 
+     *
      * @param tElecdashboardDay 电厂大屏每日数据
      * @return 电厂大屏每日数据集合
      */
-    @DataScope(deptAlias = "d")
     public List<TElecdashboardDay> selectTElecdashboardDayList(TElecdashboardDay tElecdashboardDay);
 
     /**
      * 新增电厂大屏每日数据
-     * 
+     *
      * @param tElecdashboardDay 电厂大屏每日数据
      * @return 结果
      */
@@ -54,7 +53,7 @@ public interface TElecdashboardDayMapper
 
     /**
      * 修改电厂大屏每日数据
-     * 
+     *
      * @param tElecdashboardDay 电厂大屏每日数据
      * @return 结果
      */
@@ -62,7 +61,7 @@ public interface TElecdashboardDayMapper
 
     /**
      * 删除电厂大屏每日数据
-     * 
+     *
      * @param id 电厂大屏每日数据ID
      * @return 结果
      */
@@ -70,7 +69,7 @@ public interface TElecdashboardDayMapper
 
     /**
      * 批量删除电厂大屏每日数据
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

master/src/main/java/com/ruoyi/project/aspen/mapper/TElecdashboardHourMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.aspen.domain.TElecdashboardHour;
 
 /**
  * 电厂大屏每小时数据Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2022-09-14
  */
-public interface TElecdashboardHourMapper 
+public interface TElecdashboardHourMapper
 {
     /**
      * 查询电厂大屏每小时数据
-     * 
+     *
      * @param id 电厂大屏每小时数据ID
      * @return 电厂大屏每小时数据
      */
@@ -22,16 +22,15 @@ public interface TElecdashboardHourMapper
 
     /**
      * 查询电厂大屏每小时数据列表
-     * 
+     *
      * @param tElecdashboardHour 电厂大屏每小时数据
      * @return 电厂大屏每小时数据集合
      */
-    @DataScope(deptAlias = "d")
     public List<TElecdashboardHour> selectTElecdashboardHourList(TElecdashboardHour tElecdashboardHour);
 
     /**
      * 新增电厂大屏每小时数据
-     * 
+     *
      * @param tElecdashboardHour 电厂大屏每小时数据
      * @return 结果
      */
@@ -39,7 +38,7 @@ public interface TElecdashboardHourMapper
 
     /**
      * 修改电厂大屏每小时数据
-     * 
+     *
      * @param tElecdashboardHour 电厂大屏每小时数据
      * @return 结果
      */
@@ -47,7 +46,7 @@ public interface TElecdashboardHourMapper
 
     /**
      * 删除电厂大屏每小时数据
-     * 
+     *
      * @param id 电厂大屏每小时数据ID
      * @return 结果
      */
@@ -55,7 +54,7 @@ public interface TElecdashboardHourMapper
 
     /**
      * 批量删除电厂大屏每小时数据
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

master/src/main/java/com/ruoyi/project/aspen/mapper/TElecdashboardRealtimeMapper.java

@@ -6,11 +6,11 @@ import com.ruoyi.project.aspen.domain.TElecdashboardRealtime;
 
 /**
  * 电厂大屏实时数据Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2022-09-06
  */
-public interface TElecdashboardRealtimeMapper 
+public interface TElecdashboardRealtimeMapper
 {
     /**
      * 查询查询日期最靠前的电厂大屏实时数据
@@ -21,7 +21,7 @@ public interface TElecdashboardRealtimeMapper
 
     /**
      * 查询【请填写功能名称】
-     * 
+     *
      * @param id 【请填写功能名称】ID
      * @return 【请填写功能名称】
      */
@@ -29,16 +29,15 @@ public interface TElecdashboardRealtimeMapper
 
     /**
      * 查询【请填写功能名称】列表
-     * 
+     *
      * @param tElecdashboardRealtime 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    @DataScope(deptAlias = "d")
     public List<TElecdashboardRealtime> selectTElecdashboardRealtimeList(TElecdashboardRealtime tElecdashboardRealtime);
 
     /**
      * 新增【请填写功能名称】
-     * 
+     *
      * @param tElecdashboardRealtime 【请填写功能名称】
      * @return 结果
      */
@@ -46,7 +45,7 @@ public interface TElecdashboardRealtimeMapper
 
     /**
      * 修改【请填写功能名称】
-     * 
+     *
      * @param tElecdashboardRealtime 【请填写功能名称】
      * @return 结果
      */
@@ -54,7 +53,7 @@ public interface TElecdashboardRealtimeMapper
 
     /**
      * 删除【请填写功能名称】
-     * 
+     *
      * @param id 【请填写功能名称】ID
      * @return 结果
      */
@@ -62,7 +61,7 @@ public interface TElecdashboardRealtimeMapper
 
     /**
      * 批量删除【请填写功能名称】
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */