From 6234ef30e315d6518401926c2eae0267c4742dfd Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 23 Aug 2021 10:55:35 +0800
Subject: [PATCH] 1.首页接口调整
---
src/main/java/org/springblade/modules/FTP/monitor.java | 2
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 79 ++++++++++++++++++++++++++
src/main/java/org/springblade/modules/information/service/IInformationService.java | 2
src/main/java/org/springblade/modules/information/controller/InformationController.java | 55 +++++++++++-------
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java | 2
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 10 +++
6 files changed, 128 insertions(+), 22 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/monitor.java b/src/main/java/org/springblade/modules/FTP/monitor.java
index d432e76..9bd42dc 100644
--- a/src/main/java/org/springblade/modules/FTP/monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/monitor.java
@@ -19,7 +19,7 @@
//private static String fileName = "nsql.json";
- @Scheduled(cron = "*/30 * * * * ?")
+ //@Scheduled(cron = "*/30 * * * * ?")
public static boolean isFTPFileExist() {
FTPClient ftp = new FTPClient();
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index c103b5d..7b57840 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -41,6 +41,7 @@
import org.springblade.core.boot.ctrl.BladeController;
import springfox.documentation.annotations.ApiIgnore;
+import java.text.DecimalFormat;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -923,25 +924,37 @@
return R.data(lists);
}
-// public static void main(String[] args) throws Exception {
-// //ftp服务器IP地址
-// String ftpHost = "192.168.0.105";
-// //ftp服务器端口
-// int ftpPort = 21;
-// //ftp服务器用户名
-// String ftpUserName = "yly";
-// //ftp服务器密码
-// String ftpPassword = "Yly@123";
-// //ftp服务器路径
-// String ftpPath = "";
-// //本地路径
-// String localPath = "D:\\anbao";
-// //文件名
-// String fileName = "sql.json";
-// FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
-// String s = TestJson();
-// String sql = stringReplace(s);
-// MysqlCenlint.inster(sql);
-// MysqlCenlint.delete();
-// }
+ /**
+ * 违规经营
+ */
+ @PostMapping("/selectWg")
+ public R selectWg() {
+ List<Map<Object, Object>> list = informationService.selectWg();
+ for (int i=0;i<list.size();i++){
+ //总数
+ String znums = list.get(i).get("znum").toString();
+ int znum=Integer.parseInt(znums);
+ //持证人数
+ String cznums = list.get(i).get("cznum").toString();
+ int cznum=Integer.parseInt(cznums);
+ //缴纳社保人数
+ String sbnums = list.get(i).get("sbnum").toString();
+ int sbnum=Integer.parseInt(sbnums);
+ }
+ return R.data(list);
+ }
+
+ /**
+ * 经营不善
+ */
+ @PostMapping("/selectJy")
+ public R selectJy() {
+ List<Map<Object, Object>> list = informationService.selectJy();
+ for (int i=0;i<list.size();i++){
+
+ }
+ return R.data(list);
+ }
+
+
}
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
index 9426ac3..493ea5c 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -76,6 +76,8 @@
List selectJj(IPage page, String jurisdiction,String enterpriseName);
List selectDis(IPage page,String jurisdiction,String deptid,String fid);
List<Map<Object,Object>> selectFw();
+ List<Map<Object,Object>> selectWg();
+ List<Map<Object,Object>> selectJy();
Map<String, String> queryYearZ(String year,String jurisdiction,String deptid);
Map<String, String> queryYearZc(String year,String jurisdiction,String deptid);
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 9c88228..562c54e 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -1335,4 +1335,83 @@
GROUP BY
i.enterpriseName,j.dept_name
</select>
+
+ <!--违规经营-->
+ <select id="selectWg" resultType="java.util.HashMap">
+ SELECT A.enterpriseName,
+ A.representative,
+ A.establishTime,
+ A.registeredCapital,
+ A.capital,
+ A.representativecell,
+ A.contacts,
+ A.contactscell,
+ A.deptname,
+ A.jurname,
+ IFNULL(B.cznum, 0) AS cznum,
+ IFNULL(C.sbnum, 0) AS sbnum,
+ IFNULL(D.znum, 0) AS znum
+ FROM (
+ SELECT u.enterpriseName,
+ u.representative,
+ u.establishTime,
+ u.registeredCapital,
+ u.capital,
+ u.representativecell,
+ u.contacts,
+ u.contactscell,
+ u.departmentid,
+ u.jurisdiction,
+ d.dept_name AS deptname,
+ j.dept_name AS jurname
+ FROM sys_information u
+ LEFT JOIN blade_dept d ON d.id = u.departmentid
+ LEFT JOIN sys_jurisdiction j ON j.id = u.jurisdiction
+ GROUP BY u.enterpriseName,
+ u.representative,
+ u.establishTime,
+ u.registeredCapital,
+ u.capital,
+ u.representativecell,
+ u.contacts,
+ u.contactscell,
+ u.departmentid,
+ u.jurisdiction,
+ d.dept_name,
+ j.dept_name
+ ) A
+ LEFT JOIN (
+ SELECT COUNT(*) AS cznum,
+ dept_id
+ FROM blade_user
+ WHERE hold = 1
+ AND role_id = '1412226235153731586'
+ AND is_deleted = 0
+ GROUP BY dept_id
+ ) B ON B.dept_id = A.departmentid
+ LEFT JOIN (
+ SELECT COUNT(*) AS sbnum,
+ dept_id
+ FROM blade_user
+ WHERE soil = 0
+ AND role_id = '1412226235153731586'
+ AND is_deleted = 0
+ GROUP BY dept_id
+ ) C ON C.dept_id = A.departmentid
+ LEFT JOIN (SELECT COUNT(*) AS znum, dept_id
+ FROM blade_user
+ WHERE role_id = '1412226235153731586'
+ AND is_deleted = 0
+ GROUP BY dept_id) D ON D.dept_id = A.departmentid
+ </select>
+
+
+ <!--经营不善-->
+ <select id="selectJy" resultType="java.util.HashMap">
+ SELECT i.*,
+ IFNULL(d.num, 0) as num
+ FROM sys_information i
+ LEFT JOIN (SELECT COUNT(*) num, dept_id FROM sys_dispatcher_unit GROUP BY dept_id) d
+ ON i.departmentid = d.dept_id
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/information/service/IInformationService.java b/src/main/java/org/springblade/modules/information/service/IInformationService.java
index db15b1d..baf2c7a 100644
--- a/src/main/java/org/springblade/modules/information/service/IInformationService.java
+++ b/src/main/java/org/springblade/modules/information/service/IInformationService.java
@@ -84,4 +84,6 @@
List<Map<Object,Object>> selectFw();
List<Map<Object,Object>> selectCf(String jurisdiction);
List<Map<Object,Object>> selectCl(String jurisdiction);
+ List<Map<Object,Object>> selectWg();
+ List<Map<Object,Object>> selectJy();
}
diff --git a/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java b/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
index fe5233e..9073026 100644
--- a/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
@@ -251,5 +251,15 @@
return baseMapper.selectCl(jurisdiction);
}
+ @Override
+ public List<Map<Object,Object>> selectWg() {
+ return baseMapper.selectWg();
+ }
+
+ @Override
+ public List<Map<Object, Object>> selectJy() {
+ return baseMapper.selectJy();
+ }
+
}
--
Gitblit v1.9.3