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 | 146 +++++++++++-------------------------------------
1 files changed, 34 insertions(+), 112 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 a55c9ec..64c6ad6 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -18,15 +18,12 @@
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.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;
@@ -34,6 +31,8 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
+import org.springblade.modules.FTP.FtpUtil;
+import org.springblade.modules.FTP.OutJson;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.excel.InforExcel;
import org.springblade.modules.information.excel.InforImporter;
@@ -46,10 +45,9 @@
import javax.validation.Valid;
import java.io.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
@@ -65,6 +63,16 @@
@RequestMapping("/information")
@Api(value = "", tags = "接口")
public class InformationController extends BladeController {
+ //ftp服务器IP地址
+ private static String ftpHost = "192.168.0.105";
+ //ftp服务器端口
+ private static int ftpPort = 21;
+ //ftp服务器用户名
+ private static String ftpUserName = "yly";
+ //ftp服务器密码
+ private static String ftpPassword = "Yly@123";
+ //本地路径
+ private static String localPath = "D:\\anbao";
private final IInformationService informationService;
private final IDeptService iDeptService;
@@ -97,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);
}
@@ -174,10 +182,23 @@
String id = kv.get("id").toString();
information.setDepartmentid(id);
}
- //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));
+ informationService.save(information);
+ String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(information.getEstablishtime());
+ //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(" + "'" + information.getId() + "'" + "," + "'" + information.getCreditcode() + "'" + "," + "'" + information.getEnterprisename() + "'" + "," + "'" + information.getRepresentative() + "'" + "," +
+ "'" + formatStr + "'" + "," + "'" + information.getRegisteredcapital() + "'" + "," + "'" + information.getOrganizationcode() + "'" + "," + "'" + information.getRegistrationnumber() + "'" + "," +
+ "'" + information.getIdentificationnumber() + "'" + "," + "'" + information.getEnterprises() + "'" + "," + "'" +
+ information.getAddress() + "'" + "," + "'" + information.getBusiness() + "'" + "," + "'" +
+ information.getRegion() + "'" + "," + "'" + information.getRegistration() + "'" + "," + "'" + information.getIndustry() + "'" + "," + "'" + information.getDepartmentid() + "'" + "," +
+ "'" + information.getStats() + "'" + "," + "'" + information.getJurisdiction() + "'" + "," + "'" + information.getRepresentativecell() + "'" + "," +
+ "'" + 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() + "'" + ")";
+ FtpUtil.sqlFileUpload(s);
+ return R.success("成功");
}
/**
@@ -187,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));
}
@@ -215,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("删除成功");
@@ -295,102 +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 + "'" + ")";
- 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();
- }
-
}
--
Gitblit v1.9.3