初版

zengh

2021-01-28 46df2e1e645e8f2025c1c7d7ae124e61f2d23c96

初版

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java

@@ -142,11 +142,11 @@
     * @return
     */
    @PostMapping("/selectList")
    public R selectList(@ApiParam(value = "主键集合", required = true) @RequestParam String waringType, String beginTime, String endTime, String addvcd, String type, HttpServletResponse response) {
    public R<IPage<JingdanVO>> selectList(@ApiParam(value = "主键集合", required = true) @RequestParam Query query  ,String waringType, String beginTime, String endTime, String addvcd, String type, HttpServletResponse response) {
        response.setHeader("Access-Control-Allow-Origin", "*");
        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
        response.setHeader("Access-Control-Allow-Credentials","true");
        return R.data(jingdanService.selectList(waringType, beginTime, endTime,addvcd,type));
        return R.data(jingdanService.selectList(Condition.getPage(query),waringType, beginTime, endTime,addvcd,type));
    }

    /**

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java

@@ -47,7 +47,7 @@
     * @param endTime
     * @return
     */
    List<JingdanVO> selectList(String waringType, String beginTime, String endTime, String addvcd, String type);
    List<JingdanVO> selectList(IPage page,String waringType, String beginTime, String endTime, String addvcd, String type);
    List<JingdanVO> selectLists(String handleP, String type);

    /**

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.xml

@@ -27,7 +27,24 @@


    <select id="selectJingdanPage" resultMap="jingdanResultMap">
        select * from sys_jingdan where is_deleted = 0
        SELECT j.id,j.galarmPeople,j.phoneNumber,j.place,j.content,j.galarmTime,j.waringType,j.deviceNumber,j.type,
        j.handleP,j.handleTime,j.handName,j.level,ST_ASTEXT(j.coordinate) as coordinate,j.jd,j.wd,j.addvcd,j.rName,
        d.addvnm FROM sys_jingdan j LEFT JOIN sys_district d on d.addvcds=j.addvcd where 1=1
        <if test="jingdan.waringType!=null and jingdan.waringType!=''">
            and j.waringType=#{jingdan.waringType}
        </if>
        <if test="jingdan.beginTime!=null and jingdan.beginTime!=''">
            and j.galarmTime &gt;=#{jingdan.beginTime}
        </if>
        <if test="jingdan.endTime!=null and jingdan.endTime!=''">
            and j.galarmTime &lt;=#{jingdan.endTime}
        </if>
        <if test="jingdan.addvcd!=null and jingdan.addvcd!=''">
            and j.addvcd=#{jingdan.addvcd}
        </if>
        <if test="jingdan.type!=null and jingdan.type!=''">
            and j.type=#{jingdan.type}
        </if>
    </select>

    <select id="selectList" resultMap="jingdanResultMap">

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/service/IJingdanService.java

@@ -39,7 +39,7 @@
     * @return
     */
    IPage<JingdanVO> selectJingdanPage(IPage<JingdanVO> page, JingdanVO jingdan);
    List<JingdanVO> selectList(String waringType, String beginTime, String endTime, String addvcd, String type);
    IPage<JingdanVO> selectList(IPage<JingdanVO> page,String waringType, String beginTime, String endTime, String addvcd, String type);
    List<JingdanVO> selectLists(String handleP, String type);
    List<JingdanVO> selectdInfo(String deviceNumber, String id);
    void insert(String galarmPeople, String phoneNumber, String place, String content,

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/service/impl/JingdanServiceImpl.java

@@ -42,8 +42,8 @@
    }

    @Override
    public List<JingdanVO> selectList(String waringType, String beginTime, String endTime,String addvcd,String type) {
        return baseMapper.selectList(waringType,beginTime,endTime,addvcd,type);
    public IPage<JingdanVO> selectList(IPage<JingdanVO> page,String waringType, String beginTime, String endTime,String addvcd,String type) {
        return page.setRecords(baseMapper.selectList(page,waringType,beginTime,endTime,addvcd,type));
    }

    @Override

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/vo/JingdanVO.java

@@ -33,5 +33,7 @@
public class JingdanVO extends Jingdan {
    private static final long serialVersionUID = 1L;
   private  String addvnm;
    private  String beginTime;
    private  String endTime;
}