diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningMapper.java new file mode 100644 index 0000000..aab7a7c --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningMapper.java @@ -0,0 +1,16 @@ +package com.rzyc.mapper; + +import com.rzyc.model.SysWarning; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 智能预警 Mapper 接口 + *

+ * + * @author + * @since 2023-01-09 + */ +public interface SysWarningMapper extends BaseMapper { + +} diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningTypeMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningTypeMapper.java new file mode 100644 index 0000000..386b220 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningTypeMapper.java @@ -0,0 +1,16 @@ +package com.rzyc.mapper; + +import com.rzyc.model.SysWarningType; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 预警类型 Mapper 接口 + *

+ * + * @author + * @since 2023-01-09 + */ +public interface SysWarningTypeMapper extends BaseMapper { + +} diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningUserMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningUserMapper.java new file mode 100644 index 0000000..919064b --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/mapper/SysWarningUserMapper.java @@ -0,0 +1,16 @@ +package com.rzyc.mapper; + +import com.rzyc.model.SysWarningUser; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 预警接收用户 Mapper 接口 + *

+ * + * @author + * @since 2023-01-09 + */ +public interface SysWarningUserMapper extends BaseMapper { + +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysWarning.java b/inventory-dao/src/main/java/com/rzyc/model/SysWarning.java new file mode 100644 index 0000000..ac6afce --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/SysWarning.java @@ -0,0 +1,151 @@ +package com.rzyc.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * 智能预警 + *

+ * + * @author + * @since 2023-01-09 + */ +@TableName("sys_warning") +@ApiModel(value="SysWarning对象", description="智能预警") +public class SysWarning implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "预警id") + @TableId("warning_id") + private String warningId; + + @ApiModelProperty(value = "发送人") + @TableField("send_id") + private String sendId; + + @ApiModelProperty(value = "预警内容") + @TableField("warning_info") + private String warningInfo; + + @ApiModelProperty(value = "预警内容") + @TableField("warning_time") + private Date warningTime; + + @ApiModelProperty(value = "预警类型id") + @TableField("type_id") + private Integer typeId; + + @ApiModelProperty(value = "删除状态 1:正常 2:已删除") + @TableField("del_state") + private Integer delState; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "创建人") + @TableField("create_by") + private String createBy; + + @ApiModelProperty(value = "修改时间") + @TableField("modify_time") + private Date modifyTime; + + @ApiModelProperty(value = "修改人") + @TableField("modify_by") + private String modifyBy; + + public Integer getTypeId() { + return typeId; + } + + public void setTypeId(Integer typeId) { + this.typeId = typeId; + } + + public String getWarningId() { + return warningId; + } + + public void setWarningId(String warningId) { + this.warningId = warningId; + } + public String getSendId() { + return sendId; + } + + public void setSendId(String sendId) { + this.sendId = sendId; + } + public String getWarningInfo() { + return warningInfo; + } + + public void setWarningInfo(String warningInfo) { + this.warningInfo = warningInfo; + } + public Date getWarningTime() { + return warningTime; + } + + public void setWarningTime(Date warningTime) { + this.warningTime = warningTime; + } + public Integer getDelState() { + return delState; + } + + public void setDelState(Integer delState) { + this.delState = delState; + } + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + public String getModifyBy() { + return modifyBy; + } + + public void setModifyBy(String modifyBy) { + this.modifyBy = modifyBy; + } + + @Override + public String toString() { + return "SysWarning{" + + "warningId=" + warningId + + ", sendId=" + sendId + + ", warningInfo=" + warningInfo + + ", warningTime=" + warningTime + + ", delState=" + delState + + ", createTime=" + createTime + + ", createBy=" + createBy + + ", modifyTime=" + modifyTime + + ", modifyBy=" + modifyBy + + "}"; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysWarningType.java b/inventory-dao/src/main/java/com/rzyc/model/SysWarningType.java new file mode 100644 index 0000000..5c98d6e --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/SysWarningType.java @@ -0,0 +1,127 @@ +package com.rzyc.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * 预警类型 + *

+ * + * @author + * @since 2023-01-09 + */ +@TableName("sys_warning_type") +@ApiModel(value="SysWarningType对象", description="预警类型") +public class SysWarningType implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "预警类型id") + @TableId("type_id") + private String typeId; + + @ApiModelProperty(value = "预警类型") + @TableField("name") + private String name; + + @ApiModelProperty(value = "排序") + @TableField("sort_id") + private Integer sortId; + + @ApiModelProperty(value = "删除状态 1:正常 2:已删除") + @TableField("del_state") + private Integer delState; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "创建人") + @TableField("create_by") + private String createBy; + + @ApiModelProperty(value = "修改时间") + @TableField("modify_time") + private Date modifyTime; + + @ApiModelProperty(value = "修改人") + @TableField("modify_by") + private String modifyBy; + + public String getTypeId() { + return typeId; + } + + public void setTypeId(String typeId) { + this.typeId = typeId; + } + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + public Integer getSortId() { + return sortId; + } + + public void setSortId(Integer sortId) { + this.sortId = sortId; + } + public Integer getDelState() { + return delState; + } + + public void setDelState(Integer delState) { + this.delState = delState; + } + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + public String getModifyBy() { + return modifyBy; + } + + public void setModifyBy(String modifyBy) { + this.modifyBy = modifyBy; + } + + @Override + public String toString() { + return "SysWarningType{" + + "typeId=" + typeId + + ", name=" + name + + ", sortId=" + sortId + + ", delState=" + delState + + ", createTime=" + createTime + + ", createBy=" + createBy + + ", modifyTime=" + modifyTime + + ", modifyBy=" + modifyBy + + "}"; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/SysWarningUser.java b/inventory-dao/src/main/java/com/rzyc/model/SysWarningUser.java new file mode 100644 index 0000000..a50ace0 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/SysWarningUser.java @@ -0,0 +1,155 @@ +package com.rzyc.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + *

+ * 预警接收用户 + *

+ * + * @author + * @since 2023-01-09 + */ +@TableName("sys_warning_user") +@ApiModel(value="SysWarningUser对象", description="预警接收用户") +public class SysWarningUser implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "预警接收用户id") + @TableId("warning_user_id") + private String warningUserId; + + @ApiModelProperty(value = "预警id") + @TableField("warning_id") + private String warningId; + + @ApiModelProperty(value = "接收用户id") + @TableField("user_id") + private String userId; + + @ApiModelProperty(value = "预警类型id") + @TableField("type_id") + private String typeId; + + @ApiModelProperty(value = "是否处理 1、未处理 2、已处理") + @TableField("state") + private Integer state; + + @ApiModelProperty(value = "处理时间") + @TableField("handle_time") + private Date handleTime; + + @ApiModelProperty(value = "删除状态 1:正常 2:已删除") + @TableField("del_state") + private Integer delState; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "创建人") + @TableField("create_by") + private String createBy; + + @ApiModelProperty(value = "修改时间") + @TableField("modify_time") + private Date modifyTime; + + @ApiModelProperty(value = "修改人") + @TableField("modify_by") + private String modifyBy; + + public String getWarningUserId() { + return warningUserId; + } + + public void setWarningUserId(String warningUserId) { + this.warningUserId = warningUserId; + } + public String getWarningId() { + return warningId; + } + + public void setWarningId(String warningId) { + this.warningId = warningId; + } + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + public Integer getState() { + return state; + } + + public void setState(Integer state) { + this.state = state; + } + public Date getHandleTime() { + return handleTime; + } + + public void setHandleTime(Date handleTime) { + this.handleTime = handleTime; + } + public Integer getDelState() { + return delState; + } + + public void setDelState(Integer delState) { + this.delState = delState; + } + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + public String getModifyBy() { + return modifyBy; + } + + public void setModifyBy(String modifyBy) { + this.modifyBy = modifyBy; + } + + @Override + public String toString() { + return "SysWarningUser{" + + "warningUserId=" + warningUserId + + ", warningId=" + warningId + + ", userId=" + userId + + ", state=" + state + + ", handleTime=" + handleTime + + ", delState=" + delState + + ", createTime=" + createTime + + ", createBy=" + createBy + + ", modifyTime=" + modifyTime + + ", modifyBy=" + modifyBy + + "}"; + } +} diff --git a/inventory-dao/src/main/resources/mapper/SysWarningMapper.xml b/inventory-dao/src/main/resources/mapper/SysWarningMapper.xml new file mode 100644 index 0000000..610979e --- /dev/null +++ b/inventory-dao/src/main/resources/mapper/SysWarningMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + warning_id, send_id, warning_info, warning_time, type_id,del_state, create_time, create_by, modify_time, modify_by + + + diff --git a/inventory-dao/src/main/resources/mapper/SysWarningTypeMapper.xml b/inventory-dao/src/main/resources/mapper/SysWarningTypeMapper.xml new file mode 100644 index 0000000..bea5b96 --- /dev/null +++ b/inventory-dao/src/main/resources/mapper/SysWarningTypeMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + type_id, name, sort_id, del_state, create_time, create_by, modify_time, modify_by + + + diff --git a/inventory-dao/src/main/resources/mapper/SysWarningUserMapper.xml b/inventory-dao/src/main/resources/mapper/SysWarningUserMapper.xml new file mode 100644 index 0000000..c8b42b4 --- /dev/null +++ b/inventory-dao/src/main/resources/mapper/SysWarningUserMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + warning_user_id, warning_id, user_id, type_id,state, handle_time, del_state, create_time, create_by, modify_time, modify_by + + + diff --git a/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java b/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java index 972e58a..455ced4 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java @@ -165,7 +165,7 @@ public class TaskController extends BaseController{ return result; } - + /** * @Description: 发布任务详情 * @Author ZQW @@ -182,4 +182,9 @@ public class TaskController extends BaseController{ result.setData(detailVo); return result; } + + public MultiResult wType()throws Exception{ + MultiResult result = new MultiResult<>(); + return result; + } }