From 04ce1d87d59aa94f37aa06d49f71ac4af41dce70 Mon Sep 17 00:00:00 2001 From: Penknife Date: Thu, 16 Jan 2025 14:14:36 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E8=A1=A5=E5=85=85=E5=81=9C=E6=9C=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProStoppageController.java | 48 +++++++++++++++++++ .../com/fizz/business/domain/ProStoppage.java | 44 +++++++++++++++++ .../fizz/business/form/ProStoppageForm.java | 13 +++++ .../business/mapper/ProStoppageMapper.java | 8 ++++ .../business/service/ProStoppageService.java | 19 ++++++++ .../service/impl/CrmPdoExcoilServiceImpl.java | 12 +---- .../service/impl/ProStoppageServiceImpl.java | 42 ++++++++++++++++ .../resources/mapper/ProStoppageMapper.xml | 5 ++ 8 files changed, 181 insertions(+), 10 deletions(-) create mode 100644 business/src/main/java/com/fizz/business/controller/ProStoppageController.java create mode 100644 business/src/main/java/com/fizz/business/domain/ProStoppage.java create mode 100644 business/src/main/java/com/fizz/business/form/ProStoppageForm.java create mode 100644 business/src/main/java/com/fizz/business/mapper/ProStoppageMapper.java create mode 100644 business/src/main/java/com/fizz/business/service/ProStoppageService.java create mode 100644 business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java create mode 100644 business/src/main/resources/mapper/ProStoppageMapper.xml diff --git a/business/src/main/java/com/fizz/business/controller/ProStoppageController.java b/business/src/main/java/com/fizz/business/controller/ProStoppageController.java new file mode 100644 index 0000000..6444c44 --- /dev/null +++ b/business/src/main/java/com/fizz/business/controller/ProStoppageController.java @@ -0,0 +1,48 @@ +package com.fizz.business.controller; + +import com.fizz.business.domain.CrmPdoExcoil; +import com.fizz.business.domain.ProStoppage; +import com.fizz.business.form.CrmPdoExcoilForm; +import com.fizz.business.form.ProStoppageForm; +import com.fizz.business.service.CrmPdoExcoilService; +import com.fizz.business.service.ProStoppageService; +import com.ruoyi.common.core.domain.R; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +@RequestMapping("/stoppage") +@Api("南钢停机接口") +public class ProStoppageController { + + @Resource + private ProStoppageService proStoppageService; + + @PostMapping("/add") + @ApiOperation("新增实绩") + public R add(@RequestBody ProStoppage proStoppage) { + return R.ok(proStoppageService.addProStoppage(proStoppage)); + } + + @PutMapping("/update") + @ApiOperation("修改") + public R update(@RequestBody ProStoppage proStoppage) { + return R.ok(proStoppageService.updateProStoppage(proStoppage)); + } + + @DeleteMapping("/delete/{stopid}") + @ApiOperation("删除实绩") + public R delete(@PathVariable Long stopid) { + return R.ok(proStoppageService.deleteProStoppage(stopid)); + } + + @PostMapping("/list") + @ApiOperation("查询实绩列表") + public R> list(@RequestBody ProStoppageForm form) { + return R.ok(proStoppageService.listAll(form)); + } +} diff --git a/business/src/main/java/com/fizz/business/domain/ProStoppage.java b/business/src/main/java/com/fizz/business/domain/ProStoppage.java new file mode 100644 index 0000000..cb994f1 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/ProStoppage.java @@ -0,0 +1,44 @@ +package com.fizz.business.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; + + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Data +@TableName("pro_stoppage") +@ApiModel(value = "ProStoppage对象", description = "") +public class ProStoppage implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long stopid; + + private String encoilid; + + private String shift; + + private String crew; + + private String area; + + private String unit; + + private String seton; + + private LocalDateTime startDate; + + private LocalDateTime endDate; + + private Float duration; + + private String insDate; + + private String stopType; + + private String remark; + +} diff --git a/business/src/main/java/com/fizz/business/form/ProStoppageForm.java b/business/src/main/java/com/fizz/business/form/ProStoppageForm.java new file mode 100644 index 0000000..1450e6d --- /dev/null +++ b/business/src/main/java/com/fizz/business/form/ProStoppageForm.java @@ -0,0 +1,13 @@ +package com.fizz.business.form; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class ProStoppageForm { + @ApiModelProperty(value = "开始日期") + private String startDate; + + @ApiModelProperty(value = "结束日期") + private String endDate; +} diff --git a/business/src/main/java/com/fizz/business/mapper/ProStoppageMapper.java b/business/src/main/java/com/fizz/business/mapper/ProStoppageMapper.java new file mode 100644 index 0000000..212a79e --- /dev/null +++ b/business/src/main/java/com/fizz/business/mapper/ProStoppageMapper.java @@ -0,0 +1,8 @@ +package com.fizz.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.ProStoppage; + +public interface ProStoppageMapper extends BaseMapper { +} + diff --git a/business/src/main/java/com/fizz/business/service/ProStoppageService.java b/business/src/main/java/com/fizz/business/service/ProStoppageService.java new file mode 100644 index 0000000..06267a3 --- /dev/null +++ b/business/src/main/java/com/fizz/business/service/ProStoppageService.java @@ -0,0 +1,19 @@ +package com.fizz.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.fizz.business.domain.ProStoppage; +import com.fizz.business.form.ProStoppageForm; + +import java.util.List; + +public interface ProStoppageService extends IService { + + List listAll(ProStoppageForm form); + + boolean updateProStoppage(ProStoppage proStoppage); + + boolean addProStoppage(ProStoppage proStoppage); + + boolean deleteProStoppage(Long stopid); + +} diff --git a/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java index 7dcda02..fdd808a 100644 --- a/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java @@ -76,16 +76,8 @@ public class CrmPdoExcoilServiceImpl extends ServiceImpl implements ProStoppageService { + + @Override + public List listAll(ProStoppageForm form) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + + queryWrapper.ge("start_date", form.getStartDate() + " 00:00:00"); + queryWrapper.le("start_date", form.getEndDate() + " 23:59:59"); + + return baseMapper.selectList(queryWrapper); + } + + @Override + public boolean updateProStoppage(ProStoppage proStoppage) { + return this.updateById(proStoppage); + } + + @Override + public boolean addProStoppage(ProStoppage proStoppage) { + return this.save(proStoppage); + } + + @Override + public boolean deleteProStoppage(Long stopid) { + return this.deleteProStoppage(stopid); + } +} diff --git a/business/src/main/resources/mapper/ProStoppageMapper.xml b/business/src/main/resources/mapper/ProStoppageMapper.xml new file mode 100644 index 0000000..314e7ed --- /dev/null +++ b/business/src/main/resources/mapper/ProStoppageMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file