From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 212 ++++++++++++++++++++++++++++------------------------
1 files changed, 114 insertions(+), 98 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..cce5bc6 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -23,6 +23,7 @@
import lombok.AllArgsConstructor;
import com.alibaba.fastjson.JSON;
import org.springblade.common.cache.DictCache;
+import org.springblade.common.constant.FtpConstant;
import org.springblade.common.enums.DictEnum;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
@@ -45,6 +46,7 @@
import javax.validation.Valid;
import java.io.*;
+import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -63,19 +65,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 +106,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);
}
@@ -121,6 +119,15 @@
public R<IPage<InformationVO>> securityPage(InformationVO information, Query query) {
IPage<InformationVO> pages = informationService.securityPage(Condition.getPage(query), information);
return R.data(pages);
+ }
+
+ /**
+ * 培训公司信息查询,下拉
+ */
+ @GetMapping("/train-unit-tree")
+ public List<InformationVO> trainUnitTree(InformationVO information) {
+ List<InformationVO> pages = informationService.trainUnitTree(information);
+ return pages;
}
@@ -185,26 +192,21 @@
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," +
+ "registeredcapital,organizationcode,registrationnumber, enterprises, address," +
" business,region,registration,industry,departmentid,stats,jurisdiction,representativecell,contacts,contactscell) " +
- "values(" + "'" + id + "'" + "," + "'" + information.getCreditcode() + "'" + "," + "'" + information.getEnterprisename() + "'" + "," + "'" + information.getRepresentative() + "'" + "," +
- "'" + formatStr + "'" + "," + "'" + information.getRegisteredcapital() + "'" + "," + "'" + information.getOrganizationcode() + "'" + "," + "'" + information.getRegistrationnumber() + "'" + "," +
- "'" + information.getIdentificationnumber() + "'" + "," + "'" + information.getEnterprises() + "'" + "," + "'" +
+ "values(" + "'" + information.getId() + "'" + "," + "'" + information.getCreditcode() + "'" + "," + "'" + information.getEnterprisename() + "'" + "," + "'" + information.getRepresentative() + "'" + "," +
+ "'" + formatStr + "'" + "," + "'" + information.getRegisteredcapital() + "'" + "," + "'" + information.getOrganizationcode() + "'" + "," + "'" + information.getRegistrationnumber() + "'" + "," + "'" + 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() + "'" + ")";
- 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,8 +217,42 @@
@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));
+ informationService.updateById(information);
+ String businessLicense=null;
+ String licence=null;
+ String format="";
+ if(information.getBusinessLicense()!=null && !"".equals(information.getBusinessLicense())){
+ businessLicense = information.getBusinessLicense().substring(26, information.getBusinessLicense().length());
+ }
+ if(information.getLicence()!=null && !"".equals(information.getLicence())){
+ licence = information.getLicence().substring(26, information.getLicence().length());
+ }
+ if (information.getEstablishtime()!=null && !"".equals(information.getEstablishtime())){
+ format = new SimpleDateFormat("yyyy-MM-dd").format(information.getEstablishtime());
+ }
+ //内网同步
+ String s1 = "update sys_information set creditCode = " + "'" + information.getCreditcode() + "'" +
+ ",enterpriseName = " + "'" + information.getEnterprisename() + "'" +
+ ",representative = " + "'" + information.getRepresentative() + "'" +
+ ",establishTime = " + "'" + format + "'" +
+ ",registeredCapital = " + "'" + information.getRegisteredcapital() + "'" +
+ ",jurisdiction = " + "'" + information.getJurisdiction() + "'" +
+ ",enterprises = " + "'" + information.getEnterprises() + "'" +
+ ",address = " + "'" + information.getAddress() + "'" +
+ ",business = " + "'" + information.getBusiness() + "'" +
+ ",region = " + "'" + information.getRegion() + "'" +
+ ",registration = " + "'" + information.getRegistration() + "'" +
+ ",industry = " + "'" + information.getIndustry() + "'" +
+ ",departmentid = " + "'" + information.getDepartmentid() + "'" +
+ ",stats = " + "'" + information.getStats() + "'" +
+ ",representativecell = " + "'" + information.getRepresentativecell() + "'" +
+ ",contacts = " + "'" + information.getContacts() + "'" +
+ ",contactscell = " + "'" + information.getContactscell() + "'" +
+ ",business_License = " + "'" + FtpConstant.ip + businessLicense + "'" +
+ ",licence = " + "'" + FtpConstant.ip + licence + "'" +
+ " " + "where id = " + "'" + information.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ return R.success("修改成功");
}
/**
@@ -243,13 +279,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("删除成功");
@@ -259,8 +293,8 @@
* 统计保安员资格异常的数量
*/
@PostMapping("/selectExtype")
- public R selectExtype(String deptid) {
- List<Map<Object, Object>> lists = informationService.selectExtype(deptid);
+ public R selectExtype(String deptid,String jurisdiction) {
+ List<Map<Object, Object>> lists = informationService.selectExtype(deptid,jurisdiction);
return R.data(lists);
}
@@ -268,8 +302,8 @@
* 统计保安员持证的数量
*/
@PostMapping("/selectHold")
- public R selectHold(String deptid) {
- List<Map<Object, Object>> lists = informationService.selectHold(deptid);
+ public R selectHold(String deptid,String jurisdiction) {
+ List<Map<Object, Object>> lists = informationService.selectHold(deptid,jurisdiction);
return R.data(lists);
}
@@ -286,8 +320,8 @@
* 保安派遣数量统计
*/
@PostMapping("/selectDisp")
- public R selectDisp(String deptid) {
- List<Map<Object, Object>> lists = informationService.selectDisp(deptid);
+ public R selectDisp(String deptid,String jurisdiction) {
+ List<Map<Object, Object>> lists = informationService.selectDisp(deptid,jurisdiction);
return R.data(lists);
}
@@ -295,8 +329,8 @@
* 社保统计
*/
@PostMapping("/selectSoil")
- public R selectSoil(String deptid) {
- List<Map<Object, Object>> lists = informationService.selectSoil(deptid);
+ public R selectSoil(String deptid,String jurisdiction) {
+ List<Map<Object, Object>> lists = informationService.selectSoil(deptid,jurisdiction);
List<Map<String, Object>> list = new ArrayList<>();
for (int i = 0; i < lists.size(); i++) {
Map<String, Object> map = new HashMap<String, Object>();
@@ -304,9 +338,9 @@
Integer a = Integer.valueOf(numj);
String numz = lists.get(i).get("numz").toString();
Integer b = Integer.valueOf(numz);
- Integer c = b - a;
+ //Integer c = b - a;
map.put("numj", a);
- map.put("nmuwj", c);
+ map.put("nmuwj", b);
list.add(map);
}
return R.data(list);
@@ -324,67 +358,49 @@
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);
-// }
-
+ /**
+ * 查询本年所有月份的客户数量
+ *
+ * @return
+ */
+ @PostMapping("/queryYearKh")
+ public List queryYearKh(String jurisdiction, String deptid) {
+ Calendar cal = Calendar.getInstance();
+ String year = String.valueOf(cal.get(Calendar.YEAR));
+ List list = informationService.queryYearKh(year, jurisdiction, deptid);
+ return list;
+ }
+ //升序
+ public static Map<String, String> sortMapBykeyAsc(Map<String, String> oriMap) {
+ Map<String, String> sortedMap = new LinkedHashMap<String, String>();
+ try {
+ if (oriMap != null && !oriMap.isEmpty()) {
+ List<Map.Entry<String, String>> entryList = new ArrayList<Map.Entry<String, String>>(oriMap.entrySet());
+ Collections.sort(entryList,
+ new Comparator<Map.Entry<String, String>>() {
+ public int compare(Map.Entry<String, String> entry2,
+ Map.Entry<String, String> entry1) {
+ int value2 = 0, value1 = 0;
+ try {
+ value2 = Integer.parseInt(entry1.getKey());
+ value1 = Integer.parseInt(entry2.getKey());
+ } catch (NumberFormatException e) {
+ value2 = 0;
+ value1 = 0;
+ }
+ return value1 - value2;
+ }
+ });
+ Iterator<Map.Entry<String, String>> iter = entryList.iterator();
+ Map.Entry<String, String> tmpEntry = null;
+ while (iter.hasNext()) {
+ tmpEntry = iter.next();
+ sortedMap.put(tmpEntry.getKey(), tmpEntry.getValue());
+ }
+ }
+ } catch (Exception e) {
+ }
+ return sortedMap;
+ }
}
--
Gitblit v1.9.3