初版

zengh

2021-01-29 98b4b6d042542738373d8d536a6b77e7f194518f

初版

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

@@ -141,12 +141,11 @@
     * @param endTime
     * @return
     */
    @PostMapping("/selectList")
    public R<IPage<JingdanVO>> selectList(@ApiParam(value = "主键集合", required = true) @RequestParam Query query  ,String waringType, String beginTime, String endTime, String addvcd, String type, HttpServletResponse response) {
    public R selectList(@ApiParam(value = "主键集合", required = true) @RequestParam 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(Condition.getPage(query),waringType, beginTime, endTime,addvcd,type));
        return R.data(jingdanService.selectList(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(IPage page,String waringType, String beginTime, String endTime, String addvcd, String type);
    List<JingdanVO> selectList(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/service/IJingdanService.java

@@ -39,7 +39,7 @@
     * @return
     */
    IPage<JingdanVO> selectJingdanPage(IPage<JingdanVO> page, JingdanVO jingdan);
    IPage<JingdanVO> selectList(IPage<JingdanVO> page,String waringType, String beginTime, String endTime, String addvcd, String type);
    List<JingdanVO> selectList(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 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));
    public List<JingdanVO> selectList(String waringType, String beginTime, String endTime,String addvcd,String type) {
        return baseMapper.selectList(waringType,beginTime,endTime,addvcd,type);
    }

    @Override