diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageAlarmController.java index e525d388e..6f2c1bd7c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageAlarmController.java @@ -1,11 +1,14 @@ package com.zhgd.xmgl.modules.sewage.controller; import com.zhgd.xmgl.modules.sewage.entity.SewageAlarm; +import com.zhgd.xmgl.security.entity.UserInfo; +import com.zhgd.xmgl.security.util.SecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiImplicitParams; +import java.util.Date; import java.util.HashMap; import springfox.documentation.annotations.ApiIgnore; @@ -13,6 +16,7 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.List; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.util.Objects; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -99,6 +103,11 @@ public class SewageAlarmController { @ApiOperation(value = "编辑污水预警信息", notes = "编辑污水预警信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody SewageAlarm sewageAlarm) { + if (Objects.equals(sewageAlarm.getHandleDone(), 1)) { + UserInfo userInfo = SecurityUtils.getUser(); + sewageAlarm.setOperateId(userInfo.getUserId()); + sewageAlarm.setOperateTime(new Date()); + } sewageAlarmService.updateById(sewageAlarm); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageDataController.java b/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageDataController.java index f58c4fa50..bf4f055ab 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageDataController.java @@ -1,39 +1,25 @@ package com.zhgd.xmgl.modules.sewage.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.sewage.entity.SewageData; +import com.zhgd.xmgl.modules.sewage.service.ISewageDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiImplicitParams; - -import java.util.HashMap; - -import springfox.documentation.annotations.ApiIgnore; - -import java.util.List; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.jeecg.common.util.oConvertUtils; -import org.apache.commons.collections.MapUtils; -import com.zhgd.xmgl.modules.sewage.service.ISewageDataService; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; - +import org.apache.commons.collections.MapUtils; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.HashMap; +import java.util.List; /** @@ -60,6 +46,8 @@ public class SewageDataController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "createDate_begin", value = "查询开始日期", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "createDate_end", value = "查询结束日期", paramType = "query", required = false, dataType = "String"), }) @GetMapping(value = "/page") public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { @@ -77,6 +65,14 @@ public class SewageDataController { return Result.success(sewageDataService.queryList(paramMap)); } + + @ApiOperation(value = "查询污水设备和最新的一条数据信息", notes = "查询污水设备和最新的一条数据信息", httpMethod = "GET") + @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "query", required = true, dataType = "String") + @GetMapping(value = "/dev/data") + public Result> queryDevAndNewestData(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(sewageDataService.queryDevAndNewestData(paramMap)); + } + /** * 添加 * @@ -151,33 +147,23 @@ public class SewageDataController { /** * 导出excel - * - * @param request - * @param response */ @ApiOperation(value = "导出excel污水数据信息", notes = "导出excel污水数据信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "createDate_begin", value = "查询开始日期", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "createDate_end", value = "查询结束日期", paramType = "query", required = false, dataType = "String"), + }) @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { - // Step.1 组装查询条件 - QueryWrapper queryWrapper = null; - try { - String paramsStr = request.getParameter("paramsStr"); - if (oConvertUtils.isNotEmpty(paramsStr)) { - String deString = URLDecoder.decode(paramsStr, "UTF-8"); - SewageData sewageData = JSON.parseObject(deString, SewageData.class); - queryWrapper = QueryGenerator.initQueryWrapper(sewageData, request.getParameterMap()); - } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - + public ModelAndView exportXls(@ApiIgnore @RequestParam HashMap paramMap) { //Step.2 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - List pageList = sewageDataService.list(queryWrapper); + List pageList = queryList(paramMap).getResult(); //导出文件名称 mv.addObject(NormalExcelConstants.FILE_NAME, "污水数据列表"); mv.addObject(NormalExcelConstants.CLASS, SewageData.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("污水数据列表数据", "导出人:Jeecg", "导出信息")); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams()); mv.addObject(NormalExcelConstants.DATA_LIST, pageList); return mv; } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageAlarm.java b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageAlarm.java index f7546c550..238cafad4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageAlarm.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageAlarm.java @@ -99,7 +99,7 @@ public class SewageAlarm implements Serializable { */ @Excel(name = "操作人id", width = 15) @ApiModelProperty(value = "操作人id") - private java.lang.Integer operateId; + private java.lang.Long operateId; /** * 操作时间 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageData.java b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageData.java index e27331ebb..214aee4fd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageData.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageData.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.sewage.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -100,4 +101,8 @@ public class SewageData implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss") private java.util.Date updateDate; + + @TableField(exist = false) + @ApiModelProperty(value = "设备名称") + private java.lang.String devName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageAlarmMapper.java index 0683062cf..0bb8e8547 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageAlarmMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageAlarmMapper.java @@ -1,8 +1,13 @@ package com.zhgd.xmgl.modules.sewage.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.sewage.entity.SewageAlarm; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** * @Description: 污水预警 @@ -13,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface SewageAlarmMapper extends BaseMapper { + IPage queryPageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageDataMapper.java index 048fe64f7..96cbdd556 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageDataMapper.java @@ -4,6 +4,9 @@ import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.sewage.entity.SewageData; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.HashMap; +import java.util.List; + /** * @Description: 污水数据 * @author： pds @@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface SewageDataMapper extends BaseMapper { + List queryDevAndNewestData(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageAlarmMapper.xml index 2b8651154..2dbf41a36 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageAlarmMapper.xml @@ -1,4 +1,9 @@ + diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageDataMapper.xml index 1bcaf7ed2..4278e61bb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageDataMapper.xml @@ -1,4 +1,19 @@ + diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDataService.java b/src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDataService.java index 63b650de7..92a53215a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDataService.java @@ -18,4 +18,6 @@ public interface ISewageDataService extends IService { IPage queryPageList(HashMap paramMap); List queryList(HashMap paramMap); + + List queryDevAndNewestData(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageAlarmServiceImpl.java index 383b8c175..381b36e7a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageAlarmServiceImpl.java @@ -27,7 +27,7 @@ public class SewageAlarmServiceImpl extends ServiceImpl queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); - IPage pageList = this.page(page, queryWrapper); + IPage pageList = baseMapper.queryPageList(page, queryWrapper); pageList.setRecords(dealList(pageList.getRecords())); return pageList; } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageDataServiceImpl.java index f33e26727..cdf6881c9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageDataServiceImpl.java @@ -38,6 +38,11 @@ public class SewageDataServiceImpl extends ServiceImpl queryDevAndNewestData(HashMap paramMap) { + return baseMapper.queryDevAndNewestData(paramMap); + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(SewageData.class, paramMap); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(SewageData::getId));