From 38d775fa2ccd433c727a5b7cec8bed02493df1ec Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Thu, 18 Aug 2022 09:00:40 +0800
Subject: [PATCH] mq 相关配置去除，启动配置修改
---
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 246 ++++++++++++++++++++++++------------------------
1 files changed, 123 insertions(+), 123 deletions(-)
diff --git a/src/main/java/org/springblade/modules/permit/controller/PermitController.java b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
index f2bc47a..75c7343 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -66,6 +66,7 @@
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
import sun.net.www.http.HttpClient;
@@ -100,6 +101,7 @@
private final IInformationService informationService;
private final IUserService userService;
private final IAttachService attachService;
+ private final MyAsyncService myAsyncService;
/**
* 详情
@@ -156,7 +158,7 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入permit")
- public R save(@Valid @RequestBody Permit permit){
+ public R save(@Valid @RequestBody Permit permit) {
String cardid = permit.getCardid();
String type = permit.getPtype();
Map map = permitService.selectIn(cardid, type);
@@ -183,7 +185,8 @@
"'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'"
+ permit.getContactscell() + "'" + "," + "'" + permit.getJurisdiction() + "'" +
"," + "'" + permit.getCardid() + "'" + "," + "'" + overtime + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
return R.success("许可提交成功");
}
@@ -191,7 +194,7 @@
* 新增
*/
@PostMapping("/saves")
- public R saves(@Valid @RequestBody Permit permit, HttpServletRequest request){
+ public R saves(@Valid @RequestBody Permit permit, HttpServletRequest request) {
String fieldNames = request.getHeader("_fieldNames");
String cardid = permit.getCardid();
String type = permit.getPtype();
@@ -203,23 +206,25 @@
permit.setType("2");
permit.setStorage("1");
permit.setPermitime(new Date());
- permitService.save(permit);
+ boolean save = permitService.save(permit);
//String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getPermitime());
String overtime = new SimpleDateFormat("yyyy-MM-dd").format(permit.getOvertime());
- String s = "insert into sys_permit(id,creditCode,enterpriseName,representative," +
- "registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
- "address,business,region,registration,industry,type,deptid,ptype,representativecell,contacts,contactscell,jurisdiction,cardid,overtime)" +
- "values(" + "'" + permit.getId() + "'" + "," + "'" + permit.getCreditcode() + "'" + "," + "'" + permit.getEnterprisename() + "'" + "," + "'"
- + permit.getRepresentative() + "'" + "," + "'" + permit.getRegisteredcapital() + "'" + "," + "'"
- + permit.getOrganizationcode() + "'" + "," + "'" + permit.getRegistrationnumber() + "'" + "," +
- "'" + permit.getIdentificationnumber() + "'" + "," + "'" + permit.getEnterprises() + "'" + "," + "'" +
- permit.getAddress() + "'" + "," + "'" + permit.getBusiness() + "'" + "," + "'" +
- permit.getRegion() + "'" + "," + "'" + permit.getRegistration() + "'" + "," + "'" + permit.getIndustry() + "'" + "," + "'"
- + permit.getType() + "'" + "," + "'" + permit.getDeptid() + "'" + "," + "'" + permit.getPtype() + "'" + "," +
- "'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'"
- + permit.getContactscell() + "'" + "," + "'" + permit.getJurisdiction() + "'" +
- "," + "'" + permit.getCardid() + "'" + "," + "'" + overtime + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ if (save) {
+ String s = "insert into sys_permit(id,creditCode,enterpriseName,representative," +
+ "registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
+ "address,business,region,registration,industry,type,deptid,ptype,representativecell,contacts,contactscell,jurisdiction,cardid,overtime)" +
+ "values(" + "'" + permit.getId() + "'" + "," + "'" + permit.getCreditcode() + "'" + "," + "'" + permit.getEnterprisename() + "'" + "," + "'"
+ + permit.getRepresentative() + "'" + "," + "'" + permit.getRegisteredcapital() + "'" + "," + "'"
+ + permit.getOrganizationcode() + "'" + "," + "'" + permit.getRegistrationnumber() + "'" + "," +
+ "'" + permit.getIdentificationnumber() + "'" + "," + "'" + permit.getEnterprises() + "'" + "," + "'" +
+ permit.getAddress() + "'" + "," + "'" + permit.getBusiness() + "'" + "," + "'" +
+ permit.getRegion() + "'" + "," + "'" + permit.getRegistration() + "'" + "," + "'" + permit.getIndustry() + "'" + "," + "'"
+ + permit.getType() + "'" + "," + "'" + permit.getDeptid() + "'" + "," + "'" + permit.getPtype() + "'" + "," +
+ "'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'"
+ + permit.getContactscell() + "'" + "," + "'" + permit.getJurisdiction() + "'" +
+ "," + "'" + permit.getCardid() + "'" + "," + "'" + overtime + "'" + ")";
+ myAsyncService.FTP(s);
+ }
//返回
return R.data(permit);
}
@@ -323,116 +328,109 @@
user.setRoleId("1414575196264300546");
user.setStatus(1);
user.setIsDeleted(0);
- userService.save(user);
- String roleid = "1415563428727328770";
- String s = "insert into sys_information(id,creditCode,enterpriseName,representative" +
- ",registeredCapital,organizationCode,registrationNumber, enterprises, address," +
- " business,region,registration,industry,departmentid,stats,jurisdiction,representativecell," +
- "contacts,contactscell,create_user_id) " +
- "values(" + "'" + information.getId() + "'" +
- "," + "'" + information.getCreditcode() + "'" +
- "," + "'" + information.getEnterprisename() + "'" +
- "," + "'" + information.getRepresentative() + "'" +
- "," + "'" + 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() + "'" +
- "," + "'" + information.getCreateUserId() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
- String ss = "insert into blade_dept(id,parent_id,tenant_id,dept_name,ancestors,dept_category,is_deleted) values(" + "'" + dept.getId() + "'" + "," + "'" + dept.getParentId() + "'" + ","
- + "'" + dept.getTenantId() + "'" +
- "," + "'" + information.getEnterprisename() + "'" +
- "," + "'" + dept.getAncestors() + "'" +
- "," + "'" + dept.getDeptCategory() + "'" +
- "," + "'" + isDeleted + "'" + ")";
- FtpUtil.sqlFileUpload(ss);
- String rtime;
- String paperTime;
- if (user.getRtime() == null) {
- rtime = null;
- } else {
- rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
- }
- //发证日期处理
- if (user.getPaperTime() == null) {
- paperTime = "";
- } else {
- paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
- }
- //头像
- if (null != user.getAvatar() && !user.getAvatar().equals("")) {
- user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
- }
+ boolean save = userService.save(user);
+ if (save) {
+ String roleid = "1415563428727328770";
+ String s = "insert into sys_information(id,creditCode,enterpriseName,representative" +
+ ",registeredCapital,organizationCode,registrationNumber, enterprises, address," +
+ " business,region,registration,industry,departmentid,stats,jurisdiction,representativecell," +
+ "contacts,contactscell,create_user_id) " +
+ "values(" + "'" + information.getId() + "'" +
+ "," + "'" + information.getCreditcode() + "'" +
+ "," + "'" + information.getEnterprisename() + "'" +
+ "," + "'" + information.getRepresentative() + "'" +
+ "," + "'" + 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() + "'" +
+ "," + "'" + information.getCreateUserId() + "'" + ")";
+ myAsyncService.FTP(s);
+ String ss = "insert into blade_dept(id,parent_id,tenant_id,dept_name,ancestors,dept_category,is_deleted) values(" + "'" + dept.getId() + "'" + "," + "'" + dept.getParentId() + "'" + ","
+ + "'" + dept.getTenantId() + "'" +
+ "," + "'" + information.getEnterprisename() + "'" +
+ "," + "'" + dept.getAncestors() + "'" +
+ "," + "'" + dept.getDeptCategory() + "'" +
+ "," + "'" + isDeleted + "'" + ")";
+ myAsyncService.FTP(ss);
+ String rtime;
+ String paperTime;
+ if (user.getRtime() == null) {
+ rtime = null;
+ } else {
+ rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
+ }
+ //发证日期处理
+ if (user.getPaperTime() == null) {
+ paperTime = "";
+ } else {
+ paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
+ }
+ //头像
+ if (null != user.getAvatar() && !user.getAvatar().equals("")) {
+ user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
+ }
- //指纹
- if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
- user.setFingerprint(FtpConfig.ip + user.getFingerprint().substring(26));
- }
+ //指纹
+ if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
+ user.setFingerprint(FtpConfig.ip + user.getFingerprint().substring(26));
+ }
- String sss = "insert into blade_user(" +
- "id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
- "role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
- "politicaloutlook,healstats,height,address,registered,rtime," +
- "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
- "values(" + "'" + user.getId() + "'" +
- "," + "'" + user.getTenantId() + "'" +
- "," + "'" + user.getAccount() + "'" +
- "," + "'" + user.getPassword() + "'" +
- "," + "'" + user.getName() + "'" +
- "," + "'" + user.getRealName() + "'" +
- "," + "'" + user.getAvatar() + "'" +
- "," + "'" + user.getEmail() + "'" +
- "," + "'" + user.getPhone() + "'" +
- "," + "'" + null + "'" +
- "," + "'" + roleid + "'" +
- "," + "'" + user.getDeptId() + "'" +
- "," + "'" + user.getCardid() + "'" +
- "," + "'" + user.getNativeplace() + "'" +
- "," + "'" + user.getNation() + "'" +
- "," + "'" + user.getFingerprint() + "'" +
- "," + "'" + user.getEducation() + "'" +
- "," + "'" + user.getPoliticaloutlook() + "'" +
- "," + "'" + user.getHealstats() + "'" +
- "," + "'" + user.getHeight() + "'" +
- "," + "'" + user.getAddress() + "'" +
- "," + "'" + user.getRegistered() + "'" +
- "," + "'" + rtime + "'" +
- "," + "'" + user.getSecuritynumber() + "'" +
- "," + "'" + user.getHold() + "'" +
- "," + "'" + user.getJurisdiction() + "'" +
- "," + "'" + user.getExaminationType() + "'" +
- "," + "'" + user.getStatus() + "'" +
- "," + "'" + user.getIsDeleted() + "'" +
- "," + "'" + user.getDispatch() + "'" + ")";
- FtpUtil.sqlFileUpload(sss);
-//// //注册用户
-//// User user = new User();
-//// user.setAccount(permit.getEnterprisename());
-//// String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
-//// user.setPassword(initPassword);
-//// user.setRoleId("1414575196264300546");
-//// user.setDeptId(information.getDepartmentid());
-//// userService.saveOrUpdate(user);
-// //把附件添加单位id
-// attachService.updat(information.getDepartmentid(), permit.getCardid());
- String s1 = "update sys_permit set type = " + "'" + 0 + "'" + ",approve = " + "'" + permit.getApprove() + "'" +
- " " + "where id = " + "'" + permit.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ String sss = "insert into blade_user(" +
+ "id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
+ "role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
+ "politicaloutlook,healstats,height,address,registered,rtime," +
+ "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
+ "values(" + "'" + user.getId() + "'" +
+ "," + "'" + user.getTenantId() + "'" +
+ "," + "'" + user.getAccount() + "'" +
+ "," + "'" + user.getPassword() + "'" +
+ "," + "'" + user.getName() + "'" +
+ "," + "'" + user.getRealName() + "'" +
+ "," + "'" + user.getAvatar() + "'" +
+ "," + "'" + user.getEmail() + "'" +
+ "," + "'" + user.getPhone() + "'" +
+ "," + "'" + null + "'" +
+ "," + "'" + roleid + "'" +
+ "," + "'" + user.getDeptId() + "'" +
+ "," + "'" + user.getCardid() + "'" +
+ "," + "'" + user.getNativeplace() + "'" +
+ "," + "'" + user.getNation() + "'" +
+ "," + "'" + user.getFingerprint() + "'" +
+ "," + "'" + user.getEducation() + "'" +
+ "," + "'" + user.getPoliticaloutlook() + "'" +
+ "," + "'" + user.getHealstats() + "'" +
+ "," + "'" + user.getHeight() + "'" +
+ "," + "'" + user.getAddress() + "'" +
+ "," + "'" + user.getRegistered() + "'" +
+ "," + "'" + rtime + "'" +
+ "," + "'" + user.getSecuritynumber() + "'" +
+ "," + "'" + user.getHold() + "'" +
+ "," + "'" + user.getJurisdiction() + "'" +
+ "," + "'" + user.getExaminationType() + "'" +
+ "," + "'" + user.getStatus() + "'" +
+ "," + "'" + user.getIsDeleted() + "'" +
+ "," + "'" + user.getDispatch() + "'" + ")";
+ myAsyncService.FTP(sss);
+ //把附件添加单位id
+ String s1 = "update sys_permit set type = " + "'" + 0 + "'" + ",approve = " + "'" + permit.getApprove() + "'" +
+ " " + "where id = " + "'" + permit.getId() + "'";
+ myAsyncService.FTP(s1);
+ }
} else {
String s1 = "update sys_permit set type = " + "'" + 1 + "'" + ",approve = " + "'" + permit.getApprove() + "'" +
" " + "where id = " + "'" + permit.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
return R.success("成功");
}
@@ -460,6 +458,7 @@
/**
* 保安公司/培训学校许可设立详情(基本信息和附件列表信息)
+ *
* @param record
* @return
*/
@@ -471,6 +470,7 @@
/**
* 许可备案集合信息
+ *
* @param record
* @return
*/
--
Gitblit v1.9.3