src/main/java/com/whyc/controller/CKPowerDevBattSetLogController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/dto/BattRtSetDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/CKPowerDevBattSetLogMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevBattSetLog.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/CKPowerDevBattSetLogService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/CKPowerDevBattSetLogController.java
New file @@ -0,0 +1,24 @@ package com.whyc.controller; import com.whyc.dto.Response; import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattSetLog; import com.whyc.service.CKPowerDevBattSetLogService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @Api(tags = "核容装置日志") @RequestMapping("cKPowerDevBattSetLog") public class CKPowerDevBattSetLogController { @Autowired private CKPowerDevBattSetLogService service; @PostMapping("getBattSetLog") @ApiOperation("获取核容装置日志") public Response getBattSetLog(@RequestBody CKPowerDevBattSetLog battSetLog){ return service.getBattSetLog(battSetLog); } } src/main/java/com/whyc/dto/BattRtSetDto.java
@@ -2,11 +2,15 @@ import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattRtDataSet; import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattRtStateSet; import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattSetLog; import java.util.List; public class BattRtSetDto { private CKPowerDevBattRtDataSet dataSet; private CKPowerDevBattRtStateSet stateSet; private List<CKPowerDevBattSetLog> logList; public CKPowerDevBattRtDataSet getDataSet() { return dataSet; @@ -23,4 +27,12 @@ public void setStateSet(CKPowerDevBattRtStateSet stateSet) { this.stateSet = stateSet; } public List<CKPowerDevBattSetLog> getLogList() { return logList; } public void setLogList(List<CKPowerDevBattSetLog> logList) { this.logList = logList; } } src/main/java/com/whyc/mapper/CKPowerDevBattSetLogMapper.java
New file @@ -0,0 +1,6 @@ package com.whyc.mapper; import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattSetLog; public interface CKPowerDevBattSetLogMapper extends CustomMapper<CKPowerDevBattSetLog>{ } src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevBattSetLog.java
New file @@ -0,0 +1,67 @@ package com.whyc.pojo.db_ckpwrdev_data_rt; import com.baomidou.mybatisplus.annotation.*; 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 java.io.Serializable; import java.util.Date; /** * <p> * 核容装置控制记录表 * </p> * * @author lxw * @since 2023-12-19 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName(schema = "db_ckpwrdev_data_rt",value = "tb_ckpowerdev_batt_set_log") @ApiModel(value="CkpowerdevBattSetLog对象", description="核容装置控制记录表") public class CKPowerDevBattSetLog implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.AUTO) private Long id; @ApiModelProperty(value = "设备类型") private Integer devType; @ApiModelProperty(value = "操作类型") private Integer cmdType; @ApiModelProperty(value = "电池组名称") private Integer battIndex; @ApiModelProperty(value = "被设置的参数") private String param; @ApiModelProperty(value = "被设置的参数中文名") private String paramCn; @ApiModelProperty(value = "参数的模拟值") private Float value; private Date createTime; @TableField(exist = false) private Date createTime1; @JsonFormat(pattern = "yyyy-MM-dd") private Date createDay; @TableField(exist = false) private int pageCurr; @TableField(exist = false) private int pageSize; } src/main/java/com/whyc/service/CKPowerDevBattRtStateSetService.java
@@ -6,13 +6,13 @@ import com.whyc.dto.BattRtSetDto; import com.whyc.dto.Response; import com.whyc.mapper.CKPowerDevBattRtStateSetMapper; import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattRtDataSet; import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattRtStateSet; import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevSignalSet; import com.whyc.pojo.db_ckpwrdev_data_rt.*; import com.whyc.util.OpCmdUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; import java.util.List; @Service public class CKPowerDevBattRtStateSetService { @@ -22,6 +22,9 @@ @Resource private CKPowerDevBattRtDataSetService dataSetService; @Resource private CKPowerDevBattSetLogService setLogService; public Response update(BattRtSetDto set) { CKPowerDevBattRtDataSet dataSet = set.getDataSet(); @@ -33,6 +36,17 @@ dataSetService.update(dataSet); //读取opCmd返回是否成功 QueryWrapper<CKPowerDevBattRtStateSet> query = Wrappers.query(); return OpCmdUtil.getOpStatus(mapper, query, set.getStateSet().getOpCmd(),20,set.getStateSet().getBattIndex()); Response opStatus =OpCmdUtil.getOpStatus(mapper, query, set.getStateSet().getOpCmd(),20,set.getStateSet().getBattIndex()); if(opStatus.getData()!=null && (boolean)opStatus.getData()) { //成功 //记录日志 Date now = new Date(); List<CKPowerDevBattSetLog> logList = set.getLogList(); logList.forEach(log->{ log.setCreateTime(now); log.setCreateDay(now); }); setLogService.addBatch(logList); } return opStatus; } } src/main/java/com/whyc/service/CKPowerDevBattSetLogService.java
New file @@ -0,0 +1,47 @@ package com.whyc.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.whyc.dto.Response; import com.whyc.mapper.CKPowerDevBattSetLogMapper; import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattSetLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @Service public class CKPowerDevBattSetLogService { @Autowired(required = false) private CKPowerDevBattSetLogMapper mapper; //获取核容装置日志 public Response getBattSetLog(CKPowerDevBattSetLog battSetLog) { PageHelper.startPage(battSetLog.getPageCurr(),battSetLog.getPageSize()); QueryWrapper wrapper=new QueryWrapper(); if(battSetLog.getDevType()!=null){ wrapper.eq("dev_type",battSetLog.getDevType()); } if(battSetLog.getCmdType()!=null){ wrapper.eq("cmd_type",battSetLog.getDevType()); } if(battSetLog.getParamCn()!=null){ wrapper.eq("param_cn",battSetLog.getDevType()); } if(battSetLog.getCreateTime()!=null){ wrapper.ge("create_time",battSetLog.getCreateTime()); } if(battSetLog.getCreateTime1()!=null){ wrapper.le("create_time",battSetLog.getCreateTime1()); } wrapper.orderByDesc("create_time"); List<CKPowerDevBattSetLog> list=mapper.selectList(wrapper); PageInfo pageInfo=new PageInfo(list); return new Response().setII(1,list!=null,pageInfo,"获取核容装置日志"); } //添加记录 public void addBatch(List<CKPowerDevBattSetLog> logList) { mapper.insertBatchSomeColumn(logList); } }