From 962075ddb8828f1a7b4b93e90dda6eb1a105cf5a Mon Sep 17 00:00:00 2001 From: tx <15413105+tx3800@user.noreply.gitee.com> Date: Thu, 27 Feb 2025 12:47:33 +0800 Subject: [PATCH 1/2] tx --- .idea/misc.xml | 5 -- .../controller/TimelyWarningController.java | 43 ++++++++++++ .../carbon/mapper/TimelyWarningMapper.java | 12 ++++ .../net/carbon/model/po/TimelyWarningDO.java | 31 +++++++++ .../model/request/TimelyWarningRequest.java | 17 +++++ .../net/carbon/model/vo/TimelyWarningVO.java | 17 +++++ .../carbon/service/TimelyWarningService.java | 15 +++++ .../impl/TimelyWarningServiceImpl.java | 65 +++++++++++++++++++ .../resources/mapper/TimelyWarningMapper.xml | 7 ++ 9 files changed, 207 insertions(+), 5 deletions(-) create mode 100644 server/src/main/java/net/carbon/controller/TimelyWarningController.java create mode 100644 server/src/main/java/net/carbon/mapper/TimelyWarningMapper.java create mode 100644 server/src/main/java/net/carbon/model/po/TimelyWarningDO.java create mode 100644 server/src/main/java/net/carbon/model/request/TimelyWarningRequest.java create mode 100644 server/src/main/java/net/carbon/model/vo/TimelyWarningVO.java create mode 100644 server/src/main/java/net/carbon/service/TimelyWarningService.java create mode 100644 server/src/main/java/net/carbon/service/impl/TimelyWarningServiceImpl.java create mode 100644 server/src/main/resources/mapper/TimelyWarningMapper.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index f3962d1..4731638 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,11 +7,6 @@ - diff --git a/server/src/main/java/net/carbon/controller/TimelyWarningController.java b/server/src/main/java/net/carbon/controller/TimelyWarningController.java new file mode 100644 index 0000000..3e67944 --- /dev/null +++ b/server/src/main/java/net/carbon/controller/TimelyWarningController.java @@ -0,0 +1,43 @@ +package net.carbon.controller; + +import net.carbon.bean.PageResponse; +import net.carbon.model.request.TimelyWarningRequest; +import net.carbon.model.vo.TimelyWarningVO; +import net.carbon.result.Result; +import net.carbon.service.TimelyWarningService; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api") +public class TimelyWarningController { + private TimelyWarningService timelyWarningService; + + @GetMapping("/TimelyWarning") + public Result> get(@RequestParam("pageSize") Long pageSize, @RequestParam("page") Long page) { + return Result.success(timelyWarningService.getList(pageSize, page)); + } + + @DeleteMapping("warn/delete") + public Result delete(@RequestParam("id") Long id) { + int row = timelyWarningService.delete(id); + if (row > 0) { + return Result.success(); + } + return Result.error("删除失败"); + } + + @PostMapping("warn/edit") + public Result update(@RequestBody TimelyWarningRequest timelyWarningRequest) { + int row = timelyWarningService.updateById(timelyWarningRequest); + if (row > 0) { + return Result.success(); + } + return Result.error("修改失败"); + } + + @PostMapping("warn/add") + public Result add(@RequestBody TimelyWarningRequest timelyWarningRequest) { + timelyWarningService.add(timelyWarningRequest); + return Result.success(); + } +} diff --git a/server/src/main/java/net/carbon/mapper/TimelyWarningMapper.java b/server/src/main/java/net/carbon/mapper/TimelyWarningMapper.java new file mode 100644 index 0000000..b9a83eb --- /dev/null +++ b/server/src/main/java/net/carbon/mapper/TimelyWarningMapper.java @@ -0,0 +1,12 @@ +package net.carbon.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.carbon.model.po.TimelyWarningDO; +import org.apache.ibatis.annotations.Mapper; + + +@Mapper +public interface TimelyWarningMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/server/src/main/java/net/carbon/model/po/TimelyWarningDO.java b/server/src/main/java/net/carbon/model/po/TimelyWarningDO.java new file mode 100644 index 0000000..b4d8a31 --- /dev/null +++ b/server/src/main/java/net/carbon/model/po/TimelyWarningDO.java @@ -0,0 +1,31 @@ +package net.carbon.model.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +import java.io.Serializable; + + +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("timely_warning") +public class TimelyWarningDO implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableField("id") + private Long id; + + @TableField("name") + private String name; + + @TableField("unit") + private String unit; + + @TableField("data") + private Double data; + + @TableField("direction") + private String direction; +} diff --git a/server/src/main/java/net/carbon/model/request/TimelyWarningRequest.java b/server/src/main/java/net/carbon/model/request/TimelyWarningRequest.java new file mode 100644 index 0000000..395c576 --- /dev/null +++ b/server/src/main/java/net/carbon/model/request/TimelyWarningRequest.java @@ -0,0 +1,17 @@ +package net.carbon.model.request; + +import lombok.Data; + +@Data +public class TimelyWarningRequest { + + private Long id; + + private String name; + + private String unit; + + private Double data; + + private String direction; +} diff --git a/server/src/main/java/net/carbon/model/vo/TimelyWarningVO.java b/server/src/main/java/net/carbon/model/vo/TimelyWarningVO.java new file mode 100644 index 0000000..d3e179b --- /dev/null +++ b/server/src/main/java/net/carbon/model/vo/TimelyWarningVO.java @@ -0,0 +1,17 @@ +package net.carbon.model.vo; + +import lombok.Data; + +@Data +public class TimelyWarningVO { + + private Long id; + + private String name; + + private String unit; + + private Double data; + + private String direction; +} diff --git a/server/src/main/java/net/carbon/service/TimelyWarningService.java b/server/src/main/java/net/carbon/service/TimelyWarningService.java new file mode 100644 index 0000000..827ecb1 --- /dev/null +++ b/server/src/main/java/net/carbon/service/TimelyWarningService.java @@ -0,0 +1,15 @@ +package net.carbon.service; + +import net.carbon.bean.PageResponse; +import net.carbon.model.request.TimelyWarningRequest; +import net.carbon.model.vo.TimelyWarningVO; + +public interface TimelyWarningService { + PageResponse getList(Long pageSize, Long page); + + int delete(Long id); + + int updateById(TimelyWarningRequest timelyWarningRequest); + + void add(TimelyWarningRequest timelyWarningRequest); +} diff --git a/server/src/main/java/net/carbon/service/impl/TimelyWarningServiceImpl.java b/server/src/main/java/net/carbon/service/impl/TimelyWarningServiceImpl.java new file mode 100644 index 0000000..3209777 --- /dev/null +++ b/server/src/main/java/net/carbon/service/impl/TimelyWarningServiceImpl.java @@ -0,0 +1,65 @@ +package net.carbon.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.carbon.bean.PageResponse; +import net.carbon.mapper.TimelyWarningMapper; +import net.carbon.model.po.TimelyWarningDO; +import net.carbon.model.request.TimelyWarningRequest; +import net.carbon.model.vo.TimelyWarningVO; +import net.carbon.service.TimelyWarningService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class TimelyWarningServiceImpl implements TimelyWarningService { + + @Autowired + private TimelyWarningMapper timelyWarningMapper; + @Override + public PageResponse getList(Long pageSize, Long page) { + Page pageInfo = new Page<>(page, pageSize); + IPage TimelyWarningDOPage = timelyWarningMapper.selectPage(pageInfo, new LambdaQueryWrapper()); + + PageResponse pageResponse = new PageResponse<>(); + + List TimelyWarningVOS = TimelyWarningDOPage.getRecords().stream().map(obj -> { + TimelyWarningVO timelyWarningVO = new TimelyWarningVO(); + BeanUtils.copyProperties(obj, timelyWarningVO); + return timelyWarningVO; + }).collect(Collectors.toList()); + + pageResponse.setPageSize(TimelyWarningDOPage.getSize()); + pageResponse.setCurrent(TimelyWarningDOPage.getCurrent()); + pageResponse.setTotal(TimelyWarningDOPage.getTotal()); + pageResponse.setRecords(TimelyWarningVOS); + return pageResponse; + } + + @Override + public int delete(Long id) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(TimelyWarningDO::getId, id); + return timelyWarningMapper.delete(queryWrapper); + } + + @Override + public int updateById(TimelyWarningRequest timelyWarningRequest) { + TimelyWarningDO timelyWarningDO = new TimelyWarningDO(); + BeanUtils.copyProperties(timelyWarningRequest, timelyWarningDO); + int row = timelyWarningMapper.updateById(timelyWarningDO); + return row; + } + + @Override + public void add(TimelyWarningRequest timelyWarningRequest) { + TimelyWarningDO timelyWarningDO = new TimelyWarningDO(); + BeanUtils.copyProperties(timelyWarningRequest, timelyWarningDO); + timelyWarningMapper.insert(timelyWarningDO); + } +} diff --git a/server/src/main/resources/mapper/TimelyWarningMapper.xml b/server/src/main/resources/mapper/TimelyWarningMapper.xml new file mode 100644 index 0000000..c73d726 --- /dev/null +++ b/server/src/main/resources/mapper/TimelyWarningMapper.xml @@ -0,0 +1,7 @@ + + + + + + + From db4938fec5984c6499d96264c9221f8f2dfe0b07 Mon Sep 17 00:00:00 2001 From: tx <15413105+tx3800@user.noreply.gitee.com> Date: Thu, 27 Feb 2025 19:38:10 +0800 Subject: [PATCH 2/2] tx --- .../carbon/controller/TimelyWarningController.java | 12 +++++++----- .../java/net/carbon/mapper/TimelyWarningMapper.java | 5 +++++ .../service/impl/TimelyWarningServiceImpl.java | 4 +--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/server/src/main/java/net/carbon/controller/TimelyWarningController.java b/server/src/main/java/net/carbon/controller/TimelyWarningController.java index 3e67944..d7c1468 100644 --- a/server/src/main/java/net/carbon/controller/TimelyWarningController.java +++ b/server/src/main/java/net/carbon/controller/TimelyWarningController.java @@ -5,19 +5,21 @@ import net.carbon.model.request.TimelyWarningRequest; import net.carbon.model.vo.TimelyWarningVO; import net.carbon.result.Result; import net.carbon.service.TimelyWarningService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController -@RequestMapping("/api") public class TimelyWarningController { + + @Autowired private TimelyWarningService timelyWarningService; - @GetMapping("/TimelyWarning") + @GetMapping("/api/TimelyWarning") public Result> get(@RequestParam("pageSize") Long pageSize, @RequestParam("page") Long page) { return Result.success(timelyWarningService.getList(pageSize, page)); } - @DeleteMapping("warn/delete") + @DeleteMapping("/api/warn/delete") public Result delete(@RequestParam("id") Long id) { int row = timelyWarningService.delete(id); if (row > 0) { @@ -26,7 +28,7 @@ public class TimelyWarningController { return Result.error("删除失败"); } - @PostMapping("warn/edit") + @PostMapping("/api/warn/edit") public Result update(@RequestBody TimelyWarningRequest timelyWarningRequest) { int row = timelyWarningService.updateById(timelyWarningRequest); if (row > 0) { @@ -35,7 +37,7 @@ public class TimelyWarningController { return Result.error("修改失败"); } - @PostMapping("warn/add") + @PostMapping("/api/warn/add") public Result add(@RequestBody TimelyWarningRequest timelyWarningRequest) { timelyWarningService.add(timelyWarningRequest); return Result.success(); diff --git a/server/src/main/java/net/carbon/mapper/TimelyWarningMapper.java b/server/src/main/java/net/carbon/mapper/TimelyWarningMapper.java index b9a83eb..b97b11e 100644 --- a/server/src/main/java/net/carbon/mapper/TimelyWarningMapper.java +++ b/server/src/main/java/net/carbon/mapper/TimelyWarningMapper.java @@ -3,10 +3,15 @@ package net.carbon.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import net.carbon.model.po.TimelyWarningDO; +import net.carbon.model.request.TimelyWarningRequest; +import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; @Mapper public interface TimelyWarningMapper extends BaseMapper { + @Insert("insert into timely_warning (name, unit, data, direction) values " + + "(#{name},#{unit},#{data},#{direction})") + void add(TimelyWarningRequest timelyWarningRequest); } \ No newline at end of file diff --git a/server/src/main/java/net/carbon/service/impl/TimelyWarningServiceImpl.java b/server/src/main/java/net/carbon/service/impl/TimelyWarningServiceImpl.java index 3209777..3931e96 100644 --- a/server/src/main/java/net/carbon/service/impl/TimelyWarningServiceImpl.java +++ b/server/src/main/java/net/carbon/service/impl/TimelyWarningServiceImpl.java @@ -58,8 +58,6 @@ public class TimelyWarningServiceImpl implements TimelyWarningService { @Override public void add(TimelyWarningRequest timelyWarningRequest) { - TimelyWarningDO timelyWarningDO = new TimelyWarningDO(); - BeanUtils.copyProperties(timelyWarningRequest, timelyWarningDO); - timelyWarningMapper.insert(timelyWarningDO); + timelyWarningMapper.add(timelyWarningRequest); } }