标准预警查询

2021-11-24 13:19:12 +08:00
parent f92cdd6dc3
commit cb06a54a3d
7 changed files with 217 additions and 25 deletions
@@ -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<EarlyWarningEO> {
        IPage<EarlyWarningEO> list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,earlyWarningEO);//在产车条款预警
        return getResponseMessage(list1, list2, list3, list4);
    }
+
+    @GetMapping("/StandWarning")
+    @ApiOperation("标准预警查询")
+    public ResponseMessage<IPage<StandWarningEO>> getStandWaring(StandWarningEO queryPageEO){
+        IPage<StandWarningEO> standWarning = earlyWarningEOService.getStandWarning(queryPageEO);
+        return Result.success(standWarning);
+    }
+
+
+
    private ResponseMessage getResponseMessage(IPage<EarlyWarningEO> list1, IPage<EarlyWarningEO> list2, IPage<EarlyWarningEO> list3, IPage<EarlyWarningEO> list4) {
        List<Map<String, Object>> listMap = new ArrayList<Map<String,Object>>();
        Map<String, Object> map = new HashMap<String, Object>();
@@ -71,7 +82,7 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
    * date 2021-06-15
    **/
    @GetMapping("/ChangePermissions")
-    @ApiOperation("更改权限")
+    @ApiOperation("取消预警")
    public ResponseMessage ChangePermissions(String id) {
        String power = earlyWarningEOService.ChangePermissions(id);
        return Result.success("200",power);
@@ -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<EarlyWarningEO> {

-    IPage<EarlyWarningEO> selectWarningPage(IPage<EarlyWarningEO> page, @Param(Constants.WRAPPER) QueryWrapper<EarlyWarningEO> queryWrapper);
+    IPage<StandWarningEO> selectWarningPage(IPage<StandWarningEO> page, @Param("waringEO") StandWarningEO warningEO);

 }
@@ -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;

@@ -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;
+
+}
@@ -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<EarlyWarningEO> {
    IPage<EarlyWarningEO> oldPolicyQuery(int current,int pageSize);
    String batchSave(List<EarlyWarningEO> earlyWarningEOS);
    String ChangePermissions(String id);
+
+
+    IPage<StandWarningEO> getStandWarning(StandWarningEO queryPage);
 }
@@ -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<EarlyWarningEODao, Ea
        }
        return "更改成功";
    }
+
+    /**
+     * 分页查询标准预警
+     * @return
+     */
+    @Override
+    public IPage<StandWarningEO> getStandWarning(StandWarningEO queryPage) {
+        IPage<StandWarningEO> iPage = new Page<>(queryPage.getPage(),queryPage.getPageSize());
+        return earlyWarningEODao.selectWarningPage(iPage,queryPage);
+    }
+
    private IPage<EarlyWarningEO> getEarlyWarningEOIPage(int current,int pageSize, QueryWrapper<EarlyWarningEO> wrapper) {
        wrapper.eq("power",1);
        Page<EarlyWarningEO> page = new Page<>(current, pageSize);
@@ -144,4 +156,8 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
            wrapper.like("APPLY_TYPE", earlyWarningEO.getApplyType());
        }
    }
+
+
+
+
 }