From cb06a54a3d3415c433979a07f2e2c26fb1667a28 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 24 Nov 2021 13:19:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EarlyWarningEOController.java | 13 +- .../dao/EarlyWarningEODao.java | 5 +- .../entity/EarlyWarningEO.java | 13 ++ .../entity/StandWarningEO.java | 35 ++++ .../service/EarlyWarningEOService.java | 4 + .../Impl/EarlyWarningEOServiceImpl.java | 16 ++ .../mapper/sarStandWarning/EarlyWraningEO.xml | 156 +++++++++++++++--- 7 files changed, 217 insertions(+), 25 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java index c364e76e..cbdf44e1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java @@ -5,6 +5,7 @@ import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.adc.da.slrs.sarStandWarning.service.Impl.EarlyWarningEOServiceImpl; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -53,6 +54,16 @@ public class EarlyWarningEOController extends BaseController { IPage list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,earlyWarningEO);//在产车条款预警 return getResponseMessage(list1, list2, list3, list4); } + + @GetMapping("/StandWarning") + @ApiOperation("标准预警查询") + public ResponseMessage> getStandWaring(StandWarningEO queryPageEO){ + IPage standWarning = earlyWarningEOService.getStandWarning(queryPageEO); + return Result.success(standWarning); + } + + + private ResponseMessage getResponseMessage(IPage list1, IPage list2, IPage list3, IPage list4) { List> listMap = new ArrayList>(); Map map = new HashMap(); @@ -71,7 +82,7 @@ public class EarlyWarningEOController extends BaseController { * date 2021-06-15 **/ @GetMapping("/ChangePermissions") - @ApiOperation("更改权限") + @ApiOperation("取消预警") public ResponseMessage ChangePermissions(String id) { String power = earlyWarningEOService.ChangePermissions(id); return Result.success("200",power); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java index ff0617e0..853cf4d4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java @@ -2,14 +2,13 @@ package com.adc.da.slrs.sarStandWarning.dao; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; public interface EarlyWarningEODao extends BaseMapper { - IPage selectWarningPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IPage selectWarningPage(IPage page, @Param("waringEO") StandWarningEO warningEO); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index 870686fb..ca8060a4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.Tag; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -23,21 +25,27 @@ public class EarlyWarningEO extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty("id") @TableId("ID") private String id; + @ApiModelProperty("标准id") @TableField("STAND_ID") private String standId; + @ApiModelProperty("标准类别") @TableField("STAND_TYPE") private String standType; + @ApiModelProperty("标准编号") @TableField("STAND_CODE") private String standCode; + @ApiModelProperty("标准名称") @TableField("STAND_NAME") private String standName; + @ApiModelProperty("发布日期") @TableField("PUT_TIME") @DateTimeFormat(pattern="yyyy-MM-dd") private Date putTime; @@ -45,18 +53,23 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private Date lastTime; + @ApiModelProperty("适用车型") @TableField("APPLY_TYPE") private String applyType; + @ApiModelProperty("责任工程师") @TableField("DUTY_ENGINEER") private String dutyEngineer; + @ApiModelProperty("条款（分解单）id") @TableField("ITEMS_ID") private String itemsId; + @ApiModelProperty("条款（分解单）编号") @TableField("ITEMS_NUM") private String itemsNum; + @ApiModelProperty("条款（分解单）名称") @TableField("ITEMS_NAME") private String itemsName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java new file mode 100644 index 00000000..d560a113 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java @@ -0,0 +1,35 @@ +package com.adc.da.slrs.sarStandWarning.entity; + +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@Accessors(chain = true) +public class StandWarningEO extends EarlyWarningEO { + private static final long serialVersionUID = 1L; + + @DateTimeFormat(pattern = "YYYY-MM-dd") + private Date XCXSSRQ; + + @DateTimeFormat(pattern = "YYYY-MM-dd") + private Date ZCCSSRQ; + + @DateTimeFormat(pattern = "YYYY-MM-dd") + private Date SSRQ; + + private String standNum; + + private String standSort; + + private String standYear; + + private String issueTime; + + private Integer page; + + private Integer pageSize; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java index c037a64c..89ce035e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandWarning.service; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -16,4 +17,7 @@ public interface EarlyWarningEOService extends IService { IPage oldPolicyQuery(int current,int pageSize); String batchSave(List earlyWarningEOS); String ChangePermissions(String id); + + + IPage getStandWarning(StandWarningEO queryPage); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java index e241936c..7ddabbbc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java @@ -4,6 +4,7 @@ package com.adc.da.slrs.sarStandWarning.service.Impl; import com.adc.da.scheduled.entity.DataDTO; import com.adc.da.slrs.sarStandWarning.dao.EarlyWarningEODao; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.adc.da.slrs.sarStandWarning.service.EarlyWarningEOService; import com.adc.da.sys.util.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -106,6 +107,17 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl getStandWarning(StandWarningEO queryPage) { + IPage iPage = new Page<>(queryPage.getPage(),queryPage.getPageSize()); + return earlyWarningEODao.selectWarningPage(iPage,queryPage); + } + private IPage getEarlyWarningEOIPage(int current,int pageSize, QueryWrapper wrapper) { wrapper.eq("power",1); Page page = new Page<>(current, pageSize); @@ -144,4 +156,8 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + sarInfo.ID, + sarInfo.STAND_TYPE, + CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE, + sarInfo.STAND_NAME, + sarInfo.PUT_TIME, + attr.SSRQ as SSRQ + + + + trim(replace(CONCAT( + sarInfo.STAND_SORT, + ' ', + sarInfo.STAND_NUMBER, + '-', + sarInfo.STAND_YEAR + ),' ','')) LIKE trim(replace(CONCAT('%',#{waringEO.standCode},'%'),' ','')) + + + sarInfo.STAND_NAME = #{waringEO.standName} + + + + DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') = DATE_FORMAT( + #{waringEO.putTime}, + '%Y-%m-%d' + ) + + + DATE_FORMAT(attr.SSRQ, '%Y-%m-%d') = DATE_FORMAT( + #{waringEO.SSRQ}, + '%Y-%m-%d' + ) + + + + +