From 733edfcd6ad1c38dcf4aa761a417f4e4bfd754b2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 27 Aug 2021 11:05:44 +0800
Subject: [PATCH] 1.许可审批
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 96 ++++++------------------------------------------
1 files changed, 12 insertions(+), 84 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 bf0c2ff..64c6ad6 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -45,6 +45,7 @@
import javax.validation.Valid;
import java.io.*;
+import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -63,19 +64,15 @@
@Api(value = "", tags = "接口")
public class InformationController extends BladeController {
//ftp服务器IP地址
- private static String ftpHost = "192.168.0.105";
+ private static String ftpHost = "192.168.0.105";
//ftp服务器端口
- private static int ftpPort = 21;
+ private static int ftpPort = 21;
//ftp服务器用户名
- private static String ftpUserName = "yly";
+ private static String ftpUserName = "yly";
//ftp服务器密码
- private static String ftpPassword = "Yly@123";
- //ftp服务器路径
- private static String ftpPath = "anbao/sql.json";
+ private static String ftpPassword = "Yly@123";
//本地路径
- private static String localPath = "D:\\anbao";
- //文件名
- private static String fileName = "nsql.json";
+ private static String localPath = "D:\\anbao";
private final IInformationService informationService;
private final IDeptService iDeptService;
@@ -108,8 +105,8 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入information")
- public R<IPage<Information>> page(Information information, Query query) {
- IPage<Information> pages = informationService.selectInformationPage(Condition.getPage(query), information);
+ public R<IPage<InformationVO>> page(InformationVO information, Query query) {
+ IPage<InformationVO> pages = informationService.selectInformationPage(Condition.getPage(query), information);
return R.data(pages);
}
@@ -185,13 +182,13 @@
String id = kv.get("id").toString();
information.setDepartmentid(id);
}
- informationService.insertIn(information);
+ informationService.save(information);
String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(information.getEstablishtime());
- Integer id = information.getId();
+ //Integer id = information.getId();
String s = "insert into sys_information(id,creditcode,enterprisename,representative,establishtime," +
"registeredcapital,organizationcode,registrationnumber,identificationnumber, enterprises, address," +
" business,region,registration,industry,departmentid,stats,jurisdiction,representativecell,contacts,contactscell) " +
- "values(" + "'" + id + "'" + "," + "'" + information.getCreditcode() + "'" + "," + "'" + information.getEnterprisename() + "'" + "," + "'" + information.getRepresentative() + "'" + "," +
+ "values(" + "'" + information.getId() + "'" + "," + "'" + information.getCreditcode() + "'" + "," + "'" + information.getEnterprisename() + "'" + "," + "'" + information.getRepresentative() + "'" + "," +
"'" + formatStr + "'" + "," + "'" + information.getRegisteredcapital() + "'" + "," + "'" + information.getOrganizationcode() + "'" + "," + "'" + information.getRegistrationnumber() + "'" + "," +
"'" + information.getIdentificationnumber() + "'" + "," + "'" + information.getEnterprises() + "'" + "," + "'" +
information.getAddress() + "'" + "," + "'" + information.getBusiness() + "'" + "," + "'" +
@@ -200,11 +197,7 @@
"'" + information.getContacts() + "'" + "," + "'" + information.getContactscell() + "'" + ");" +
"insert into blade_dept(id,parent_id,tenant_id,dept_name,ancestors,dept_category) values(" + "'" + information.getDepartmentid() + "'" + "," + "'" + dept.getParentId() + "'" + ","
+ "'" + dept.getTenantId() + "'" + "," + "'" + information.getEnterprisename() + "'" + "," + "'" + dept.getAncestors() + "'" + "," + "'" + dept.getDeptCategory() + "'" + ")";
- Object o = s;
- String json = JSON.toJSONString(o);
- OutJson.createJsonFile(json, "d:/", "nsql");
- FileInputStream in = new FileInputStream(new File("D:\\" + fileName));
- FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", "/", fileName, in);
+ FtpUtil.sqlFileUpload(s);
return R.success("成功");
}
@@ -215,7 +208,6 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入information")
public R update(@Valid @RequestBody Information information) throws Exception {
- //arg.test01(arg.url + "/information/update", information);
return R.status(informationService.updateById(information));
}
@@ -243,13 +235,11 @@
informationService.deleteIn(strArray[i]);
informationService.deleteSh(strArray[i]);
informationService.deleteMe(strArray[i]);
- //arg.sendPostRemoveByIds(arg.url + "/information/remove", strArray[i]);
}
for (int j = 0; j < strArrays.length; j++) {
//机构删除
informationService.deleteDept(strArrays[j]);
- //arg.sendPostRemoveByIds(arg.url + "/information/deleteDept", strArrays[j]);
}
return R.success("删除成功");
@@ -323,68 +313,6 @@
ExcelUtil.save(file, inforImporter, InforExcel.class);
return R.success("操作成功");
}
-
-// public static void main(String[] args) {
-// Information information = new Information();
-// information.setAddress("2");
-// information.setDepartmentid("123");
-// String json=JSON.toJSONString(information);//关键
-// com.util.OutJson.createJsonFile(json,"d:/anbao/information/","informationSave");
-// System.out.println("生成文件完成！");
-// }
-
-
-// @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 + "'" + ")";
-// Object o = s;
-// String json = JSON.toJSONString(o);
-// OutJson.createJsonFile(json, "d:/", "nsql");
-// 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 = "anbao/sql.json";
-// //本地路径
-// String localPath = "D:\\anbao";
-// //文件名
-// String fileName = "sql.json";
-//// FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
-// String s = OutJson.TestJson();
-// String sql = OutJson.stringReplace(s);
-// System.out.println(sql);
-// //boolean ftpFileExist = FtpUtil.isFTPFileExist(ftpPath, ftpUserName, ftpPassword, ftpHost, ftpPort);
-// //System.out.println(ftpFileExist);
-// }
}
--
Gitblit v1.9.3