2023-06-06 15:07:16 优化完善导出设备信息接口!

psdc-business/src/main/java/com/psdc/service/IPsdcElectricHtdataService.java

@@ -19,7 +19,7 @@ import java.util.Map;
 public interface IPsdcElectricHtdataService {
 
 
-    Map selTotalElectricityInfo();
+    Map selTotalElectricityInfo(Integer deviceID);
 
     List selThisHourUseElectric(Integer deviceId);
 

psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java

@@ -91,6 +91,31 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
             List<Map> ary = new ArrayList<>();
             List<ModelVo> list = psdcModelMapper.selDevIsControlByModelName(deviceModel);
             for (ModelVo mv : list) {
+                packDevInfos(data, deviceId, ary, mv);
+            }
+            pd.setControl_elements(ary);
+        }
+
+        return psdcDevices.stream().map(psdcDevice -> {
+            DeviceStatusVo deviceStatusVo = new DeviceStatusVo();
+            BeanUtils.copyProperties(psdcDevice, deviceStatusVo);
+            if (psdcDevice.getDeviceRunstatus() != null && psdcDevice.getDeviceRunstatus() == 1) {
+                deviceStatusVo.setDeviceRunstatus(true);
+            } else {
+                deviceStatusVo.setDeviceRunstatus(false);
+            }
+            return deviceStatusVo;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * 封装设备信息
+     * @param data 日期
+     * @param deviceId 设备Id
+     * @param ary
+     * @param mv 模型参数
+     */
+    private void packDevInfos(Date data, Integer deviceId, List<Map> ary, ModelVo mv) {
         PsdcThermometerDataRes thermometerDataRes = thermometerRtdataMapper.selTempByDevId(deviceId, sdf.format(data));
         Map<String, Object> map = new HashMap<>();
         Double tempValue = 0.0;
@@ -112,20 +137,6 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
         map.put("tempValue", tempValue);
         ary.add(map);
     }
-            pd.setControl_elements(ary);
-        }
-
-        return psdcDevices.stream().map(psdcDevice -> {
-            DeviceStatusVo deviceStatusVo = new DeviceStatusVo();
-            BeanUtils.copyProperties(psdcDevice, deviceStatusVo);
-            if (psdcDevice.getDeviceRunstatus() != null && psdcDevice.getDeviceRunstatus() == 1) {
-                deviceStatusVo.setDeviceRunstatus(true);
-            } else {
-                deviceStatusVo.setDeviceRunstatus(false);
-            }
-            return deviceStatusVo;
-        }).collect(Collectors.toList());
-    }
 
     @Override
     public DeviceStatusVo queryDeviceStatusById(Integer deviceId) {
@@ -406,26 +417,7 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
             List<Map> ary = new ArrayList<>();
             for (ModelVo mv :  psdcModelMapper.selDevIsControlByModelName(deviceModel)) {
                 Integer deviceId = pd.getDeviceId();
-                PsdcThermometerDataRes thermometerDataRes = thermometerRtdataMapper.selTempByDevId(deviceId, sdf.format(data));
-                Map<String, Object> map = new HashMap<>();
-                Double tempValue = 0.0;
-                map.put("controlElement", mv.getRelationField());
-                map.put("controlRemark", mv.getIoDesc());
-                if (null != thermometerDataRes) {
-                    switch (mv.getRelationField()) {
-                        case "intemp":
-                            tempValue = thermometerDataRes.getThermometerValueIn();
-                            break;
-                        case "outtemp":
-                            tempValue = thermometerDataRes.getThermometerValueOut();
-                            break;
-                        case "temp":
-                            tempValue = thermometerDataRes.getThermometerValue();
-                            break;
-                    }
-                }
-                map.put("tempValue", tempValue);
-                ary.add(map);
+                packDevInfos(data, deviceId, ary, mv);
             }
             if (pd.getDeviceRunstatus() != null && pd.getDeviceRunstatus() == 1) {
                 deviceStatusVo.setDeviceRunstatus(true);

psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricHtdataServiceImpl.java

@@ -49,15 +49,15 @@ public class PsdcElectricHtdataServiceImpl implements IPsdcElectricHtdataService
      * @return
      */
     @Override
-    public Map selTotalElectricityInfo() {
+    public Map selTotalElectricityInfo(Integer deviceID) {
         Date date = new Date();
         Map<String, Double> map = new HashMap<>();
         String tb = df.format(date) + " 00:00:00"; // 今天开始检索时间
         String te = df.format(date) + " 23:59:59"; // 今天结束检索时间
         String mb = benYue()[0] + " 00:00:00"; // 本月开始检索时间
         String me = benYue()[1] + " 23:59:59"; // 本月结束检索时间
-        Double todayUseElectric = electricHtdataMapper.selTodayUseEnergy(13, tb, te);// 总电表今日用电量
-        Double toMonthUseElectric = electricHtdataMapper.selTodayUseEnergy(13, mb, me);// 总电表本月用电量
+        Double todayUseElectric = electricHtdataMapper.selTodayUseEnergy(deviceID, tb, te);// 总电表今日用电量
+        Double toMonthUseElectric = electricHtdataMapper.selTodayUseEnergy(deviceID, mb, me);// 总电表本月用电量
         map.put("eday", todayUseElectric);
         map.put("emonth", toMonthUseElectric);
         return map;
@@ -158,15 +158,15 @@ public class PsdcElectricHtdataServiceImpl implements IPsdcElectricHtdataService
         Date yesterday = calendar.getTime();
         List<PsdcElectricHtdata> psdcElectricHtdatas = electricHtdataMapper.statisticalGroupByTime(simpleDateFormat.format(yesterday));
 
-        //月点位
+        // 月点位
         String monthPoint = "day_" + dayDateFormat.format(yesterday);
         String yearPoint = "month_" + monthDateFormat.format(yesterday);
         for (PsdcElectricHtdata psdcElectricHtdata: psdcElectricHtdatas) {
-            //先查询是否有该id当月数据
+            // 先查询是否有该id当月数据
             Integer deviceId = psdcElectricHtdata.getDeviceId();
             PsdcStatisticsMonth psdcStatisticsMonth =  psdcStatisticsMonthMapper.queryByDeviceIdAndDate(deviceId,yearMonthDateFormat.format(yesterday));
             if (psdcStatisticsMonth == null){
-                //插入
+                // 插入
                 PsdcStatisticsMonth newPsdcStatisticsMonth = new PsdcStatisticsMonth();
                 newPsdcStatisticsMonth.setMonthDate(simpleDateFormat.format(yesterday));
                 newPsdcStatisticsMonth.setDeviceId(deviceId);
@@ -175,17 +175,17 @@ public class PsdcElectricHtdataServiceImpl implements IPsdcElectricHtdataService
                 Integer monthId = newPsdcStatisticsMonth.getMonthId();
                 psdcStatisticsMonthMapper.updatePoint(monthPoint,psdcElectricHtdata.getUseDeiffen(),monthId);
             } else {
-                //更新
+                // 更新
                 psdcStatisticsMonthMapper.updatePoint(monthPoint,psdcElectricHtdata.getUseDeiffen(),psdcStatisticsMonth.getMonthId()
                 );
             }
 
-            //每月数据
-            //先查询该id今年每月数据
+            // 每月数据
+            // 先查询该id今年每月数据
             PsdcStatisticsYear psdcStatisticsYear = psdcStatisticsYearMapper.queryByDeviceIdAndDate(deviceId, yearMonthDateFormat.format(yesterday));
             Double aDouble = psdcStatisticsMonthMapper.queryOneLineSum(deviceId, yearMonthDateFormat.format(yesterday));
             if (psdcStatisticsYear == null){
-                //插入
+                // 插入
                 PsdcStatisticsYear newPsdcStatisticsYear = new PsdcStatisticsYear();
                 newPsdcStatisticsYear.setYearDate(simpleDateFormat.format(yesterday));
                 newPsdcStatisticsYear.setDeviceId(deviceId);
@@ -194,7 +194,7 @@ public class PsdcElectricHtdataServiceImpl implements IPsdcElectricHtdataService
                 Integer yearId = newPsdcStatisticsYear.getYearId();
                 psdcStatisticsYearMapper.updatePoint(yearPoint,aDouble,yearId);
             } else {
-                //更新
+                // 更新
                 psdcStatisticsYearMapper.updatePoint(yearPoint,aDouble,psdcStatisticsYear.getYearId());
 
             }

psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java

@@ -54,7 +54,7 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService {
         Date date = new Date();
         long timestamp = getSecondTimestampTwo(date);
         Long userId = SecurityUtils.getUserId();
-        String userName = sysUserMapper.selectUserById(userId).getUserName();
+        String userName = SecurityUtils.getUsername();
         List<SceneVo> scenesList = new ArrayList<>();
         for (DeviceVo dev : scenes.getDeviceVos()) {
 //            if (null != dev.getIntemp() && !"".equals(dev.getIntemp())) {

psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java

@@ -169,7 +169,7 @@ public class PsdcDeviceController extends BaseController {
 //            row2.createCell(1).setCellValue("运行设备");
 
             wb.setSelectedTab(1);
-            XSSFSheet sheet = wb.createSheet("设备模型类型表");
+            XSSFSheet sheet = wb.createSheet("现有设备模型类型");
             XSSFRow row0 = sheet.createRow(0);
             row0.createCell(0).setCellValue("设备模型类型Id");
             row0.createCell(1).setCellValue("设备模型类型名称");

psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java

@@ -169,7 +169,7 @@ public class TotalElectricMeterController {
     public AjaxResult selzdb1(@PathVariable(value = "deviceId", required = false) Integer deviceId)  {
         PsdcDevicePowerRes devicePowerRes = psdcThermometerHtdataService.selTotalElectricityInfo(deviceId);
         if (null != devicePowerRes){
-            Map map = psdcElectricHtdataService.selTotalElectricityInfo();
+            Map map = psdcElectricHtdataService.selTotalElectricityInfo(deviceId);
             devicePowerRes.setEDay((Double) map.get("eday"));
             devicePowerRes.setEMonth((Double) map.get("emonth"));
             AjaxResult ajax = AjaxResult.success(devicePowerRes);