From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改，保安证编码生成修改
---
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 107 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 90 insertions(+), 17 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 e895d74..2ceed39 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -36,18 +36,30 @@
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
import org.json.JSONObject;
+import org.springblade.common.cache.DictCache;
+import org.springblade.common.cache.ParamCache;
+import org.springblade.common.enums.DictEnum;
import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.FTP.OutJson;
+import org.springblade.modules.information.entity.Information;
+import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.permit.entity.Permit;
import org.springblade.modules.permit.service.IPermitService;
import org.springblade.modules.permit.vo.PermitVO;
+import org.springblade.modules.resource.service.IAttachService;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IDeptService;
+import org.springblade.modules.system.service.IUserService;
import org.springframework.web.bind.annotation.*;
import sun.net.www.http.HttpClient;
@@ -62,6 +74,9 @@
import java.util.List;
import java.util.Map;
+import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
+import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
+
/**
* 控制器
*
@@ -73,22 +88,11 @@
@RequestMapping("/permit")
@Api(value = "", tags = "接口")
public class PermitController 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";
- //ftp服务器路径
- private static String ftpPath = "";
- //本地路径
- private static String localPath = "D:\\anbao";
- //文件名
- private static String fileName = "sql.json";
-
private final IPermitService permitService;
+ private final IDeptService iDeptService;
+ private final IInformationService informationService;
+ private final IUserService userService;
+ private final IAttachService attachService;
/**
* 详情
@@ -146,7 +150,7 @@
String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getPermitime());
String s = "insert into sys_permit(id,creditCode,enterpriseName,representative,establishTime," +
"registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
- "address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,jurisdiction)" +
+ "address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,jurisdiction,cardid)" +
"values(" + "'" + permit.getId() + "'" + "," + "'" + permit.getCreditcode() + "'" + "," + "'" + permit.getEnterprisename() + "'" + "," + "'"
+ permit.getRepresentative() + "'" + "," +
"'" + formatStr + "'" + "," + "'" + permit.getRegisteredcapital() + "'" + "," + "'"
@@ -156,7 +160,9 @@
permit.getRegion() + "'" + "," + "'" + permit.getRegistration() + "'" + "," + "'" + permit.getIndustry()+ "'" + "," + "'"
+ permit.getType() + "'" + "," +
"'" + pertime + "'" + "," + "'" + permit.getDeptid() + "'" + "," + "'" + permit.getPtype() + "'" + "," +
- "'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'" + permit.getContactscell() + "'"+"," + "'" + permit.getJurisdiction() + "'"+")" ;
+ "'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'"
+ + permit.getContactscell() + "'"+"," + "'" + permit.getJurisdiction() + "'"+
+ "," + "'" + permit.getCardid() + "'"+")" ;
FtpUtil.sqlFileUpload(s);
return R.success("新增成功");
}
@@ -195,6 +201,73 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入permit")
public R update(@Valid @RequestBody Permit permit) {
+ //审核通过
+ if (permit.getType().equals("0")) {
+ //新增组织机构和单位信息
+ Information information =new Information();
+ information.setCreditcode(permit.getCreditcode());
+ information.setEnterprisename(permit.getEnterprisename());
+ information.setRepresentative(permit.getRepresentative());
+ information.setEstablishtime(permit.getEstablishtime());
+ information.setRegisteredcapital(permit.getRegisteredcapital());
+ information.setOrganizationcode(permit.getOrganizationcode());
+ information.setRegistrationnumber(permit.getRegistrationnumber());
+ information.setEnterprises(permit.getEnterprises());
+ information.setAddress(permit.getAddress());
+ information.setBusiness(permit.getBusiness());
+ information.setRegion(permit.getRegion());
+ information.setRegistration(permit.getRegistration());
+ information.setIndustry(permit.getIndustry());
+ information.setRepresentativecell(permit.getRepresentativecell());
+ information.setContacts(permit.getContacts());
+ information.setContactscell(permit.getContactscell());
+ Dept dept = new Dept();
+ //本市公司
+ if (permit.getPtype().equals("0")){
+ Long i = 1413470343230877697L;
+ dept.setParentId(i);
+ dept.setAncestors("0,1413470343230877697");
+ }
+ //培训公司
+ else if (permit.getPtype().equals("1")){
+ Long i = 1418458374477549569L;
+ dept.setParentId(i);
+ dept.setAncestors("0,1418458374477549569");
+ }
+ else{
+ Long i = 1420222961377357825L;
+ dept.setParentId(i);
+ dept.setAncestors("0,1420222961377357825");
+ }
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setDeptCategory(1);
+ if (iDeptService.submit(dept)) {
+ CacheUtil.clear(SYS_CACHE);
+ // 返回懒加载树更新节点所需字段
+ Kv kv = Kv.create().set("id", String.valueOf(dept.getId())).set("tenantId", dept.getTenantId())
+ .set("deptCategoryName", DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory()));
+ String id = kv.get("id").toString();
+ information.setDepartmentid(id);
+ }
+ informationService.save(information);
+ //注册用户
+ User user = new User();
+ user.setAccount(permit.getEnterprisename());
+ String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
+ user.setPassword(initPassword);
+ 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);
+ }
+ else {
+ String s1 = "update sys_permit set type = " + "'" + 1 + "'" +",approve = " + "'" + permit.getApprove() + "'"+
+ " " +"where id = " + "'" + permit.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ }
return R.status(permitService.updateById(permit));
}
--
Gitblit v1.9.3