Merge remote-tracking branch 'origin/master'

Administrator

2023-08-14 b991e27cc97c09c6a7044fefc99591b7c930124b

Merge remote-tracking branch 'origin/master'

 ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java

@@ -13,53 +13,86 @@

/**
 * app任务管理对象 ard_app_task
 * 
 *
 * @author ard
 * @date 2023-07-22
 */
public class ArdAppTask extends BaseEntity
{
public class ArdAppTask extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /** ID */
    /**
     * ID
     */
    private String id;

    /** 任务名称 */
    /**
     * 任务类型 0-普通任务 1-报警任务
     */
    @Excel(name = "任务类型")
    private String type;
    /**
     * 任务名称
     */
    @Excel(name = "任务名称")
    private String name;

    /** 任务文本 */
    /**
     * 任务文本
     */
    @Excel(name = "任务文本")
    private String text;

    /** 任务语音 */
    /**
     * 任务语音
     */
    @Excel(name = "任务语音")
    private String voice;

    /** 部门ID */
    /**
     * 部门ID
     */
    @Excel(name = "部门ID")
    private Integer deptId;

    /** 用户ID */
    /**
     * 用户ID
     */
    @Excel(name = "用户ID")
    private String userId;

    /** app任务图片信息 */
    /**
     * app任务图片信息
     */
    @ApiModelProperty(notes = "app任务图片信息")
    private List<ArdAppTaskPic> ardAppTaskPicList;

    /** app任务关联多用户id列表 */
    /**
     * app任务关联多用户id列表
     */
    private List<String> userIds;

    /** app任务关联多用户 */
    /**
     * app任务关联多用户
     */
    private List<SysUser> sysUserList;

    /** app任务详情信息 */
    /**
     * app任务详情信息
     */
    @ApiModelProperty(notes = "app任务详情信息")
    private List<ArdAppTaskDetail> ardAppTaskDetailList;

    /** app用户ID */
    /**
     * app用户ID
     */
    private String appUserId;

    public String getType() {
        return type;
    }

    public void setType(String type) {
        this.type = type;
    }

    public String getAppUserId() {
        return appUserId;
@@ -77,8 +110,7 @@
        this.sysUserList = sysUserList;
    }

    public List<ArdAppTaskPic> getArdAppTaskPicList()
    {
    public List<ArdAppTaskPic> getArdAppTaskPicList() {
        return ardAppTaskPicList;
    }

@@ -90,90 +122,80 @@
        this.userIds = userIds;
    }

    public void setArdAppTaskPicList(List<ArdAppTaskPic> ardAppTaskPicList)
    {
    public void setArdAppTaskPicList(List<ArdAppTaskPic> ardAppTaskPicList) {
        this.ardAppTaskPicList = ardAppTaskPicList;
    }

    public void setId(String id)
    {
    public void setId(String id) {
        this.id = id;
    }

    public String getId() 
    {
    public String getId() {
        return id;
    }
    public void setName(String name) 
    {

    public void setName(String name) {
        this.name = name;
    }

    public String getName() 
    {
    public String getName() {
        return name;
    }
    public void setText(String text) 
    {

    public void setText(String text) {
        this.text = text;
    }

    public String getText() 
    {
    public String getText() {
        return text;
    }
    public void setVoice(String voice) 
    {

    public void setVoice(String voice) {
        this.voice = voice;
    }

    public String getVoice() 
    {
    public String getVoice() {
        return voice;
    }
    public void setDeptId(Integer deptId) 
    {

    public void setDeptId(Integer deptId) {
        this.deptId = deptId;
    }

    public Integer getDeptId() 
    {
    public Integer getDeptId() {
        return deptId;
    }
    public void setUserId(String userId) 
    {

    public void setUserId(String userId) {
        this.userId = userId;
    }

    public String getUserId() 
    {
    public String getUserId() {
        return userId;
    }

    public List<ArdAppTaskDetail> getArdAppTaskDetailList()
    {
    public List<ArdAppTaskDetail> getArdAppTaskDetailList() {
        return ardAppTaskDetailList;
    }

    public void setArdAppTaskDetailList(List<ArdAppTaskDetail> ardAppTaskDetailList)
    {
    public void setArdAppTaskDetailList(List<ArdAppTaskDetail> ardAppTaskDetailList) {
        this.ardAppTaskDetailList = ardAppTaskDetailList;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .append("id", getId())
            .append("name", getName())
            .append("text", getText())
            .append("voice", getVoice())
            .append("deptId", getDeptId())
            .append("userId", getUserId())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("ardAppTaskDetailList", getArdAppTaskDetailList())
            .toString();
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("updateBy", getUpdateBy())
                .append("updateTime", getUpdateTime())
                .append("id", getId())
                .append("name", getName())
                .append("text", getText())
                .append("voice", getVoice())
                .append("deptId", getDeptId())
                .append("userId", getUserId())
                .append("createBy", getCreateBy())
                .append("createTime", getCreateTime())
                .append("ardAppTaskDetailList", getArdAppTaskDetailList())
                .toString();
    }
}

 ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml

@@ -6,6 +6,7 @@

    <resultMap type="ArdAppTask" id="ArdAppTaskResult">
        <result property="id" column="id"/>
        <result property="type" column="type"/>
        <result property="name" column="name"/>
        <result property="text" column="text"/>
        <result property="voice" column="voice"/>
@@ -58,6 +59,7 @@

    <sql id="selectArdAppTaskVo">
        select c.id,
               c.type,
               c.name,
               c.text,
               c.voice,
@@ -73,6 +75,7 @@
    </sql>
    <sql id="selectArdAppTaskDto">
        select a.id,
               a.type,
               a.name,
               a.text,
               a.voice,
@@ -108,6 +111,7 @@
    <select id="selectArdAppTaskList" parameterType="ArdAppTask" resultMap="ArdAppTaskResult">
        <include refid="selectArdAppTaskVo"/>
        <where>
            <if test="type != null  and type != ''">and c.type = #{type}</if>
            <if test="name != null  and name != ''">and c.name like '%'||#{name}||'%'</if>
            <if test="text != null  and text != ''">and c.text = #{text}</if>
            <if test="voice != null  and voice != ''">and c.voice = #{voice}</if>
@@ -188,6 +192,7 @@
        insert into ard_app_task
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="type != null">type,</if>
            <if test="name != null">name,</if>
            <if test="text != null">text,</if>
            <if test="voice != null">voice,</if>
@@ -200,6 +205,7 @@
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="type != null">#{type},</if>
            <if test="name != null">#{name},</if>
            <if test="text != null">#{text},</if>
            <if test="voice != null">#{voice},</if>
@@ -215,6 +221,7 @@
    <update id="updateArdAppTask" parameterType="ArdAppTask">
        update ard_app_task
        <trim prefix="SET" suffixOverrides=",">
            <if test="type != null">type = #{type},</if>
            <if test="name != null">name = #{name},</if>
            <if test="text != null">text = #{text},</if>
            <if test="voice != null">voice = #{voice},</if>

 ruoyi-admin/src/main/resources/logback.xml

@@ -237,7 +237,7 @@
        <appender-ref ref="minio"/>
    </logger>
    <!--hiksdk日志打印等级-->
    <logger name="hikSdk" level="INFO">
    <logger name="hikSdk" level="debug">
        <appender-ref ref="hikSdk"/>
    </logger>
    <!--盗电报警日志打印等级-->
@@ -253,7 +253,7 @@
        <appender-ref ref="PatrolInspectionTask"/>
    </logger>
    <!--mqtt日志打印等级-->
    <logger name="mqtt" level="INFO">
    <logger name="mqtt" level="debug">
        <appender-ref ref="mqtt"/>
    </logger>
    <!--guideQueue日志打印等级-->