From df500bf6ee29b3fead5b920ed366230b62a4c7ee Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期三, 22 十一月 2023 09:57:42 +0800
Subject: [PATCH] 1.新增了站点信息查询的接口 2.修改了扬尘已有接口的参数以及sql语句 3.修改了用户登陆接口
---
src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java | 7
src/main/java/com/flightfeather/monitor/service/impl/FugitiveDustServiceImpl.java | 23 +++
src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java | 25 +++-
src/main/java/com/flightfeather/monitor/controller/LoginController.java | 2
src/main/java/com/flightfeather/monitor/service/FugitiveDustService.java | 6
src/main/java/com/flightfeather/monitor/service/impl/DustSiteInfoServiceImpl.java | 45 +++++++++
src/main/java/com/flightfeather/monitor/pojo/DustSiteData.java | 9 +
src/main/resources/mapper/FugitiveDustMapper.xml | 91 +++++++++++++++++
src/main/java/com/flightfeather/monitor/controller/dust/DustSiteInfoController.java | 59 +++++++++++
src/main/java/com/flightfeather/monitor/service/DustSiteInfoService.java | 19 +++
10 files changed, 264 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java b/src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java
index 4772e55..4517ad7 100644
--- a/src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java
+++ b/src/main/java/com/flightfeather/monitor/controller/FugitiveDustController.java
@@ -75,13 +75,17 @@
return Result.success(list);
}
-//鏉′欢鏌ヨ寮傚父鏁版嵁
-@GetMapping("/exceptiondata")
-public Result getExceptionData(@RequestParam(defaultValue = "1") Integer page,
+
+ //鏉′欢鏌ヨ寮傚父鏁版嵁
+ @GetMapping("/exceptiondata")
+ public Result getExceptionData(@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "20")Integer pageSize,String siteName,String [] exceptionType,String beginTime, String endTime){
PageBean pageBean = fugitiveDustService.getExceptionData(page,pageSize,siteName,exceptionType,beginTime,endTime);
return Result.success(pageBean);
}
+
+
+
//鏉′欢鏌ヨ寮傚父鏁版嵁 涓嶅垎椤�
@GetMapping("/exceptiondata1")
public Result getExceptionAllData(String siteName,String [] exceptionType,String beginTime, String endTime){
@@ -89,18 +93,25 @@
return Result.success(list);
}
+ //澧炲姞琛楅亾鍜岃繍缁村晢 鏉′欢鏌ヨ寮傚父鏁版嵁
+ @GetMapping("/exceptiondata2")
+ public Result getExceptionData2(@RequestParam(defaultValue = "1") Integer page,
+ @RequestParam(defaultValue = "20")Integer pageSize,String siteName,String [] exceptionType,String beginTime, String endTime,String [] street,String [] dutyCompany){
+ PageBean pageBean = fugitiveDustService.getExceptionData2(page,pageSize,siteName,exceptionType,beginTime,endTime,street,dutyCompany);
+ return Result.success(pageBean);
+ }
//鏍规嵁鏌愭鏃堕棿鍐呮煇涓紓甯哥被鍨嬫煡璇㈠搴旂殑搴楅摵鍚嶇О鍜岃澶囩紪鍙�
@GetMapping("/sitenamecode")
-public Result getExceptionSitenameAndCode(String exceptionType,String beginTime, String endTime){
- List<DustExceptionData> list = fugitiveDustService.getExceptionSitenameAndCode(exceptionType,beginTime,endTime);
+public Result getExceptionSitenameAndCode(String exceptionType,String beginTime, String endTime,String [] street,String [] dutyCompany,String siteName){
+ List<DustExceptionData> list = fugitiveDustService.getExceptionSitenameAndCode(exceptionType,beginTime,endTime,street,dutyCompany,siteName);
return Result.success(list);
}
// 鏍规嵁鏃堕棿杩斿洖璇ュ紓甯哥被鍨嬬殑涓暟
@GetMapping("/exceptionnum")
- public Result exceptionNum(String exceptionType,String beginTime,String endTime){
- Integer list = fugitiveDustService.exceptionNum( exceptionType, beginTime, endTime);
+ public Result exceptionNum(String exceptionType,String beginTime,String endTime,String [] street,String [] dutyCompany,String siteName){
+ Integer list = fugitiveDustService.exceptionNum( exceptionType, beginTime, endTime,street,dutyCompany,siteName);
return Result.success(list);
}
diff --git a/src/main/java/com/flightfeather/monitor/controller/LoginController.java b/src/main/java/com/flightfeather/monitor/controller/LoginController.java
index 8210b10..6d1b0a9 100644
--- a/src/main/java/com/flightfeather/monitor/controller/LoginController.java
+++ b/src/main/java/com/flightfeather/monitor/controller/LoginController.java
@@ -24,7 +24,7 @@
//鍒ゆ柇锛氱櫥褰曠敤鎴锋槸鍚﹀瓨鍦�
if(login !=null ){
- return Result.success("鐧婚檰鎴愬姛");
+ return Result.success(login.getUiRealName());
}
return Result.error("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
}
diff --git a/src/main/java/com/flightfeather/monitor/controller/dust/DustSiteInfoController.java b/src/main/java/com/flightfeather/monitor/controller/dust/DustSiteInfoController.java
new file mode 100644
index 0000000..59320a0
--- /dev/null
+++ b/src/main/java/com/flightfeather/monitor/controller/dust/DustSiteInfoController.java
@@ -0,0 +1,59 @@
+package com.flightfeather.monitor.controller.dust;
+
+import com.flightfeather.monitor.domain.ds1.entity.DustSiteInfo;
+import com.flightfeather.monitor.pojo.Result;
+import com.flightfeather.monitor.pojo.RiskValuePojo;
+import com.flightfeather.monitor.service.DustSiteInfoService;
+import com.flightfeather.monitor.service.RiskValueService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @ClassName: DustSiteInfo
+ * @Description: TODO
+ * @author: yourname
+ */
+
+
+@Slf4j
+@RestController
+@RequestMapping("/dust/siteInfo")
+@CrossOrigin
+public class DustSiteInfoController {
+ @Autowired
+ private DustSiteInfoService dustSiteInfoService;
+
+
+ /**
+ * 鏍规嵁璁惧缂栫爜鏌ヨ绔欑偣鍩烘湰淇℃伅
+ *
+ * @param mnCode
+ * @return
+ */
+ @GetMapping("/info")
+ public Result querySiteInfoBymnCode(String mnCode) {
+
+
+ List<DustSiteInfo> list = dustSiteInfoService.querySiteInfoBymnCode(mnCode);
+ return Result.success(list);
+ }
+
+ @GetMapping("/dutyCompany")
+ public Result queryAllDutyCompany() {
+
+
+ List<DustSiteInfo> list = dustSiteInfoService.queryAllDutyCompany();
+ return Result.success(list);
+ }
+
+ @GetMapping("/street")
+ public Result queryStreet(String street) {
+
+
+ List<DustSiteInfo> list = dustSiteInfoService.queryStreet(street);
+ return Result.success(list);
+ }
+}
diff --git a/src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java b/src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java
index 41b141d..d1f4f67 100644
--- a/src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java
+++ b/src/main/java/com/flightfeather/monitor/mapper/FugitiveDustMapper.java
@@ -28,10 +28,9 @@
List<DustExceptionData> getExceptionData(String siteName, @Param("exceptionType")String[] exceptionType, String beginTime, String endTime);
- List<DustExceptionData> getExceptionSitenameAndCode(String exceptionType, String beginTime, String endTime);
+ List<DustExceptionData> getExceptionSitenameAndCode(String exceptionType, String beginTime, String endTime,@Param("street")String [] street,@Param("dutyCompany")String [] dutyCompany,String siteName);
- @Select("select count(*) from dust_exception_data as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code where exception_type = #{exceptionType} and (begin_time between #{beginTime} and #{endTime} or end_time between #{beginTime} and #{endTime})")
- Integer exceptionNum(String exceptionType, String beginTime, String endTime);
+ Integer exceptionNum(String exceptionType, String beginTime, String endTime,@Param("street")String [] street,@Param("dutyCompany")String [] dutyCompany,String siteName);
List<DustSiteData> conditonQueryHistoryData(String siteName, String beginTime, String endTime);
@@ -59,4 +58,6 @@
List<AnalysisDustData> analysisdataByTimeAndType(String beginTime, String endTime, String type);
+
+ List<DustExceptionData> getExceptionData2(String siteName, @Param("exceptionType")String[] exceptionType, String beginTime, String endTime, @Param("street")String[] street, @Param("dutyCompany")String[] dutyCompany);
}
diff --git a/src/main/java/com/flightfeather/monitor/pojo/DustSiteData.java b/src/main/java/com/flightfeather/monitor/pojo/DustSiteData.java
index 87a4f6d..3ef5017 100644
--- a/src/main/java/com/flightfeather/monitor/pojo/DustSiteData.java
+++ b/src/main/java/com/flightfeather/monitor/pojo/DustSiteData.java
@@ -17,16 +17,19 @@
private String sName;
// 渚涘簲鍟�
private String dutyCompany;
+ private String groupName;
+
+
private String mnCode;
private String typeName;
private double dustValue;
private double noiseValue;
-// private String lst;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime lst;
-
private String quality;
- private String groupName;
+ private String Grade;
+ private String flag;
+
}
diff --git a/src/main/java/com/flightfeather/monitor/service/DustSiteInfoService.java b/src/main/java/com/flightfeather/monitor/service/DustSiteInfoService.java
new file mode 100644
index 0000000..ba4acec
--- /dev/null
+++ b/src/main/java/com/flightfeather/monitor/service/DustSiteInfoService.java
@@ -0,0 +1,19 @@
+package com.flightfeather.monitor.service;
+
+import com.flightfeather.monitor.domain.ds1.entity.DustSiteInfo;
+
+import java.util.List;
+
+/**
+ * @ClassName: DustSiteInfoService
+ * @Description: TODO
+ * @author: yourname
+ */
+
+public interface DustSiteInfoService {
+ List<DustSiteInfo> querySiteInfoBymnCode(String mnCode);
+
+ List<DustSiteInfo> queryAllDutyCompany();
+
+ List<DustSiteInfo> queryStreet(String street);
+}
diff --git a/src/main/java/com/flightfeather/monitor/service/FugitiveDustService.java b/src/main/java/com/flightfeather/monitor/service/FugitiveDustService.java
index 7a878f4..6c54d41 100644
--- a/src/main/java/com/flightfeather/monitor/service/FugitiveDustService.java
+++ b/src/main/java/com/flightfeather/monitor/service/FugitiveDustService.java
@@ -23,9 +23,9 @@
PageBean getExceptionData(Integer page, Integer pageSize, String siteName, String[] exceptionType, String beginTime, String endTime);
- List<DustExceptionData> getExceptionSitenameAndCode(String exceptionType, String beginTime, String endTime);
+ List<DustExceptionData> getExceptionSitenameAndCode(String exceptionType, String beginTime, String endTime,String [] street,String [] dutyCompany,String siteName);
- Integer exceptionNum(String exceptionType, String beginTime, String endTime);
+ Integer exceptionNum(String exceptionType, String beginTime, String endTime,String [] street,String [] dutyCompany,String siteName);
List<DustSiteData> conditonQueryHistoryData(String siteName, String beginTime, String endTime);
@@ -53,4 +53,6 @@
List<AnalysisDustData> analysisdataByType(String month,String type);
List<AnalysisDustData> analysisdataByTimeAndType(String beginTime, String endTime, String type);
+
+ PageBean getExceptionData2(Integer page, Integer pageSize, String siteName, String[] exceptionType, String beginTime, String endTime, String[] street, String[] dutyCompany);
}
diff --git a/src/main/java/com/flightfeather/monitor/service/impl/DustSiteInfoServiceImpl.java b/src/main/java/com/flightfeather/monitor/service/impl/DustSiteInfoServiceImpl.java
new file mode 100644
index 0000000..4025c5e
--- /dev/null
+++ b/src/main/java/com/flightfeather/monitor/service/impl/DustSiteInfoServiceImpl.java
@@ -0,0 +1,45 @@
+package com.flightfeather.monitor.service.impl;
+
+import com.flightfeather.monitor.domain.ds1.entity.DustSiteInfo;
+import com.flightfeather.monitor.domain.ds1.mapper.DustSiteInfoMapper;
+import com.flightfeather.monitor.service.DustSiteInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.List;
+
+@Service
+public class DustSiteInfoServiceImpl implements DustSiteInfoService {
+
+ @Autowired
+ private DustSiteInfoMapper dustSiteInfoMapper;
+ @Override
+ public List<DustSiteInfo> querySiteInfoBymnCode(String mnCode) {
+
+ Example example = new Example(DustSiteInfo.class);
+ example.createCriteria().andEqualTo("mnCode",mnCode);
+ List<DustSiteInfo> list = dustSiteInfoMapper.selectByExample(example);
+ return list;
+ }
+
+ @Override
+ public List<DustSiteInfo> queryAllDutyCompany() {
+ Example example = new Example(DustSiteInfo.class);
+ example.setDistinct(true);
+ example.selectProperties("dutyCompany");
+ List<DustSiteInfo> list = dustSiteInfoMapper.selectByExample(example);
+ return list;
+ }
+
+ @Override
+ public List<DustSiteInfo> queryStreet(String street) {
+ Example example = new Example(DustSiteInfo.class);
+ example.setDistinct(true);
+ example.selectProperties("address");
+ example.createCriteria().andLike("address","%"+street+"%");
+ List<DustSiteInfo> list = dustSiteInfoMapper.selectByExample(example);
+ return list;
+ }
+
+}
diff --git a/src/main/java/com/flightfeather/monitor/service/impl/FugitiveDustServiceImpl.java b/src/main/java/com/flightfeather/monitor/service/impl/FugitiveDustServiceImpl.java
index 36c1e97..25e7885 100644
--- a/src/main/java/com/flightfeather/monitor/service/impl/FugitiveDustServiceImpl.java
+++ b/src/main/java/com/flightfeather/monitor/service/impl/FugitiveDustServiceImpl.java
@@ -93,14 +93,14 @@
}
@Override
- public List<DustExceptionData> getExceptionSitenameAndCode(String exceptionType, String beginTime, String endTime) {
- List<DustExceptionData> list = fugitiveDustMapper.getExceptionSitenameAndCode(exceptionType,beginTime,endTime);
+ public List<DustExceptionData> getExceptionSitenameAndCode(String exceptionType, String beginTime, String endTime,String [] street,String [] dutyCompany,String siteName) {
+ List<DustExceptionData> list = fugitiveDustMapper.getExceptionSitenameAndCode(exceptionType,beginTime,endTime,street,dutyCompany,siteName);
return list;
}
@Override
- public Integer exceptionNum(String exceptionType, String beginTime, String endTime) {
- Integer list = fugitiveDustMapper.exceptionNum(exceptionType,beginTime,endTime);
+ public Integer exceptionNum(String exceptionType, String beginTime, String endTime,String [] street,String [] dutyCompany,String siteName) {
+ Integer list = fugitiveDustMapper.exceptionNum(exceptionType,beginTime,endTime,street,dutyCompany,siteName);
return list;
}
@@ -189,5 +189,20 @@
return list;
}
+ @Override
+ public PageBean getExceptionData2(Integer page, Integer pageSize, String siteName, String[] exceptionType, String beginTime, String endTime, String[] street, String[] dutyCompany) {
+ //璁剧疆鍒嗛〉鍙傛暟
+ PageHelper.startPage(page,pageSize);
+
+ List<DustExceptionData> infoList = fugitiveDustMapper.getExceptionData2(siteName,exceptionType,beginTime,endTime,street,dutyCompany);
+ //鑾峰彇鏌ヨ缁撴灉
+ Page<DustExceptionData> p=(Page<DustExceptionData>)infoList;
+
+ //灏佽PageBean瀵硅薄*/
+ PageBean pageBean=new PageBean(p.getTotal(),p.getResult());
+
+ return pageBean;
+ }
+
}
diff --git a/src/main/resources/mapper/FugitiveDustMapper.xml b/src/main/resources/mapper/FugitiveDustMapper.xml
index c7ca729..ddbd502 100644
--- a/src/main/resources/mapper/FugitiveDustMapper.xml
+++ b/src/main/resources/mapper/FugitiveDustMapper.xml
@@ -145,12 +145,27 @@
from dust_exception_data as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
<where>
+ <if test="siteName !=null and siteName != ''">
+ b.name = #{siteName}
+ </if>
<if test="exceptionType !=null and exceptionType != ''">
- a.exception_type = #{exceptionType}
+ and a.exception_type = #{exceptionType}
</if>
<if test="beginTime != null and endTime != null">
and (a.begin_time between #{beginTime} and #{endTime} or a.end_time between #{beginTime} and #{endTime})
+ </if>
+ <if test="street != null and street != '' ">
+ and b.address in
+ <foreach item="item" collection="street" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="dutyCompany != null and dutyCompany != '' ">
+ and b.duty_company in
+ <foreach item="item" collection="dutyCompany" separator="," open="(" close=")">
+ #{item}
+ </foreach>
</if>
</where>
</select>
@@ -210,8 +225,9 @@
and a.type = #{type}
</if>
</where>
-
</select>
+
+
<select id="analysisdataByTimeAndType" resultType="com.flightfeather.monitor.pojo.AnalysisDustData">
select a.*,b.name,b.duty_company from dust_statistics_value as a join ja_t_dust_site_info as b on a.mn_code = b. mn_code
<where>
@@ -223,7 +239,78 @@
and a.type = #{type}
</if>
</where>
+ </select>
+ <select id="getExceptionData2" resultType="com.flightfeather.monitor.pojo.DustExceptionData">
+
+ select a.* ,b.*
+ from dust_exception_data as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
+ <where>
+ <if test="street != null and street != '' ">
+ b.address in
+ <foreach item="item" collection="street" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="dutyCompany != null and dutyCompany != '' ">
+ and b.duty_company in
+ <foreach item="item" collection="dutyCompany" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="siteName !=null and siteName != ''">
+ and b.name like concat('%',#{siteName},'%')
+ </if>
+
+ <if test="exceptionType != null and exceptionType != '' ">
+ and a.exception_type in
+ <foreach item="item" collection="exceptionType" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+
+
+ <if test="beginTime != null and endTime != null">
+ and (a.begin_time between #{beginTime} and #{endTime} or a.end_time between #{beginTime} and #{endTime})
+ </if>
+
+
+
+ </where>
</select>
+ <select id="exceptionNum" resultType="java.lang.Integer">
+ select count(*)
+ from dust_exception_data as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
+ <where>
+ <if test="siteName !=null and siteName != ''">
+ b.name = #{siteName}
+ </if>
+ <if test="exceptionType != null and exceptionType != '' ">
+ and a.exception_type = #{exceptionType}
+ </if>
+
+ <if test="street != null and street != '' ">
+ and b.address in
+ <foreach item="item" collection="street" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="dutyCompany != null and dutyCompany != '' ">
+ and b.duty_company in
+ <foreach item="item" collection="dutyCompany" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="beginTime != null and endTime != null">
+ and (a.begin_time between #{beginTime} and #{endTime} or a.end_time between #{beginTime} and #{endTime})
+ </if>
+
+ </where>
+
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3