From 0d99d26f39e055ee17fdbf2c5cbd1daf695c4310 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 13 Sep 2021 21:28:42 +0800
Subject: [PATCH] 报名新增，报名查询，报名清册，培训报名，培训报名查询修改
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 244 +++++++++++++++++++++++++-----------------------
1 files changed, 128 insertions(+), 116 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..0a5f3ba 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,13 @@
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.constant.FtpConstant;
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 +32,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 +46,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 +64,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 +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);
}
@@ -110,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;
}
@@ -174,10 +192,22 @@
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, 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.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,8 +217,44 @@
@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() + "'" +
+ ",organizationcode = " + "'" + information.getOrganizationcode() + "'" +
+ ",registrationnumber = " + "'" + information.getRegistrationnumber() + "'" +
+ ",enterprises = " + "'" + information.getEnterprises() + "'" +
+ ",address = " + "'" + information.getAddress() + "'" +
+ ",business = " + "'" + information.getBusiness() + "'" +
+ ",region = " + "'" + information.getRegion() + "'" +
+ ",registration = " + "'" + information.getRegistration() + "'" +
+ ",industry = " + "'" + information.getIndustry() + "'" +
+ ",departmentid = " + "'" + information.getDepartmentid() + "'" +
+ ",stats = " + "'" + information.getStats() + "'" +
+ ",jurisdiction = " + "'" + information.getJurisdiction() + "'" +
+ ",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("修改成功");
}
/**
@@ -215,13 +281,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("删除成功");
@@ -231,8 +295,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);
}
@@ -240,8 +304,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);
}
@@ -258,8 +322,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);
}
@@ -267,8 +331,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>();
@@ -296,101 +360,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 + "'" + ")";
- 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);
+ /**
+ * 查询本年所有月份的客户数量
+ *
+ * @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 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();
+ //升序
+ 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 (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!");
+ } catch (Exception e) {
}
- return localStrBulider.toString();
+ return sortedMap;
}
-
-
}
--
Gitblit v1.9.3