From 3543b001e3da2cb801d7dfa27b396db4edbfb740 Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期三, 27 九月 2023 17:27:46 +0800
Subject: [PATCH] 添加了风险排名接口
---
src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java | 18 ++++
src/main/java/com/job/zsc/pojo/AnalysisDustData.java | 3
src/main/java/com/job/zsc/service/impl/dustexception/onlineAnalysisImpl.java | 10 ++
src/main/java/com/job/zsc/service/FugitiveDustService.java | 6 +
pom.xml | 7 +
src/main/java/com/job/zsc/utils/MD5Util.java | 64 ++++++++++++++++
src/main/java/com/job/zsc/controller/dustexception/onlineAnalysisController.java | 24 ++++++
src/main/java/com/job/zsc/mapper/dustexception/onlineAnalysisMapper.java | 8 ++
src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml | 50 ++++++++++++
src/main/java/com/job/zsc/controller/FugitiveDustController.java | 24 ++++++
src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java | 8 ++
src/main/java/com/job/zsc/controller/LoginController.java | 1
src/main/java/com/job/zsc/service/dustexception/onlineAnalysisService.java | 4 +
13 files changed, 224 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 669fb90..34d40ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,12 @@
<artifactId>kotlin-stdlib</artifactId>
<version>1.8.21</version>
</dependency>
-
+ <!--md5瑙ｅ瘑-->
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.14</version>
+ </dependency>
</dependencies>
<build>
diff --git a/src/main/java/com/job/zsc/controller/FugitiveDustController.java b/src/main/java/com/job/zsc/controller/FugitiveDustController.java
index c13fb80..be2c7e6 100644
--- a/src/main/java/com/job/zsc/controller/FugitiveDustController.java
+++ b/src/main/java/com/job/zsc/controller/FugitiveDustController.java
@@ -146,10 +146,34 @@
return Result.success(list);
}
+ /*鍐欏叆鐢ㄦ埛鐨勫叏灞�閰嶇疆*/
@PostMapping("setting")
public Result setting(@RequestBody DustDataAccessSetting dustDataAccessSetting){
fugitiveDustService.setting(dustDataAccessSetting);
return Result.success();
}
+
+ /*鏍规嵁寮傚父绫诲瀷鍜屾椂娈� 杩斿洖绔欑偣鍚嶅瓧*/
+ @GetMapping("/exceptionsSiteName")
+ public Result getSiteNameByTimeAndExceptionType(String [] exceptionType,String beginTime, String endTime){
+ List<DustExceptionData> list = fugitiveDustService.getSiteNameByTimeAndExceptionType(exceptionType,beginTime,endTime);
+ return Result.success(list);
+ }
+
+
+ @GetMapping("/analysisdataByType")
+ public Result analysisdataByType( String month,String type){
+ List<AnalysisDustData> list = fugitiveDustService.analysisdataByType(month,type);
+ return Result.success(list);
+ }
+
+
+ @GetMapping("/analysisdataByTimeAndType")
+ public Result analysisdataByTimeAndType( String beginTime,String endTime,String type){
+ List<AnalysisDustData> list = fugitiveDustService.analysisdataByTimeAndType(beginTime,endTime,type);
+ return Result.success(list);
+ }
+
+
}
diff --git a/src/main/java/com/job/zsc/controller/LoginController.java b/src/main/java/com/job/zsc/controller/LoginController.java
index f67b1d2..683354e 100644
--- a/src/main/java/com/job/zsc/controller/LoginController.java
+++ b/src/main/java/com/job/zsc/controller/LoginController.java
@@ -26,6 +26,7 @@
//鍒ゆ柇锛氱櫥褰曠敤鎴锋槸鍚﹀瓨鍦�
if(login !=null ){
+
return Result.success("鐧婚檰鎴愬姛");
}
return Result.error("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
diff --git a/src/main/java/com/job/zsc/controller/dustexception/onlineAnalysisController.java b/src/main/java/com/job/zsc/controller/dustexception/onlineAnalysisController.java
new file mode 100644
index 0000000..777a09c
--- /dev/null
+++ b/src/main/java/com/job/zsc/controller/dustexception/onlineAnalysisController.java
@@ -0,0 +1,24 @@
+package com.job.zsc.controller.dustexception;
+
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RequestMapping("/dustAnalisys")
+@CrossOrigin
+@RestController
+public class onlineAnalysisController {
+
+ @Autowired
+ private com.job.zsc.service.dustexception.onlineAnalysisService onlineAnalysisService;
+
+ @GetMapping("/analysisData")
+ public void get(){
+
+ }
+}
diff --git a/src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java b/src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java
index e20359d..c06fd99 100644
--- a/src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java
+++ b/src/main/java/com/job/zsc/mapper/FugitiveDustMapper.java
@@ -51,4 +51,12 @@
@Insert("insert into dust_global_setting(user,create_time,begin_time,end_time,region,is_regular_time) values( #{user},#{createTime},#{beginTime},#{endTime},#{region},#{isRegularTime})")
void setting(DustDataAccessSetting dustDataAccessSetting);
+
+
+ List<DustExceptionData> getSiteNameByTimeAndExceptionType(@Param("exceptionType")String[] exceptionType, String beginTime, String endTime);
+
+ List<AnalysisDustData> analysisdataByType(String month,String type);
+
+
+ List<AnalysisDustData> analysisdataByTimeAndType(String beginTime, String endTime, String type);
}
diff --git a/src/main/java/com/job/zsc/mapper/dustexception/onlineAnalysisMapper.java b/src/main/java/com/job/zsc/mapper/dustexception/onlineAnalysisMapper.java
new file mode 100644
index 0000000..bf06eeb
--- /dev/null
+++ b/src/main/java/com/job/zsc/mapper/dustexception/onlineAnalysisMapper.java
@@ -0,0 +1,8 @@
+package com.job.zsc.mapper.dustexception;
+
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public class onlineAnalysisMapper {
+}
diff --git a/src/main/java/com/job/zsc/pojo/AnalysisDustData.java b/src/main/java/com/job/zsc/pojo/AnalysisDustData.java
index e8f36f8..6e6671b 100644
--- a/src/main/java/com/job/zsc/pojo/AnalysisDustData.java
+++ b/src/main/java/com/job/zsc/pojo/AnalysisDustData.java
@@ -13,7 +13,7 @@
public class AnalysisDustData {
private String mnCode;
- private String name;
+ private String name;
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate lst;
@@ -24,4 +24,5 @@
private String dayOnline;
private String dayValid;
private String dayExceeding;
+ private String type;
}
diff --git a/src/main/java/com/job/zsc/service/FugitiveDustService.java b/src/main/java/com/job/zsc/service/FugitiveDustService.java
index 70a8981..ec717d5 100644
--- a/src/main/java/com/job/zsc/service/FugitiveDustService.java
+++ b/src/main/java/com/job/zsc/service/FugitiveDustService.java
@@ -47,4 +47,10 @@
void setting(DustDataAccessSetting dustDataAccessSetting);
+
+ List<DustExceptionData> getSiteNameByTimeAndExceptionType(String[] exceptionType, String beginTime, String endTime);
+
+ List<AnalysisDustData> analysisdataByType(String month,String type);
+
+ List<AnalysisDustData> analysisdataByTimeAndType(String beginTime, String endTime, String type);
}
diff --git a/src/main/java/com/job/zsc/service/dustexception/onlineAnalysisService.java b/src/main/java/com/job/zsc/service/dustexception/onlineAnalysisService.java
new file mode 100644
index 0000000..a80acae
--- /dev/null
+++ b/src/main/java/com/job/zsc/service/dustexception/onlineAnalysisService.java
@@ -0,0 +1,4 @@
+package com.job.zsc.service.dustexception;
+
+public interface onlineAnalysisService {
+}
diff --git a/src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java b/src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java
index 4193d73..c3ca5c8 100644
--- a/src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java
+++ b/src/main/java/com/job/zsc/service/impl/FugitiveDustServiceImpl.java
@@ -171,5 +171,23 @@
fugitiveDustMapper.setting(dustDataAccessSetting);
}
+ @Override
+ public List<DustExceptionData> getSiteNameByTimeAndExceptionType(String[] exceptionType, String beginTime, String endTime) {
+ List<DustExceptionData> list = fugitiveDustMapper.getSiteNameByTimeAndExceptionType(exceptionType,beginTime,endTime);
+ return list;
+ }
+
+ @Override
+ public List<AnalysisDustData> analysisdataByType(String month,String type) {
+ List<AnalysisDustData> list = fugitiveDustMapper.analysisdataByType(month,type);
+ return list;
+ }
+
+ @Override
+ public List<AnalysisDustData> analysisdataByTimeAndType(String beginTime, String endTime, String type) {
+ List<AnalysisDustData> list = fugitiveDustMapper.analysisdataByTimeAndType(beginTime,endTime,type);
+ return list;
+ }
+
}
diff --git a/src/main/java/com/job/zsc/service/impl/dustexception/onlineAnalysisImpl.java b/src/main/java/com/job/zsc/service/impl/dustexception/onlineAnalysisImpl.java
new file mode 100644
index 0000000..e575f3f
--- /dev/null
+++ b/src/main/java/com/job/zsc/service/impl/dustexception/onlineAnalysisImpl.java
@@ -0,0 +1,10 @@
+package com.job.zsc.service.impl.dustexception;
+
+import com.job.zsc.service.dustexception.onlineAnalysisService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class onlineAnalysisImpl implements onlineAnalysisService {
+
+
+}
diff --git a/src/main/java/com/job/zsc/utils/MD5Util.java b/src/main/java/com/job/zsc/utils/MD5Util.java
new file mode 100644
index 0000000..01f4d6d
--- /dev/null
+++ b/src/main/java/com/job/zsc/utils/MD5Util.java
@@ -0,0 +1,64 @@
+package com.job.zsc.utils;
+
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * MD5鍔犲瘑瑙ｅ瘑宸ュ叿绫�
+ * @author admin
+ *
+ */
+public class MD5Util {
+
+ /**
+ * @param args
+ */
+ public static void main(String[] args) {
+
+ String s = "admin123";
+ System.out.println("鍘熷锛�" + s);
+ System.out.println("MD5鍚庯細" + string2MD5(s));
+
+ System.out.println("鍙В瀵嗙殑鍔犲瘑绠楁硶锛屽姞瀵嗗悗锛�" + convertMD5(s));
+ System.out.println("瑙ｅ瘑鍚庯細" + convertMD5(convertMD5(s)));
+ }
+
+ /**
+ * 浣跨敤 MD5绠楁硶鍔犲瘑鐢熸垚32浣峬d5鐮�
+ * @param str
+ * @return
+ */
+ public static String string2MD5(String str) {
+ byte[] secretBytes = null;
+ try {
+ secretBytes = MessageDigest.getInstance("md5").digest(
+ str.getBytes());
+ } catch (NoSuchAlgorithmException e) {
+ throw new RuntimeException("娌℃湁md5杩欎釜绠楁硶锛�");
+ }
+ String md5code = new BigInteger(1, secretBytes).toString(16);// 16杩涘埗鏁板瓧
+ // 濡傛灉鐢熸垚鏁板瓧鏈弧32浣嶏紝闇�瑕佸墠闈㈣ˉ0
+ for (int i = 0; i < 32 - md5code.length(); i++) {
+ md5code = "0" + md5code;
+ }
+ return md5code;
+ }
+
+ /**
+ * 鍙�嗙殑鍔犲瘑瑙ｅ瘑绠楁硶,鎵ц涓�娆″姞瀵�,涓ゆ瑙ｅ瘑
+ * @param str
+ * @return
+ */
+ public static String convertMD5(String str){
+
+ char[] a = str.toCharArray();
+ for (int i = 0; i < a.length; i++){
+ a[i] = (char) (a[i] ^ 't');
+ }
+ String s = new String(a);
+ return s;
+
+ }
+
+}
diff --git a/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml b/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
index f6b8a7d..0938dff 100644
--- a/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
+++ b/src/main/resources/com/job/zsc/mapper/FugitiveDustMapper.xml
@@ -96,7 +96,7 @@
order by lst asc ) as d on c.mn_code = d.mn_code
</select>
- <!--鏉′欢鏌ヨ寮傚父鏁版嵁-->
+ <!--鏉′欢鏌ヨ寮傚父鏁版嵁 鍔犱笂浜嗗璁′俊鎭�-->
<select id="getExceptionData" resultType="com.job.zsc.pojo.DustExceptionData">
select *
from (select a.* ,b.name,b.typename,b.address,b.duty_company
@@ -113,6 +113,7 @@
</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>
@@ -122,10 +123,12 @@
</select>
+
<!-- 鏍规嵁鏌愭鏃堕棿鍐呮煇涓紓甯哥被鍨嬫煡璇㈠搴旂殑搴楅摵鍚嶇О鍜岃澶囩紪鍙�-->
<select id="getExceptionSitenameAndCode" resultType="com.job.zsc.pojo.DustExceptionData">
select DISTINCT b.name,a.mn_code
from dust_exception_data as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
+
<where>
<if test="exceptionType !=null and exceptionType != ''">
a.exception_type = #{exceptionType}
@@ -152,6 +155,7 @@
</where>
order by a.lst asc
</select>
+
<select id="getHasAuditedData" resultType="com.job.zsc.pojo.DustExceptionData">
select *
from dust_exception_data as a left join audit_info as b on a.id = b.exception_id
@@ -163,4 +167,48 @@
</where>
</select>
+ <select id="getSiteNameByTimeAndExceptionType" resultType="com.job.zsc.pojo.DustExceptionData">
+ select DISTINCT b.name
+ from dust_exception_data as a join ja_t_dust_site_info as b on a.mn_code = b.mn_code
+ <where>
+ <if test="exceptionType != null and exceptionType != '' ">
+ 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="analysisdataByType" resultType="com.job.zsc.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>
+ <if test="month != null and month != null">
+ a.lst = #{month}
+ </if>
+
+ <if test="type != null and type != ''">
+ and a.type = #{type}
+ </if>
+ </where>
+
+ </select>
+ <select id="analysisdataByTimeAndType" resultType="com.job.zsc.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>
+ <if test="beginTime != null and endTime != null">
+ a.Lst between #{beginTime} and #{endTime}
+ </if>
+
+ <if test="type != null and type != ''">
+ and a.type = #{type}
+ </if>
+ </where>
+
+
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3