Merge branch 'master' of http://39.105.213.67:3000/hwj_system/psdc

psdc-business/src/main/java/com/psdc/mapper/PsdcThermometerRtdataMapper.java

@@ -27,7 +27,8 @@ public interface PsdcThermometerRtdataMapper{
                                      @Param("today") String today);
 
     List<PsdcThermometerDataRes> selWenDu(@Param("userId") Long userId,
-                                          @Param("parentId") Integer parentId);
+                                          @Param("parentId") Integer parentId,
+                                          @Param("today") String today);
 
     /** 
      * 分页查询指定行数据

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

@@ -20,11 +20,11 @@ public interface IPsdcThermometerHtdataService {
 
     AjaxResult selTodayThermometer();
 
-    AjaxResult sel8WnDu();
+    AjaxResult sel8WnDu(Integer modelId);
 
     PsdcDevicePowerRes selTotalElectricityInfo(Integer deviceId);
 
-    List selTodayThermometerById();
+    List selTodayThermometerById(Integer modelId);
 
     AjaxResult selDzglWenDu(Integer deviceId);
 

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

@@ -94,8 +94,8 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS
     }
 
     @Override
-    public AjaxResult sel8WnDu() {
+    public AjaxResult sel8WnDu(Integer modelId) {
-        List<PsdcThermometerDataRes> dataResList = psdcThermometerRtdataMapper.selWenDu(SecurityUtils.getUserId(), 16);
+        List<PsdcThermometerDataRes> dataResList = psdcThermometerRtdataMapper.selWenDu(SecurityUtils.getUserId(), modelId, sdf.format(new Date()));
         return AjaxResult.success(dataResList);
     }
 
@@ -114,12 +114,12 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS
     }
 
     @Override
-    public List<Map> selTodayThermometerById() {
+    public List<Map> selTodayThermometerById(Integer modelId) {
         Date date = new Date();
         String tb = sdf.format(date) + " 00:00:00"; // 今天开始检索时间
         String te = sdf.format(date) + " 23:59:59"; // 今天结束检索时间
         List<Map> ary = new ArrayList<>();
-        List<PsdcThermometerDataRes> dataResList = psdcThermometerRtdataMapper.selWenDu(SecurityUtils.getUserId(), 16);
+        List<PsdcThermometerDataRes> dataResList = psdcThermometerRtdataMapper.selWenDu(SecurityUtils.getUserId(), modelId, sdf.format(new Date()));
         for (PsdcThermometerDataRes dec : dataResList ){
             PsdcThermometerDataRes dataRes = psdcThermometerRtdataMapper.queryById(dec.getDeviceId(), sdf.format(date));
             if (null != dataRes){

psdc-business/src/main/resources/mapper/business/PsdcThermometerRtdataMapper.xml

@@ -39,6 +39,9 @@
         From psdc_thermometer_rtdata ptr
         Left Join psdc_device pd On pd.device_id = ptr.device_id
         Where pd.user_id = ${userId} And pd.parent_id = ${parentId}
+        <if test="today != null and today != ''">
+            And DATE_FORMAT(ptr.update_time,'%Y-%m-%d') = #{today}
+        </if>
     </select>
 
     <!--分页查询指定行数据-->

psdc-web/src/main/java/com/psdc/controller/index/Index.java

@@ -3,6 +3,7 @@ package com.psdc.controller.index;
 import com.psdc.core.domain.AjaxResult;
 import com.psdc.service.IPsdcThermometerHtdataService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -20,9 +21,9 @@ public class Index {
         return psdcThermometerHtdataService.selTodayThermometer();
     }
 
-    @RequestMapping(value = "/8wd", method = RequestMethod.GET)
+    @RequestMapping(value = "/8wd/{modelId}", method = RequestMethod.GET)
-    public AjaxResult sel8WenDu()  {
+    public AjaxResult sel8WenDu(@PathVariable(value = "modelId", required = false) Integer modelId)  {
-        return psdcThermometerHtdataService.sel8WnDu();
+        return psdcThermometerHtdataService.sel8WnDu(modelId);
     }
 
     @RequestMapping(value = "/zdb", method = RequestMethod.GET)

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

@@ -46,6 +46,7 @@ public class TotalElectricMeterController {
         for (PsdcDevice dd : list){
             Map<String, Object> map = new HashMap<>();
             map.put("modelName", dd.getDeviceModel());
+            map.put("modelId", dd.getDeviceId());
             List<Map> maps2 = new ArrayList<>();
             List<PsdcDevice> list2 = psdcDeviceService.queryByUserId(dd.getDeviceId());
             if (list2.size() > 0){

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

@@ -24,9 +24,9 @@ public class WenDuController {
     IPsdcThermometerHtdataService psdcThermometerHtdataService;
 
     @PreAuthorize("@ss.hasPermi('emonitor:wdcgq')")
-    @RequestMapping(value = "/sel1", method = RequestMethod.GET)
+    @RequestMapping(value = "/sel1/{modelId}", method = RequestMethod.GET)
-    public AjaxResult selwd(){
+    public AjaxResult selwd(@PathVariable(value = "modelId", required = false) Integer modelId){
-        return AjaxResult.success(psdcThermometerHtdataService.selTodayThermometerById());
+        return AjaxResult.success(psdcThermometerHtdataService.selTodayThermometerById(modelId));
     }
 
 }