From 9ddf06bee3dbd1dde785e2ac7be808c8ee22d56d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 23 Aug 2021 08:58:44 +0800
Subject: [PATCH] 1.首页接口调整

---
 src/main/java/org/springblade/modules/information/controller/InformationController.java |   55 +++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 37 insertions(+), 18 deletions(-)

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 467499b..c103b5d 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -29,24 +29,22 @@
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.support.Kv;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.desk.entity.Notice;
-import org.springblade.modules.desk.vo.NoticeVO;
-import org.springblade.modules.desk.wrapper.NoticeWrapper;
+import org.springblade.modules.dispatcher.vo.DispatcherVO;
 import org.springblade.modules.jurisdiction.service.JurisdictionService;
 import org.springblade.modules.jurisdiction.vo.JurisdictionVO;
-import org.springblade.modules.member.service.IMemberService;
-import org.springblade.modules.shareholder.service.IShareholderService;
 import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.service.IDeptService;
-import org.springblade.modules.system.service.IUserDeptService;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.modules.information.entity.Information;
-import org.springblade.modules.information.vo.InformationVO;
 import org.springblade.modules.information.service.IInformationService;
 import org.springblade.core.boot.ctrl.BladeController;
 import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
 
 import java.util.*;
 
@@ -802,8 +800,8 @@
 	 * 保安员统计
 	 */
 	@PostMapping("/selectLi")
-	public R selectLi(String jurisdiction, String deptid,Integer current,Integer size) {
-		List<Map<Object, Object>> list = informationService.selectLi(jurisdiction, deptid,current,size);
+	public R<IPage> selectLi(String jurisdiction, String deptid, Query query) {
+		IPage list = informationService.selectLi(Condition.getPage(query),jurisdiction, deptid);
 		return R.data(list);
 	}
 
@@ -836,8 +834,8 @@
 	 * 公司运营情况进入图表
 	 */
 	@PostMapping("/selectTb")
-	public R selectTb(String jurisdiction, String enterpriseName, Integer current, Integer size) {
-		List<Map<Object, Object>> list = informationService.selectTb(jurisdiction, enterpriseName, current, size);
+	public R<IPage> selectTb(String jurisdiction, String enterpriseName, Query query) {
+		IPage list =informationService.selectTb(Condition.getPage(query),jurisdiction, enterpriseName);
 		return R.data(list);
 	}
 
@@ -845,8 +843,8 @@
 	 * 公司经济情况进入图表
 	 */
 	@PostMapping("/selectJj")
-	public R selectJj(String jurisdiction, String enterpriseName, Integer current, Integer size) {
-		List<Map<Object, Object>> list = informationService.selectJj(jurisdiction, enterpriseName, current, size);
+	public R<IPage> selectJj(String jurisdiction, String enterpriseName, Query query) {
+		IPage list = informationService.selectJj(Condition.getPage(query),jurisdiction, enterpriseName);
 		return R.data(list);
 	}
 
@@ -854,8 +852,8 @@
 	 * 业务统计情况
 	 */
 	@PostMapping("/selectYw")
-	public R selectYw(String jurisdiction, String deptid,Integer current,Integer size) {
-		List<Map<Object, Object>> list = informationService.selectYw(jurisdiction, deptid,current,size);
+	public R<IPage> selectYw(String jurisdiction, String deptid, Query query) {
+		IPage list = informationService.selectYw(Condition.getPage(query),jurisdiction, deptid);
 		return R.data(list);
 	}
 
@@ -872,8 +870,8 @@
 	 * 业务统计明细
 	 */
 	@PostMapping("/selectDis")
-	public R selectDis(String jurisdiction, String deptid, String fid, Integer current, Integer size) {
-		List<Map<Object, Object>> list = informationService.selectDis(jurisdiction, deptid, fid, current, size);
+	public R<IPage> selectDis(String jurisdiction, String deptid, String fid, Query query) {
+		IPage list = informationService.selectDis(Condition.getPage(query),jurisdiction, deptid, fid);
 		return R.data(list);
 	}
 
@@ -925,4 +923,25 @@
 		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();
+//	}
 }

--
Gitblit v1.9.3