change - 蒸汽实时数据改为历史数据；新增蒸汽实时数据页面只显示最新的一条记录，实现其接口

os-ems/src/main/java/com/os/ems/record/controller/EmsRecordSteamInstantController.java

@@ -23,7 +23,7 @@ import com.os.common.utils.poi.ExcelUtil;
 import com.os.common.core.page.TableDataInfo;
 
 /**
- * 蒸汽实时数据Controller
+ * 蒸汽历史数据Controller
  *
  * @author Yinq
  * @date 2024-05-22
@@ -35,7 +35,7 @@ public class EmsRecordSteamInstantController extends BaseController {
     private IEmsRecordSteamInstantService emsRecordSteamInstantService;
 
     /**
-     * 查询蒸汽实时数据列表
+     * 查询蒸汽历史数据列表
      */
     @PreAuthorize("@ss.hasPermi('ems/record:recordSteamInstant:list')")
     @GetMapping("/list")
@@ -47,19 +47,19 @@ public class EmsRecordSteamInstantController extends BaseController {
     }
 
     /**
-     * 导出蒸汽实时数据列表
+     * 导出蒸汽历史数据列表
      */
     @PreAuthorize("@ss.hasPermi('ems/record:recordSteamInstant:export')")
-    @Log(title = "蒸汽实时数据", businessType = BusinessType.EXPORT)
+    @Log(title = "蒸汽历史数据", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EmsRecordSteamInstant emsRecordSteamInstant) {
         List<EmsRecordSteamInstant> list = emsRecordSteamInstantService.selectEmsRecordSteamInstantList(emsRecordSteamInstant);
         ExcelUtil<EmsRecordSteamInstant> util = new ExcelUtil<EmsRecordSteamInstant>(EmsRecordSteamInstant.class);
-        util.exportExcel(response, list, "蒸汽实时数据数据");
+        util.exportExcel(response, list, "蒸汽历史数据数据");
     }
 
     /**
-     * 获取蒸汽实时数据详细信息
+     * 获取蒸汽历史数据详细信息
      */
     @PreAuthorize("@ss.hasPermi('ems/record:recordSteamInstant:query')")
     @GetMapping(value = "/{objId}")
@@ -68,10 +68,10 @@ public class EmsRecordSteamInstantController extends BaseController {
     }
 
     /**
-     * 新增蒸汽实时数据
+     * 新增蒸汽历史数据
      */
     @PreAuthorize("@ss.hasPermi('ems/record:recordSteamInstant:add')")
-    @Log(title = "蒸汽实时数据", businessType = BusinessType.INSERT)
+    @Log(title = "蒸汽历史数据", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody EmsRecordSteamInstant emsRecordSteamInstant) {
         emsRecordSteamInstant.setCreateBy(getUsername());
@@ -79,10 +79,10 @@ public class EmsRecordSteamInstantController extends BaseController {
     }
 
     /**
-     * 修改蒸汽实时数据
+     * 修改蒸汽历史数据
      */
     @PreAuthorize("@ss.hasPermi('ems/record:recordSteamInstant:edit')")
-    @Log(title = "蒸汽实时数据", businessType = BusinessType.UPDATE)
+    @Log(title = "蒸汽历史数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody EmsRecordSteamInstant emsRecordSteamInstant) {
         emsRecordSteamInstant.setUpdateBy(getUsername());
@@ -90,24 +90,34 @@ public class EmsRecordSteamInstantController extends BaseController {
     }
 
     /**
-     * 删除蒸汽实时数据
+     * 删除蒸汽历史数据
      */
     @PreAuthorize("@ss.hasPermi('ems/record:recordSteamInstant:remove')")
-    @Log(title = "蒸汽实时数据", businessType = BusinessType.DELETE)
+    @Log(title = "蒸汽历史数据", businessType = BusinessType.DELETE)
     @DeleteMapping("/{objIds}")
     public AjaxResult remove(@PathVariable Long[] objIds) {
         return toAjax(emsRecordSteamInstantService.deleteEmsRecordSteamInstantByObjIds(objIds));
     }
 
     /**
-     * 查询蒸汽实时数据
+     * 查询蒸汽历史数据曲线
      * @param emsRecordSteamInstant
      * @return
      */
+    @PreAuthorize("@ss.hasPermi('ems/record:recordSteamInstant:list')")
     @GetMapping("/steamInstantList")
     public AjaxResult steamInstantList(EmsRecordSteamInstant emsRecordSteamInstant) {
         List<EmsRecordSteamInstant> list = emsRecordSteamInstantService
                 .selectEmsRecordSteamInstantList(emsRecordSteamInstant);
         return success(list);
     }
+
+    @PreAuthorize("@ss.hasPermi('ems/record:recordSteamInstant:list')")
+    @GetMapping("/latestSteamInstantList")
+    public AjaxResult latestSteamInstantList(EmsRecordSteamInstant emsRecordSteamInstant) {
+        List<EmsRecordSteamInstant> list = emsRecordSteamInstantService
+                .selectEmsRecordLatestSteamInstantList(emsRecordSteamInstant);
+        return success(list);
+    }
+
 }

os-ems/src/main/java/com/os/ems/record/domain/EmsRecordSteamInstant.java

@@ -10,7 +10,7 @@ import com.os.common.annotation.Excel;
 import com.os.common.core.domain.BaseEntity;
 
 /**
- * 蒸汽实时数据对象 ems_record_steam_instant
+ * 蒸汽历史数据对象 ems_record_steam_instant
  *
  * @author Yinq
  * @date 2024-05-22

os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordSteamInstantMapper.java

@@ -5,57 +5,60 @@ import java.util.List;
 import com.os.ems.record.domain.EmsRecordSteamInstant;
 
 /**
- * 蒸汽实时数据Mapper接口
+ * 蒸汽历史数据Mapper接口
  *
  * @author Yinq
  * @date 2024-05-22
  */
 public interface EmsRecordSteamInstantMapper {
     /**
-     * 查询蒸汽实时数据
+     * 查询蒸汽历史数据
      *
-     * @param objId 蒸汽实时数据主键
+     * @param objId 蒸汽历史数据主键
-     * @return 蒸汽实时数据
+     * @return 蒸汽历史数据
      */
     public EmsRecordSteamInstant selectEmsRecordSteamInstantByObjId(Long objId);
 
     /**
-     * 查询蒸汽实时数据列表
+     * 查询蒸汽历史数据列表
      *
-     * @param emsRecordSteamInstant 蒸汽实时数据
+     * @param emsRecordSteamInstant 蒸汽历史数据
-     * @return 蒸汽实时数据集合
+     * @return 蒸汽历史数据集合
      */
     public List<EmsRecordSteamInstant> selectEmsRecordSteamInstantList(EmsRecordSteamInstant emsRecordSteamInstant);
 
     /**
-     * 新增蒸汽实时数据
+     * 新增蒸汽历史数据
      *
-     * @param emsRecordSteamInstant 蒸汽实时数据
+     * @param emsRecordSteamInstant 蒸汽历史数据
      * @return 结果
      */
     public int insertEmsRecordSteamInstant(EmsRecordSteamInstant emsRecordSteamInstant);
 
     /**
-     * 修改蒸汽实时数据
+     * 修改蒸汽历史数据
      *
-     * @param emsRecordSteamInstant 蒸汽实时数据
+     * @param emsRecordSteamInstant 蒸汽历史数据
      * @return 结果
      */
     public int updateEmsRecordSteamInstant(EmsRecordSteamInstant emsRecordSteamInstant);
 
     /**
-     * 删除蒸汽实时数据
+     * 删除蒸汽历史数据
      *
-     * @param objId 蒸汽实时数据主键
+     * @param objId 蒸汽历史数据主键
      * @return 结果
      */
     public int deleteEmsRecordSteamInstantByObjId(Long objId);
 
     /**
-     * 批量删除蒸汽实时数据
+     * 批量删除蒸汽历史数据
      *
      * @param objIds 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteEmsRecordSteamInstantByObjIds(Long[] objIds);
+
+    public List<EmsRecordSteamInstant> selectEmsRecordLatestSteamInstantList(EmsRecordSteamInstant emsRecordSteamInstant);
+
 }

os-ems/src/main/java/com/os/ems/record/service/IEmsRecordSteamInstantService.java

@@ -5,57 +5,60 @@ import java.util.List;
 import com.os.ems.record.domain.EmsRecordSteamInstant;
 
 /**
- * 蒸汽实时数据Service接口
+ * 蒸汽历史数据Service接口
  *
  * @author Yinq
  * @date 2024-05-22
  */
 public interface IEmsRecordSteamInstantService {
     /**
-     * 查询蒸汽实时数据
+     * 查询蒸汽历史数据
      *
-     * @param objId 蒸汽实时数据主键
+     * @param objId 蒸汽历史数据主键
-     * @return 蒸汽实时数据
+     * @return 蒸汽历史数据
      */
     public EmsRecordSteamInstant selectEmsRecordSteamInstantByObjId(Long objId);
 
     /**
-     * 查询蒸汽实时数据列表
+     * 查询蒸汽历史数据列表
      *
-     * @param emsRecordSteamInstant 蒸汽实时数据
+     * @param emsRecordSteamInstant 蒸汽历史数据
-     * @return 蒸汽实时数据集合
+     * @return 蒸汽历史数据集合
      */
     public List<EmsRecordSteamInstant> selectEmsRecordSteamInstantList(EmsRecordSteamInstant emsRecordSteamInstant);
 
     /**
-     * 新增蒸汽实时数据
+     * 新增蒸汽历史数据
      *
-     * @param emsRecordSteamInstant 蒸汽实时数据
+     * @param emsRecordSteamInstant 蒸汽历史数据
      * @return 结果
      */
     public int insertEmsRecordSteamInstant(EmsRecordSteamInstant emsRecordSteamInstant);
 
     /**
-     * 修改蒸汽实时数据
+     * 修改蒸汽历史数据
      *
-     * @param emsRecordSteamInstant 蒸汽实时数据
+     * @param emsRecordSteamInstant 蒸汽历史数据
      * @return 结果
      */
     public int updateEmsRecordSteamInstant(EmsRecordSteamInstant emsRecordSteamInstant);
 
     /**
-     * 批量删除蒸汽实时数据
+     * 批量删除蒸汽历史数据
      *
-     * @param objIds 需要删除的蒸汽实时数据主键集合
+     * @param objIds 需要删除的蒸汽历史数据主键集合
      * @return 结果
      */
     public int deleteEmsRecordSteamInstantByObjIds(Long[] objIds);
 
     /**
-     * 删除蒸汽实时数据信息
+     * 删除蒸汽历史数据信息
      *
-     * @param objId 蒸汽实时数据主键
+     * @param objId 蒸汽历史数据主键
      * @return 结果
      */
     public int deleteEmsRecordSteamInstantByObjId(Long objId);
+
+
+    public List<EmsRecordSteamInstant> selectEmsRecordLatestSteamInstantList(EmsRecordSteamInstant emsRecordSteamInstant);
 }

os-ems/src/main/java/com/os/ems/record/service/impl/EmsRecordSteamInstantServiceImpl.java

@@ -9,7 +9,7 @@ import com.os.ems.record.domain.EmsRecordSteamInstant;
 import com.os.ems.record.service.IEmsRecordSteamInstantService;
 
 /**
- * 蒸汽实时数据Service业务层处理
+ * 蒸汽历史数据Service业务层处理
  *
  * @author Yinq
  * @date 2024-05-22
@@ -20,10 +20,10 @@ public class EmsRecordSteamInstantServiceImpl implements IEmsRecordSteamInstantS
     private EmsRecordSteamInstantMapper emsRecordSteamInstantMapper;
 
     /**
-     * 查询蒸汽实时数据
+     * 查询蒸汽历史数据
      *
-     * @param objId 蒸汽实时数据主键
+     * @param objId 蒸汽历史数据主键
-     * @return 蒸汽实时数据
+     * @return 蒸汽历史数据
      */
     @Override
     public EmsRecordSteamInstant selectEmsRecordSteamInstantByObjId(Long objId) {
@@ -31,10 +31,10 @@ public class EmsRecordSteamInstantServiceImpl implements IEmsRecordSteamInstantS
     }
 
     /**
-     * 查询蒸汽实时数据列表
+     * 查询蒸汽历史数据列表
      *
-     * @param emsRecordSteamInstant 蒸汽实时数据
+     * @param emsRecordSteamInstant 蒸汽历史数据
-     * @return 蒸汽实时数据
+     * @return 蒸汽历史数据
      */
     @Override
     public List<EmsRecordSteamInstant> selectEmsRecordSteamInstantList(EmsRecordSteamInstant emsRecordSteamInstant) {
@@ -42,9 +42,9 @@ public class EmsRecordSteamInstantServiceImpl implements IEmsRecordSteamInstantS
     }
 
     /**
-     * 新增蒸汽实时数据
+     * 新增蒸汽历史数据
      *
-     * @param emsRecordSteamInstant 蒸汽实时数据
+     * @param emsRecordSteamInstant 蒸汽历史数据
      * @return 结果
      */
     @Override
@@ -53,9 +53,9 @@ public class EmsRecordSteamInstantServiceImpl implements IEmsRecordSteamInstantS
     }
 
     /**
-     * 修改蒸汽实时数据
+     * 修改蒸汽历史数据
      *
-     * @param emsRecordSteamInstant 蒸汽实时数据
+     * @param emsRecordSteamInstant 蒸汽历史数据
      * @return 结果
      */
     @Override
@@ -64,9 +64,9 @@ public class EmsRecordSteamInstantServiceImpl implements IEmsRecordSteamInstantS
     }
 
     /**
-     * 批量删除蒸汽实时数据
+     * 批量删除蒸汽历史数据
      *
-     * @param objIds 需要删除的蒸汽实时数据主键
+     * @param objIds 需要删除的蒸汽历史数据主键
      * @return 结果
      */
     @Override
@@ -75,13 +75,27 @@ public class EmsRecordSteamInstantServiceImpl implements IEmsRecordSteamInstantS
     }
 
     /**
-     * 删除蒸汽实时数据信息
+     * 删除蒸汽历史数据信息
      *
-     * @param objId 蒸汽实时数据主键
+     * @param objId 蒸汽历史数据主键
      * @return 结果
      */
     @Override
     public int deleteEmsRecordSteamInstantByObjId(Long objId) {
         return emsRecordSteamInstantMapper.deleteEmsRecordSteamInstantByObjId(objId);
     }
+
+
+    /**
+     * 查询蒸汽实时最后一条数据列表
+     *
+     * @param emsRecordSteamInstant 蒸汽历史数据
+     * @return 蒸汽实时数据
+     */
+    @Override
+    public List<EmsRecordSteamInstant> selectEmsRecordLatestSteamInstantList(EmsRecordSteamInstant emsRecordSteamInstant){
+/*        return emsRecordSteamInstantMapper.selectEmsRecordLatestSteamInstantList(emsRecordSteamInstant);*/
+        //只返回第一条数据
+        return emsRecordSteamInstantMapper.selectEmsRecordSteamInstantList(emsRecordSteamInstant).subList(0,1);
+    }
 }

os-ems/src/main/resources/mapper/ems/record/EmsRecordSteamInstantMapper.xml

@@ -65,6 +65,31 @@
         where ersi.obj_id = #{objId}
     </select>
 
+    <select id="selectEmsRecordLatestSteamInstantList"
+            parameterType="EmsRecordSteamInstant"
+            resultMap="EmsRecordSteamInstantResult">
+        <include refid="selectEmsRecordSteamInstantVo"/>
+        <where>
+            <if test="objId != null">and ersi.obj_id = #{objId}</if>
+            <if test="monitorCode != null  and monitorCode != ''">and ersi.monitor_code = #{monitorCode}</if>
+            <if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
+                and ersi.collect_time between #{params.beginCollectTime} and #{params.endCollectTime}
+            </if>
+            <if test="fluxFlow != null ">and ersi.flux_flow = #{fluxFlow}</if>
+            <if test="steamFlow != null ">and ersi.steam_flow = #{steamFlow}</if>
+            <if test="heatInstantValue != null ">and ersi.heat_instant_value = #{heatInstantValue}</if>
+            <if test="heatTotalValue != null ">and ersi.heat_total_value = #{heatTotalValue}</if>
+            <if test="temperature != null ">and ersi.temperature = #{temperature}</if>
+            <if test="press != null ">and ersi.press = #{press}</if>
+            <if test="density != null ">and ersi.density = #{density}</if>
+            <if test="differencePress != null ">and ersi.difference_press = #{differencePress}</if>
+            <if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != ''">
+                and ersi.record_time between #{params.beginRecordTime} and #{params.endRecordTime}
+            </if>
+        </where>
+        order by ersi.obj_id desc
+    </select>
+
     <insert id="insertEmsRecordSteamInstant" parameterType="EmsRecordSteamInstant" useGeneratedKeys="true"
             keyProperty="objId">
         insert into ems_record_steam_instant