admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

污水、沥青接口

Browse Source
This commit is contained in:
guo 2023-10-27 17:25:04 +08:00
parent df15206457
commit 3d7bb21968
11 changed files with 81 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageAlarmController.java
View File

@ -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<SewageAlarm> 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();
}

70
src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageDataController.java
View File

@ -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<IPage<SewageData>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> 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<List<SewageData>> queryDevAndNewestData(@ApiIgnore @RequestParam HashMap<String, Object> 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<SewageData> 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<String, Object> paramMap) {
//Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<SewageData> pageList = sewageDataService.list(queryWrapper);
List<SewageData> 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;
}

2
src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageAlarm.java
View File

@ -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;
/**
* 操作时间
*/

5
src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageData.java
View File

@ -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;
}

6
src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageAlarmMapper.java
View File

@ -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<SewageAlarm> {
IPage<SewageAlarm> queryPageList(Page<SewageAlarm> page, @Param(Constants.WRAPPER) QueryWrapper<SewageAlarm> queryWrapper);
}

4
src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageDataMapper.java
View File

@ -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<SewageData> {
List<SewageData> queryDevAndNewestData(HashMap<String, Object> paramMap);
}

5
src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageAlarmMapper.xml
View File

@ -1,4 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.sewage.mapper.SewageAlarmMapper">
<select id="queryPageList" resultType="com.zhgd.xmgl.modules.sewage.entity.SewageAlarm">
select *
from sewage_alarm
${ew.customSqlSegment}
</select>
</mapper>

15
src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageDataMapper.xml
View File

@ -1,4 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.sewage.mapper.SewageDataMapper">
<select id="queryDevAndNewestData" resultType="com.zhgd.xmgl.modules.sewage.entity.SewageData">
select max(d.ph_value) as ph_value,
max(d.turbidity_value) as turbidity_value,
max(d.conductivity) as conductivity,
max(d.dissolved_oxygen) as dissolved_oxygen,
max(d.water_temperature) as water_temperature,
max(d.flow_velocity) as flow_velocity,
max(d.water_level) as water_level,
sd.dev_sn,
sd.dev_name,
max(d.create_date) as create_date
from sewage_data d
right join sewage_dev sd on d.dev_sn = sd.dev_sn
group by sd.dev_sn
</select>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDataService.java
View File

@ -18,4 +18,6 @@ public interface ISewageDataService extends IService<SewageData> {
IPage<SewageData> queryPageList(HashMap<String, Object> paramMap);
List<SewageData> queryList(HashMap<String, Object> paramMap);
List<SewageData> queryDevAndNewestData(HashMap<String, Object> paramMap);
}

2
src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageAlarmServiceImpl.java
View File

@ -27,7 +27,7 @@ public class SewageAlarmServiceImpl extends ServiceImpl<SewageAlarmMapper, Sewag
public IPage<SewageAlarm> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<SewageAlarm> queryWrapper = getQueryWrapper(paramMap);
Page<SewageAlarm> page = PageUtil.getPage(paramMap);
IPage<SewageAlarm> pageList = this.page(page, queryWrapper);
IPage<SewageAlarm> pageList = baseMapper.queryPageList(page, queryWrapper);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;
}

5
src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageDataServiceImpl.java
View File

@ -38,6 +38,11 @@ public class SewageDataServiceImpl extends ServiceImpl<SewageDataMapper, SewageD
return dealList(this.list(queryWrapper));
}
@Override
public List<SewageData> queryDevAndNewestData(HashMap<String, Object> paramMap) {
return baseMapper.queryDevAndNewestData(paramMap);
}
private QueryWrapper<SewageData> getQueryWrapper(HashMap<String, Object> paramMap) {
QueryWrapper<SewageData> queryWrapper = QueryGenerator.initPageQueryWrapper(SewageData.class, paramMap);
queryWrapper.orderByDesc(RefUtil.fieldNameUlc(SewageData::getId));