guoshilong
2023-05-30 f19aa28d9914393cbb335fe0f37480f01c90d908
险情分页接口
6 files modified
43 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java 7 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.java 3 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml 16 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDangerReportService.java 3 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java 6 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DangerReportVO.java 8 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java
@@ -38,10 +38,9 @@
    @GetMapping("/page")
    @ApiOperation(value = "列表", notes = "传入实体类参数")
    public R<IPage<DangerReport>> pageList(@RequestParam Map<String, Object> dr, Query query) {
        QueryWrapper<DangerReport> queryWrapper = Condition.getQueryWrapper(dr,DangerReport.class);
        IPage<DangerReport> pagelist = dangerReportService.page(Condition.getPage(query),queryWrapper);
        return R.data(pagelist);
    public R<IPage<DangerReportVO>> pageList(DangerReportVO dangerReportVO, Query query) {
        IPage<DangerReportVO> page = dangerReportService.selectPage(Condition.getPage(query),dangerReportVO);
        return R.data(page);
    }
    @GetMapping("/all")
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.java
@@ -4,6 +4,7 @@
import cn.gistack.sm.jcsb.vo.DangerReportVO;
import cn.gistack.sm.jcsb.vo.DeviceReportVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -16,4 +17,6 @@
 */
public interface DangerReportMapper  extends BaseMapper<DangerReport> {
    List<DangerReportVO> getAll(@Param("dangerReport") DangerReport dangerReport);
    List<DangerReportVO> selectRecordPage(IPage<DangerReportVO> page, @Param("dangerReportVO") DangerReportVO dangerReportVO);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml
@@ -19,6 +19,7 @@
        <result property="isDeleted" column="is_deleted"/>
        <result property="reservoirId" column="reservoir_id"/>
        <result property="reservoirName" column="reservoirName"/>
        <result property="toUserName" column="toUserName"/>
    </resultMap>
    <select id="getAll" resultMap="vo">
@@ -32,4 +33,19 @@
            AND SDR.status = #{dangerReport.status}
        </if>
    </select>
    <select id="selectRecordPage" resultMap="vo">
        SELECT R.*,arb."name" reservoirName,U.REAL_NAME toUserName FROM SM_DANGER_REPORT R
        LEFT JOIN BLADE_USER U ON U.ID = R.TO_USER
        LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = R.RESERVOIR_ID
        WHERE R.IS_DELETED = 0
        <if test="dangerReportVO.reservoirName != null and dangerReportVO.reservoirName !=''">
            AND arb."name" LIKE CONCAT('%',#{dangerReportVO.reservoirName},'%')
        </if>
        <if test="dangerReportVO.toUser != null and dangerReportVO.toUser !=''">
            AND r.to_user = #{dangerReportVO.toUser}
        </if>
        <if test="dangerReportVO.status != null and dangerReportVO.status !=''">
            AND r.status = #{dangerReportVO.status}
        </if>
    </select>
</mapper>
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDangerReportService.java
@@ -3,6 +3,7 @@
import cn.gistack.sm.jcsb.entity.DangerReport;
import cn.gistack.sm.jcsb.vo.DangerReportVO;
import cn.gistack.sm.jcsb.vo.DeviceReportVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import java.util.List;
@@ -15,4 +16,6 @@
 */
public interface IDangerReportService extends BaseService<DangerReport> {
    List<DangerReportVO> getAll(DangerReport dangerReport);
    IPage<DangerReportVO> selectPage(IPage<DangerReportVO> page, DangerReportVO dangerReportVO);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java
@@ -5,6 +5,7 @@
import cn.gistack.sm.jcsb.service.IDangerReportService;
import cn.gistack.sm.jcsb.vo.DangerReportVO;
import cn.gistack.sm.jcsb.vo.DeviceReportVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
@@ -23,4 +24,9 @@
    public List<DangerReportVO> getAll(DangerReport dangerReport) {
        return baseMapper.getAll(dangerReport);
    }
    @Override
    public IPage<DangerReportVO> selectPage(IPage<DangerReportVO> page, DangerReportVO dangerReportVO) {
        return page.setRecords(baseMapper.selectRecordPage(page,dangerReportVO));
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DangerReportVO.java
@@ -5,5 +5,13 @@
@Data
public class DangerReportVO extends DangerReport {
    /**
     * 水库名称
     */
    private String reservoirName;
    /**
     * 名称
     */
    private String toUserName;
}