From 2cf76c21aa27bef90017ecfaa14abf066d5f28bc Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 19 Aug 2021 17:50:04 +0800
Subject: [PATCH] 1.单位
---
src/main/java/org/springblade/common/utils/FtpUploadFile.java | 2
src/main/java/org/springblade/common/utils/FtpUtil.java | 22 ++-----
src/main/java/org/springblade/common/utils/FtpMain.java | 12 +--
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 5 +
src/main/java/org/springblade/modules/information/service/IInformationService.java | 1
src/main/java/org/springblade/modules/information/controller/InformationController.java | 103 ++++++++++++++++++++++++++++++---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java | 1
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 5 +
src/main/java/org/springblade/common/utils/OutJson.java | 2
9 files changed, 118 insertions(+), 35 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/FtpMain.java b/src/main/java/org/springblade/common/utils/FtpMain.java
similarity index 63%
rename from src/main/java/org/springblade/modules/information/controller/FtpMain.java
rename to src/main/java/org/springblade/common/utils/FtpMain.java
index 072f041..71b0f43 100644
--- a/src/main/java/org/springblade/modules/information/controller/FtpMain.java
+++ b/src/main/java/org/springblade/common/utils/FtpMain.java
@@ -1,7 +1,5 @@
-package org.springblade.modules.information.controller;
+package org.springblade.common.utils;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
public class FtpMain {
@@ -19,17 +17,17 @@
//本地路径
String localPath = "D:\\anbao";
//文件名
- String fileName = "fz.py";
+ String fileName = "sql.json";
//下载
//将ftp根目录下的文件下载至E盘
- //FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
+ FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
//上传
//将E盘的文件上传至ftp根目录
- FileInputStream in=new FileInputStream(new File("D:\\" + fileName));
- FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", "/", fileName, in);
+ //FileInputStream in=new FileInputStream(new File("D:\\" + fileName));
+ //FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", "/", fileName, in);
//删除
//删除ftp根目录下的文件
diff --git a/src/main/java/org/springblade/modules/information/controller/FtpUploadFile.java b/src/main/java/org/springblade/common/utils/FtpUploadFile.java
similarity index 98%
rename from src/main/java/org/springblade/modules/information/controller/FtpUploadFile.java
rename to src/main/java/org/springblade/common/utils/FtpUploadFile.java
index 9b290d7..9130c18 100644
--- a/src/main/java/org/springblade/modules/information/controller/FtpUploadFile.java
+++ b/src/main/java/org/springblade/common/utils/FtpUploadFile.java
@@ -1,4 +1,4 @@
-package org.springblade.modules.information.controller;
+package org.springblade.common.utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/src/main/java/org/springblade/modules/information/controller/FtpUtil.java b/src/main/java/org/springblade/common/utils/FtpUtil.java
similarity index 93%
rename from src/main/java/org/springblade/modules/information/controller/FtpUtil.java
rename to src/main/java/org/springblade/common/utils/FtpUtil.java
index f4e85b8..2ecd30a 100644
--- a/src/main/java/org/springblade/modules/information/controller/FtpUtil.java
+++ b/src/main/java/org/springblade/common/utils/FtpUtil.java
@@ -1,21 +1,13 @@
-package org.springblade.modules.information.controller;
-
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.SocketException;
+package org.springblade.common.utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPReply;
+
+import java.io.*;
+import java.net.SocketException;
/**
* ftp工具类
@@ -109,9 +101,9 @@
InputStream retrieveFileStream = ftpClient.retrieveFileStream(fileNameTemp);
// 第一种方式下载文件(推荐)
- /* File localFile = new File(localPath + File.separatorChar + fileName);
- OutputStream os = new FileOutputStream(localFile);
- ftpClient.retrieveFile(fileName, os); os.close();*/
+ //File localFile = new File(localPath + File.separatorChar + fileName);
+ //OutputStream os = new FileOutputStream(localFile);
+ //ftpClient.retrieveFile(fileName, os); os.close();
// 第二种方式下载：将输入流转成字节，再生成文件，这种方式方便将字节数组直接返回给前台jsp页面
diff --git a/src/main/java/org/springblade/modules/information/controller/OutJson.java b/src/main/java/org/springblade/common/utils/OutJson.java
similarity index 98%
rename from src/main/java/org/springblade/modules/information/controller/OutJson.java
rename to src/main/java/org/springblade/common/utils/OutJson.java
index 94ff08b..255a03c 100644
--- a/src/main/java/org/springblade/modules/information/controller/OutJson.java
+++ b/src/main/java/org/springblade/common/utils/OutJson.java
@@ -1,4 +1,4 @@
-package org.springblade.modules.information.controller;
+package org.springblade.common.utils;
import java.io.File;
import java.io.FileOutputStream;
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 1220323..a55c9ec 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -16,16 +16,17 @@
*/
package org.springblade.modules.information.controller;
-import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.google.gson.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import com.alibaba.fastjson.JSON;
import org.springblade.common.cache.DictCache;
import org.springblade.common.enums.DictEnum;
-import org.springblade.common.utils.arg;
+import org.springblade.common.utils.FtpUtil;
+import org.springblade.common.utils.OutJson;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.excel.util.ExcelUtil;
@@ -39,18 +40,12 @@
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.information.vo.InformationVO;
import org.springblade.modules.system.entity.Dept;
-import org.springblade.modules.system.excel.UserExcel;
-import org.springblade.modules.system.excel.UserImporter;
import org.springblade.modules.system.service.IDeptService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.lang.reflect.Field;
+import java.io.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -118,7 +113,6 @@
}
-
/**
* 新增
*/
@@ -180,7 +174,7 @@
String id = kv.get("id").toString();
information.setDepartmentid(id);
}
- String json=JSON.toJSONString(information);
+ //String json=JSON.toJSONString(information);
//com.util.OutJson.createJsonFile(json,"d:/anbao/information/","informationSave");
//arg.test01(arg.url + "/information/save", information);
return R.status(informationService.save(information));
@@ -312,4 +306,91 @@
// }
+ @PostMapping("ss")
+ public void ss() throws FileNotFoundException {
+ //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";
+ Information information = new Information();
+ information.setCreditcode("1");
+ informationService.insertIn(information);
+ Integer id = information.getId();
+ String s = "insert into sys_information(id,creditcode) values(" + "'" + id + "'" + "," + "'" + 1 + "'" + ")";
+ System.out.println(s);
+ Object o = s;
+ String json = JSON.toJSONString(o);
+ OutJson.createJsonFile(json, "d:/", "sql");
+ FileInputStream in = new FileInputStream(new File("D:\\" + fileName));
+ FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", "/", fileName, in);
+ }
+
+
+ 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();
+ System.out.println(s);
+ }
+
+
+ public static String TestJson(){
+ File file = new File("D:\\anbao\\sql.json");
+ StringBuilder localStrBulider = new StringBuilder();
+ if(file.isFile() && file.exists()) {
+ try {
+ InputStreamReader inputStreamReader = new InputStreamReader(new FileInputStream(file), "utf-8");
+ BufferedReader bufferReader = new BufferedReader(inputStreamReader);
+ String lineStr = null;
+ try {
+ while((lineStr = bufferReader.readLine()) != null) {
+ localStrBulider.append(lineStr);
+ }
+ bufferReader.close();
+ inputStreamReader.close();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ System.out.println("file read error!");
+ e.printStackTrace();
+ }
+ } catch (UnsupportedEncodingException e) {
+ // TODO Auto-generated catch block
+ System.out.println("file catch unsupported encoding!");
+ e.printStackTrace();
+ } catch (FileNotFoundException e) {
+ // TODO Auto-generated catch block
+ System.out.println("file not found!");
+ e.printStackTrace();
+ }
+ }else {
+ System.out.println("file is not a file or file is not existing!");
+ }
+ return localStrBulider.toString();
+ }
+
+
+
}
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 496800a..1075619 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -41,6 +41,7 @@
* @return
*/
List<Information> selectInformationPage(IPage page, @Param("information")Information information);
+ void insertIn(@Param("information")Information information);
void deleteIn(String creditcode);
void deleteSh(String creditcode);
void deleteMe(String creditcode);
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 d95b7fb..0c34b37 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -30,6 +30,11 @@
</resultMap>
+ <insert id="insertIn" useGeneratedKeys="true" keyProperty="id">
+ insert into sys_information (creditcode) values (#{information.creditcode})
+ </insert>
+
+
<select id="selectInformationPage" resultMap="informationResultMap">
select * from sys_information where 1=1
<if test="information.enterprisename!=null and information.enterprisename!=''">
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 dbeb0d2..b9e0133 100644
--- a/src/main/java/org/springblade/modules/information/service/IInformationService.java
+++ b/src/main/java/org/springblade/modules/information/service/IInformationService.java
@@ -44,6 +44,7 @@
IPage<Information> selectInformationPage(IPage<Information> page, Information information);
void deleteIn(String creditCode);
void deleteSh(String creditCode);
+ void insertIn(Information information);
void deleteMe(String creditCode);
Map selectCount(String departmentid);
List<Map<Object,String>> selectInCount();
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 6067866..719ccf9 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
@@ -73,6 +73,11 @@
}
@Override
+ public void insertIn( Information information) {
+ baseMapper.insertIn(information);
+ }
+
+ @Override
public void deleteMe(String creditcode) {
baseMapper.deleteMe(creditcode);
}
--
Gitblit v1.9.3