邱宇豪
2023-11-08 ce1798b6f6ef2d4e82a156a22e9646b57a2a3649
20231107_qiuyh_隐患举报
已修改5个文件
111 ■■■■ 文件已修改
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/controller/HiddenDangerController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/entity/HiddenDangerEntity.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/service/HiddenDangerService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/service/impl/HiddenDangerServiceImpl.java 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/controller/HiddenDangerController.java
@@ -6,6 +6,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
/**
@@ -61,13 +62,13 @@
    }
    /**
     * 小程序
     * web端导出
     * @param map
     * @return
     */
    @PostMapping(value = "selectNoPageList")
    BasicResult selectNoPageList(@RequestBody Map<String,Object> map){
        return hiddenDangerService.selectNoPageList(map);
    @PostMapping(value = "export")
    void export(@RequestBody Map<String,Object> map, HttpServletResponse response){
        hiddenDangerService.export(map, response);
    }
    /**
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/entity/HiddenDangerEntity.java
@@ -1,5 +1,6 @@
package com.thhy.secure.modules.biz.hiddenDanger.entity;
import com.thhy.general.annotations.Excel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -24,26 +25,31 @@
    /**
     * 隐患地点
     */
    @Excel(sort = 2,title = "隐患地点")
    private String dangerLocation;
    /**
     * 隐患标题
     */
    @Excel(sort = 3,title = "隐患标题")
    private String title;
    /**
     * 隐患时间
     */
    @Excel(sort = 1,title = "举报时间",patter = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;
    /**
     * 隐患审核状态 审核状态 0未审核 1审核通过 2审核失败
     */
    private Integer auditStatus;
    @Excel(sort = 6,title = "审核状态")
    private String auditStatusName;
    public String getAuditStatusName() {
        String name = "";
        if (auditStatus != null){
        switch (auditStatus){
            case 0:
                name = "未审核";
@@ -54,6 +60,7 @@
            case 2:
                name = "审核失败";
                break;
            }
        }
        return name;
    }
@@ -71,6 +78,7 @@
    /**
     * 积分
     */
    @Excel(sort = 7,title = "积分")
    private Double integral;
    /**
@@ -78,4 +86,34 @@
     */
    private List<HiddenDangerImgEntity> imgEntities;
    /**
     * 举报人
     */
    @Excel(sort = 4,title = "提交人")
    private String reporter;
    /**
     * 隐患等级
     */
    private Integer level;
    @Excel(sort = 5,title = "隐患等级")
    private String levelName;
    public String getLevelName() {
        String name = "";
        if (level != null){
            switch (level){
                case 1:
                    name = "一般隐患";
                    break;
                case 2:
                    name = "重大隐患";
                    break;
                case 3:
                    name = "不存在";
                    break;
            }
        }
        return name;
    }
}
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/service/HiddenDangerService.java
@@ -3,7 +3,7 @@
import com.thhy.general.common.BasicResult;
import com.thhy.secure.modules.biz.hiddenDanger.entity.HiddenDangerEntity;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
/**
@@ -21,7 +21,7 @@
    BasicResult selectPageList(Map<String,Object> map);
    BasicResult selectNoPageList(Map<String,Object> map);
    void export(Map<String,Object> map, HttpServletResponse response);
    BasicResult selectInfo(String id);
hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/service/impl/HiddenDangerServiceImpl.java
@@ -4,6 +4,7 @@
import com.github.pagehelper.PageInfo;
import com.thhy.general.common.BasicResult;
import com.thhy.general.config.SysUserInfo;
import com.thhy.general.utils.ExcelUtils;
import com.thhy.general.utils.UUIDUtils;
import com.thhy.general.utils.UserInfoUtils;
import com.thhy.secure.modules.biz.hiddenDanger.entity.HiddenDangerEntity;
@@ -13,6 +14,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -96,20 +98,46 @@
    }
    @Override
    public BasicResult selectNoPageList(Map<String, Object> map) {
    public void export(Map<String, Object> map, HttpServletResponse response) {
        SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
        map.put("companyId",sysUserInfo.getCompanyId());
        List<HiddenDangerEntity> hiddenDangerEntities = hiddenDangerMapper.selectPageList(map);
        hiddenDangerEntities.forEach(obj ->{
            String id = obj.getId();
            obj.setImgEntities(hiddenDangerMapper.selectImgList(id));
            Integer auditStatus = obj.getAuditStatus();
            Integer level = obj.getLevel();
            switch (auditStatus){
                case 0:
                    obj.setAuditStatusName("未审核");
                    break;
                case 1:
                    obj.setAuditStatusName("审核通过");
                    break;
                case 2:
                    obj.setAuditStatusName("审核失败");
                    break;
            }
            if (level != null){
                switch (level){
                    case 1:
                        obj.setLevelName("一般隐患");
                        break;
                    case 2:
                        obj.setLevelName("重大隐患");
                        break;
                    case 3:
                        obj.setLevelName("不存在");
                        break;
                }
            }
        });
        return BasicResult.success(hiddenDangerEntities);
        ExcelUtils.downExcel(hiddenDangerEntities,HiddenDangerEntity.class,response,"隐患举报");
    }
    @Override
    public BasicResult selectInfo(String id) {
        return BasicResult.success(hiddenDangerMapper.selectInfo(id));
        HiddenDangerEntity hiddenDangerEntity = hiddenDangerMapper.selectInfo(id);
        hiddenDangerEntity.setImgEntities(hiddenDangerMapper.selectImgList(id));
        return BasicResult.success(hiddenDangerEntity);
    }
    @Override
hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml
@@ -39,6 +39,9 @@
            <if test="integral != null">
                integral,
            </if>
            <if test="level != null">
                `level`,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -74,6 +77,9 @@
            </if>
            <if test="integral != null">
                #{integral,jdbcType=DOUBLE},
            </if>
            <if test="level != null">
                #{level,jdbcType=INTEGER},
            </if>
        </trim>
    </insert>
@@ -113,6 +119,10 @@
            <if test="integral != null">
                integral = #{integral,jdbcType=DOUBLE},
            </if>
            <if test="level != null">
                `level` = #{level,jdbcType=INTEGER},
            </if>
        </set>
        where id=#{id,jdbcType=VARCHAR}
    </update>
@@ -135,8 +145,12 @@
                t.createUser,
                t.updateUser,
                t.updateTime,
                t.companyId
                t.companyId,
                t.level,
                su.real_name reporter
        from t_hidden_danger t
         LEFT JOIN sys_users su ON su.user_id = t.createUser
         LEFT JOIN sys_users su1 ON su1.user_id = t.updateUser
        where t.id=#{id}
    </select>
@@ -152,7 +166,9 @@
                t.createUser,
                t.updateUser,
                t.updateTime,
                t.companyId
                t.companyId,
                t.level,
                su.real_name reporter
         from t_hidden_danger t
         LEFT JOIN sys_users su ON su.user_id = t.createUser
         LEFT JOIN sys_users su1 ON su1.user_id = t.updateUser
@@ -162,7 +178,7 @@
            <if test="startTime!= null and endTime!=null and startTime != '' and endTime !=''">
                and t.createTime BETWEEN #{startTime} and #{endTime}
            </if>
        order by t.createUser desc
        order by t.createTime desc
    </select>
    <!--根据ID删除-->