2023-05-25 09:39:36 优化完善用户所属设备下拉列表查询接口!

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

@@ -86,6 +86,9 @@ public interface PsdcDeviceMapper{
      List<PsdcDevice> queryByUserId(@Param(value = "userId") Long userId,
                                     @Param(value = "parentId") Integer parentId);
 
+     List<PsdcDevice> queryByModel(@Param(value = "userId") Long userId,
+                                   @Param(value = "devModel") String devModel);
+
      /**
       * 根据设备id修改设备状态
       * @param deviceId

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

@@ -27,7 +27,7 @@ public interface PsdcThermometerRtdataMapper{
                                      @Param("today") String today);
 
     List<PsdcThermometerDataRes> selWenDu(@Param("userId") Long userId,
-                                          @Param("parentId") Integer parentId,
+                                          @Param("modelTypeName") String parentId,
                                           @Param("today") String today);
 
     /** 

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

@@ -64,6 +64,11 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService {
         return psdcDeviceMapper.queryByUserId(SecurityUtils.getUserId(), parent);
     }
 
+    @Override
+    public List<PsdcDevice> queryByModel(String model) {
+        return psdcDeviceMapper.queryByModel(SecurityUtils.getUserId(), model);
+    }
+
     public List<DeviceStatusVo> queryDeviceStatus() {
         List<PsdcDevice> psdcDevices = psdcDeviceMapper.queryByUserId(SecurityUtils.getUserId(), 0);
         return psdcDevices.stream().map(psdcDevice -> {

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

@@ -96,7 +96,7 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS
     }
 
     @Override
-    public AjaxResult sel8WnDu(Integer modelId) {
+    public AjaxResult sel8WnDu(String modelId) {
         List<PsdcThermometerDataRes> dataResList = psdcThermometerRtdataMapper.selWenDu(SecurityUtils.getUserId(), modelId, sdf.format(new Date()));
         return AjaxResult.success(dataResList);
     }
@@ -116,7 +116,7 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS
     }
 
     @Override
-    public List<Map> selTodayThermometerById(Integer modelId) {
+    public List<Map> selTodayThermometerById(String modelId) {
         Date date = new Date();
         String tb = sdf.format(date) + " 00:00:00"; // 今天开始检索时间
         String te = sdf.format(date) + " 23:59:59"; // 今天结束检索时间

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

@@ -101,6 +101,19 @@
                 And parent_id = #{parentId}
             </if>
         </where>
+        GROUP BY device_model
+    </select>
+
+    <select id="queryByModel" resultMap="PsdcDeviceMap">
+        Select * From psdc_device
+        <where>
+            <if test="userId != null and userId != ''">
+                And user_id = #{userId}
+            </if>
+            <if test="devModel != null and devModel != ''">
+                and device_model = #{devModel}
+            </if>
+        </where>
     </select>
 
     <!--分页查询指定行数据-->

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

@@ -40,7 +40,7 @@
         From psdc_device pd
         LEFT join psdc_thermometer_rtdata ptr on pd.device_id = ptr.device_id
         And DATE_FORMAT(ptr.update_time,'%Y-%m-%d %H') = #{today}
-        Where pd.user_id = ${userId} And pd.parent_id = ${parentId}
+        Where pd.user_id = ${userId} And pd.device_model = #{modelTypeName}
     </select>
 
     <!--分页查询指定行数据-->

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

@@ -46,9 +46,8 @@ 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());
+            List<PsdcDevice> list2 = psdcDeviceService.queryByModel(dd.getDeviceModel());
             if (list2.size() > 0){
                 for (PsdcDevice dev : list2){
                     Map<String, Object> map2 = new HashMap<>();

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

@@ -4,10 +4,7 @@ import com.psdc.core.domain.AjaxResult;
 import com.psdc.service.IPsdcThermometerHtdataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @Author：戴仕崑
@@ -24,9 +21,9 @@ public class WenDuController {
     IPsdcThermometerHtdataService psdcThermometerHtdataService;
 
     @PreAuthorize("@ss.hasPermi('emonitor:wdcgq')")
-    @RequestMapping(value = "/sel1/{modelId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/sel1", method = RequestMethod.POST)
-    public AjaxResult selwd(@PathVariable(value = "modelId", required = false) Integer modelId){
+    public AjaxResult selwd(@RequestParam(value="modelTypeName", defaultValue="") String modelname){
-        return AjaxResult.success(psdcThermometerHtdataService.selTodayThermometerById(modelId));
+        return AjaxResult.success(psdcThermometerHtdataService.selTodayThermometerById(modelname));
     }
 
 }