From bf93d530532a5910dae6676d23e13aed607baef9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 23 Aug 2021 08:40:26 +0800
Subject: [PATCH] 数据同步修改
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 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 bde8cda..178163a 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -105,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);
}
@@ -182,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() + "'" + "," + "'" +
@@ -197,13 +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);
- //转换提日期输出格式
- String response = String.valueOf((new Date()).getTime());
- OutJson.createJsonFile(json, "d:/", "w"+response);
- FileInputStream in = new FileInputStream(new File("D:\\" + "w"+response+".json"));
- FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", "/", "w"+response+".json", in);
+ FtpUtil.sqlFileUpload(s);
return R.success("成功");
}
@@ -214,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));
}
--
Gitblit v1.9.3