南昌市物联网技防平台-后台
zengh
2021-02-24 d9409e54563b29cf6fcf4876e652dd6d6d5d1a36
客户管理接口改动
5 files modified
15 ■■■■■ changed files
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java 2 ●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java 1 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml 6 ●●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java 1 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -95,7 +95,7 @@
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入alarm")
    public R<List> listAll() {
        List pages = alarmService.list();
        List pages = alarmService.listAll();
        return R.data(pages);
    }
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
@@ -40,6 +40,7 @@
     * @return
     */
    List<AlarmVO> selectAlarmPage(IPage page, AlarmVO alarm);
    List<AlarmVO> listAll();
    List<AlarmVO> selectList(String jtype, String district, String waringType, String beginTime, String endTime);
    List<AlarmVO> getLimit();
    List<AlarmVO> selectListSe(String beginTime, String endTime);
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -76,6 +76,12 @@
        a.alarmTime DESC
    </select>
    <select id="listAll" resultMap="alarmResultMap">
       select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
        a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city
         from sys_alarm a
    </select>
    <select id="selectList" resultMap="alarmResultMap">
        SELECT
        a.id,
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
@@ -40,6 +40,7 @@
     * @return
     */
    IPage<AlarmVO> selectAlarmPage(IPage<AlarmVO> page, AlarmVO alarm);
    List<AlarmVO> listAll();
    List<AlarmVO> selectList(String jtype, String district, String waringType, String beginTime, String endTime);
    List<AlarmVO> getLimit();
    List<AlarmVO> selectInfo(String id);
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
@@ -43,6 +43,11 @@
    }
    @Override
    public List<AlarmVO> listAll() {
        return baseMapper.listAll();
    }
    @Override
    public List<AlarmVO> selectList(String jtype,String district,String waringType,String beginTime,String endTime) {
        return baseMapper.selectList(jtype,district,waringType,beginTime,endTime);
    }