diff --git a/kh-modules/src/main/java/com/jero/modules/controller/KhOilRealtimeDataController.java b/kh-modules/src/main/java/com/jero/modules/controller/KhOilRealtimeDataController.java new file mode 100644 index 00000000..cf1213b5 --- /dev/null +++ b/kh-modules/src/main/java/com/jero/modules/controller/KhOilRealtimeDataController.java @@ -0,0 +1,66 @@ +package com.jero.modules.controller; + +import java.util.Map; + +import com.jero.common.api.vo.Results; +import com.jero.modules.entity.KhOilRealtimeData; +import com.jero.modules.service.IKhOilRealtimeDataService; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + +/** + * @Description: 油井实时数据 + * @Author: jero-boot + * @Date: 2024-04-02 + * @Version: V1.0 + */ +@Api(tags = "油井实时数据") +@RestController +@RequestMapping("/khOilRealtimeData") +@Slf4j +public class KhOilRealtimeDataController extends JeroController { + + @Autowired + private IKhOilRealtimeDataService khOilRealtimeDataService; + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "油井实时数据-通过id查询") + @ApiOperation(value = "油井实时数据-通过id查询", notes = "油井实时数据-通过id查询") + @GetMapping(value = "/queryById") + public Results queryById(@RequestParam(name = "id", required = true) String id) { + KhOilRealtimeData khOilRealtimeData = khOilRealtimeDataService.queryById(id); + if (khOilRealtimeData == null) { + return Results.error("未找到对应数据"); + } + return Results.OK(khOilRealtimeData); + } + + /** + * 返回动态数据 + * + * @param id + * @return + */ + @AutoLog(value = "油井实时数据-返回动态数据") + @ApiOperation(value = "油井实时数据-返回动态数据", notes = "油井实时数据-返回动态数据") + @GetMapping(value = "/realtimeDataResults") + public Results> realtimeDataResults(@RequestParam(name = "id", required = true) String id) { + if (!id.equals("default")) { + return Results.error("未找到对应数据"); + } + Map khOilRealtimeData = khOilRealtimeDataService.realtimeDataResults(id); + return Results.OK(khOilRealtimeData); + } + +} diff --git a/kh-modules/src/main/java/com/jero/modules/entity/KhOilRealTimeData.java b/kh-modules/src/main/java/com/jero/modules/entity/KhOilRealtimeData.java similarity index 70% rename from kh-modules/src/main/java/com/jero/modules/entity/KhOilRealTimeData.java rename to kh-modules/src/main/java/com/jero/modules/entity/KhOilRealtimeData.java index c7469a3e..01cd5599 100644 --- a/kh-modules/src/main/java/com/jero/modules/entity/KhOilRealTimeData.java +++ b/kh-modules/src/main/java/com/jero/modules/entity/KhOilRealtimeData.java @@ -3,13 +3,16 @@ package com.jero.modules.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * @author: Mzaxd @@ -17,11 +20,11 @@ import java.io.Serializable; */ @Data -@TableName("kh_oil_realTime_data") +@TableName("kh_oil_realtime_data") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="kh_oil_realTime_data对象", description="油井实时数据") -public class KhOilRealTimeData implements Serializable { +public class KhOilRealtimeData implements Serializable { private static final long serialVersionUID = 1L; /** @@ -31,6 +34,30 @@ public class KhOilRealTimeData implements Serializable { @ApiModelProperty(value = "id") private String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /** * 油压 */ @@ -127,4 +154,10 @@ public class KhOilRealTimeData implements Serializable { @ApiModelProperty(value = "冲次") private int strokeCount; + /** + * 设备唯一标识 + */ + @ApiModelProperty(value = "设备唯一标识") + private int deviceId; + } diff --git a/kh-modules/src/main/java/com/jero/modules/mapper/KhOilRealtimeDataMapper.java b/kh-modules/src/main/java/com/jero/modules/mapper/KhOilRealtimeDataMapper.java new file mode 100644 index 00000000..d8c0d9c0 --- /dev/null +++ b/kh-modules/src/main/java/com/jero/modules/mapper/KhOilRealtimeDataMapper.java @@ -0,0 +1,15 @@ +package com.jero.modules.mapper; + + +import com.jero.modules.entity.KhOilRealtimeData; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 油井实时数据 + * @Author: jero-boot + * @Date: 2024-04-02 + * @Version: V1.0 + */ +public interface KhOilRealtimeDataMapper extends BaseMapper { + +} diff --git a/kh-modules/src/main/java/com/jero/modules/mapper/xml/KhOilRealtimeDataMapper.xml b/kh-modules/src/main/java/com/jero/modules/mapper/xml/KhOilRealtimeDataMapper.xml new file mode 100644 index 00000000..b0892690 --- /dev/null +++ b/kh-modules/src/main/java/com/jero/modules/mapper/xml/KhOilRealtimeDataMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/kh-modules/src/main/java/com/jero/modules/service/IKhOilRealtimeDataService.java b/kh-modules/src/main/java/com/jero/modules/service/IKhOilRealtimeDataService.java new file mode 100644 index 00000000..d0f60441 --- /dev/null +++ b/kh-modules/src/main/java/com/jero/modules/service/IKhOilRealtimeDataService.java @@ -0,0 +1,48 @@ +package com.jero.modules.service; + +import com.jero.modules.entity.KhOilRealtimeData; +import com.baomidou.mybatisplus.extension.service.IService; +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +/** + * @Description: 油井实时数据 + * @Author: jero-boot + * @Date: 2024-04-02 + * @Version: V1.0 + */ +public interface IKhOilRealtimeDataService extends IService { + + /** + * 列表查询 + * + * @param khOilRealtimeData + * @param req + * @return + */ + List queryList(KhOilRealtimeData khOilRealtimeData, HttpServletRequest req); + + /** + * 保存 + * + * @param khOilRealtimeData + * @return + */ + void add(KhOilRealtimeData khOilRealtimeData); + + /** + * 通过id查询 + * + * @param id + * @return + */ + KhOilRealtimeData queryById(String id); + + /** + * 实时数据 + * @param id + * @return + */ + Map realtimeDataResults(String id); +} diff --git a/kh-modules/src/main/java/com/jero/modules/service/impl/KhOilRealtimeDataServiceImpl.java b/kh-modules/src/main/java/com/jero/modules/service/impl/KhOilRealtimeDataServiceImpl.java new file mode 100644 index 00000000..fa7604a9 --- /dev/null +++ b/kh-modules/src/main/java/com/jero/modules/service/impl/KhOilRealtimeDataServiceImpl.java @@ -0,0 +1,72 @@ +package com.jero.modules.service.impl; + +import com.jero.modules.entity.KhOilRealtimeData; +import com.jero.modules.mapper.KhOilRealtimeDataMapper; +import com.jero.modules.service.IKhOilRealtimeDataService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.jero.common.exception.JeroBootException; +import java.util.List; +import java.util.Date; +import java.util.Map; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.system.query.QueryGenerator; +import javax.servlet.http.HttpServletRequest; + + +/** + * @Description: 油井实时数据 + * @Author: jero-boot + * @Date: 2024-04-02 + * @Version: V1.0 + */ +@Service +@Transactional(rollbackFor = JeroBootException.class) +public class KhOilRealtimeDataServiceImpl extends ServiceImpl implements IKhOilRealtimeDataService { + + + /** + * 列表查询 + * + * @param khOilRealtimeData + * @param req + * @return + */ + @Override + public List queryList(KhOilRealtimeData khOilRealtimeData, HttpServletRequest req) { + return list(QueryGenerator.initQueryWrapper(khOilRealtimeData, req.getParameterMap())); + } + + /** + * 保存 + * + * @param khOilRealtimeData + * @return + */ + @Override + public void add(KhOilRealtimeData khOilRealtimeData) { + Date now = new Date(); + khOilRealtimeData.setCreateTime(now); + khOilRealtimeData.setUpdateTime(now); + save(khOilRealtimeData); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public KhOilRealtimeData queryById(String id) { + return getById(id); + } + + @Override + public Map realtimeDataResults(String id) { + KhOilRealtimeData khOilRealtimeData = new KhOilRealtimeData(); + + return null; + } +}