From 03b5cb36312b2cc4fadf5cc8b4a47b8616e464b6 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 27 Aug 2021 17:07:24 +0800
Subject: [PATCH] 1.心里咨询
---
src/main/java/org/springblade/modules/FTP/FtpUtil.java | 21 +++++++
src/main/java/org/springblade/modules/resource/mapper/AttachMapper.xml | 4 +
src/main/java/org/springblade/modules/resource/service/IAttachService.java | 2
src/main/java/org/springblade/modules/record/entity/Record.java | 2
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 26 ++++++++
src/main/java/org/springblade/modules/resource/service/impl/AttachServiceImpl.java | 5 +
src/main/java/org/springblade/modules/resource/mapper/AttachMapper.java | 1
src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml | 2
src/main/java/org/springblade/modules/record/controller/RecordController.java | 82 +++++++++++++++++++++++++++
9 files changed, 141 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/FtpUtil.java b/src/main/java/org/springblade/modules/FTP/FtpUtil.java
index 03c1f99..c5c19ea 100644
--- a/src/main/java/org/springblade/modules/FTP/FtpUtil.java
+++ b/src/main/java/org/springblade/modules/FTP/FtpUtil.java
@@ -1,5 +1,6 @@
package org.springblade.modules.FTP;
+import com.alibaba.fastjson.JSON;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.net.ftp.FTP;
@@ -8,6 +9,10 @@
import java.io.*;
import java.net.SocketException;
+import java.util.Date;
+
+import static org.springblade.common.constant.FtpConstant.*;
+import static org.springblade.common.constant.FtpConstant.ftpPath;
/**
* ftp工具类
@@ -282,5 +287,21 @@
}
}
}
+ /**
+ * 执行sql 上传
+ * @param s1 sql
+ */
+ public static void sqlFileUpload(String s1){
+ String json1 = JSON.toJSONString(s1);
+ String response1 = String.valueOf((new Date()).getTime());
+ OutJson.createJsonFile(json1, localPath, "n"+response1);
+ FileInputStream in1 = null;
+ try {
+ in1 = new FileInputStream(new File(localPath + "n"+response1+".json"));
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
+ FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", "n"+response1+".json", in1);
+ }
}
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 0d0b361..1ab162a 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -33,12 +33,14 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.DigestUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.FTP.FtpUtil;
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.punish.entity.Punish;
+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;
@@ -47,6 +49,7 @@
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;
@@ -69,6 +72,7 @@
private final IDeptService iDeptService;
private final IInformationService informationService;
private final IUserService userService;
+ private final IAttachService attachService;
/**
* 详情
*/
@@ -142,8 +146,16 @@
information.setContacts(permit.getContacts());
information.setContactscell(permit.getContactscell());
Dept dept = new Dept();
- Long i = 1413470343230877697L;
- dept.setParentId(i);
+ //本市公司
+ if (permit.getPtype().equals("0")){
+ Long i = 1413470343230877697L;
+ dept.setParentId(i);
+ }
+ //培训公司
+ else {
+ Long i = 1418458374477549569L;
+ dept.setParentId(i);
+ }
dept.setTenantId("000000");
dept.setDeptName(information.getEnterprisename());
dept.setAncestors("0,1413470343230877697");
@@ -163,6 +175,16 @@
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));
}
diff --git a/src/main/java/org/springblade/modules/record/controller/RecordController.java b/src/main/java/org/springblade/modules/record/controller/RecordController.java
index 79b7ee3..34b61c5 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -22,20 +22,35 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+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.tool.api.R;
+import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.permit.entity.Permit;
+import org.springblade.modules.FTP.FtpUtil;
+import org.springblade.modules.information.entity.Information;
+import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.record.entity.Record;
import org.springblade.modules.record.service.IRecordService;
import org.springblade.modules.record.vo.RecordVO;
+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 springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
import java.util.Map;
+
+import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
+import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
/**
* 控制器
@@ -50,6 +65,10 @@
public class RecordController extends BladeController {
private final IRecordService recordService;
+ private final IDeptService iDeptService;
+ private final IInformationService informationService;
+ private final IUserService userService;
+ private final IAttachService attachService;
/**
* 详情
@@ -102,6 +121,67 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入record")
public R update(@Valid @RequestBody Record record) {
+ //审核通过
+ if (record.getType().equals("0")) {
+ //新增组织机构和单位信息
+ Information information =new Information();
+ information.setCreditcode(record.getCreditcode());
+ information.setEnterprisename(record.getEnterprisename());
+ information.setRepresentative(record.getRepresentative());
+ information.setEstablishtime(record.getEstablishtime());
+ information.setRegisteredcapital(record.getRegisteredcapital());
+ information.setOrganizationcode(record.getOrganizationcode());
+ information.setRegistrationnumber(record.getRegistrationnumber());
+ information.setEnterprises(record.getEnterprises());
+ information.setAddress(record.getAddress());
+ information.setBusiness(record.getBusiness());
+ information.setRegion(record.getRegion());
+ information.setRegistration(record.getRegistration());
+ information.setIndustry(record.getIndustry());
+ information.setRepresentativecell(record.getRepresentativecell());
+ information.setContacts(record.getContacts());
+ information.setContactscell(record.getContactscell());
+ Dept dept = new Dept();
+ //本市公司
+ if (record.getPtype().equals("2")){
+ Long i = 1425366663452196865L;
+ dept.setParentId(i);
+ }
+ //培训公司
+ else {
+ Long i = 1420222768149966850L;
+ dept.setParentId(i);
+ }
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setAncestors("0,1413470343230877697");
+ 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(record.getEnterprisename());
+ String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
+ user.setPassword(initPassword);
+ userService.saveOrUpdate(user);
+ //把附件添加单位id
+ attachService.updat(information.getDepartmentid(),record.getCardid());
+ String s1 = "update sys_permit set type = " + "'" + 0 + "'" +",approve = " + "'" + record.getApprove() + "'"+
+ " " +"where id = " + "'" + record.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ }
+ else {
+ String s1 = "update sys_permit set type = " + "'" + 1 + "'" +",approve = " + "'" + record.getApprove() + "'"+
+ " " +"where id = " + "'" + record.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ }
return R.status(recordService.updateById(record));
}
diff --git a/src/main/java/org/springblade/modules/record/entity/Record.java b/src/main/java/org/springblade/modules/record/entity/Record.java
index 8d948bb..7d24cad 100644
--- a/src/main/java/org/springblade/modules/record/entity/Record.java
+++ b/src/main/java/org/springblade/modules/record/entity/Record.java
@@ -152,7 +152,9 @@
private String contacts;
private String contactscell;
private String approve;
+ private String cardid;
private String jurisdiction;
+ private String ptype;
@ApiModelProperty(value = "提交时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
index 4665b0a..e84ca89 100644
--- a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
+++ b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
@@ -29,6 +29,8 @@
<result column="contactscell" property="contactscell"/>
<result column="approve" property="approve"/>
<result column="jurisdiction" property="jurisdiction"/>
+ <result column="cardid" property="cardid"/>
+ <result column="ptype" property="ptype"/>
</resultMap>
diff --git a/src/main/java/org/springblade/modules/resource/mapper/AttachMapper.java b/src/main/java/org/springblade/modules/resource/mapper/AttachMapper.java
index 7f5bf02..066c2d0 100644
--- a/src/main/java/org/springblade/modules/resource/mapper/AttachMapper.java
+++ b/src/main/java/org/springblade/modules/resource/mapper/AttachMapper.java
@@ -37,5 +37,6 @@
* @return
*/
List<AttachVO> selectAttachPage(IPage page, AttachVO attach);
+ void updat(String deptid,String cardid);
}
diff --git a/src/main/java/org/springblade/modules/resource/mapper/AttachMapper.xml b/src/main/java/org/springblade/modules/resource/mapper/AttachMapper.xml
index 67e34f7..c5e16b5 100644
--- a/src/main/java/org/springblade/modules/resource/mapper/AttachMapper.xml
+++ b/src/main/java/org/springblade/modules/resource/mapper/AttachMapper.xml
@@ -25,4 +25,8 @@
select * from blade_attach where is_deleted = 0
</select>
+ <update id="updat">
+ update blade_attach set deptid=#{deptid} where cardid=#{cardid}
+ </update>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/resource/service/IAttachService.java b/src/main/java/org/springblade/modules/resource/service/IAttachService.java
index 347442d..bee2d46 100644
--- a/src/main/java/org/springblade/modules/resource/service/IAttachService.java
+++ b/src/main/java/org/springblade/modules/resource/service/IAttachService.java
@@ -36,5 +36,5 @@
* @return
*/
IPage<AttachVO> selectAttachPage(IPage<AttachVO> page, AttachVO attach);
-
+ void updat(String deptid,String cardid);
}
diff --git a/src/main/java/org/springblade/modules/resource/service/impl/AttachServiceImpl.java b/src/main/java/org/springblade/modules/resource/service/impl/AttachServiceImpl.java
index 46bd0ce..6663541 100644
--- a/src/main/java/org/springblade/modules/resource/service/impl/AttachServiceImpl.java
+++ b/src/main/java/org/springblade/modules/resource/service/impl/AttachServiceImpl.java
@@ -37,4 +37,9 @@
return page.setRecords(baseMapper.selectAttachPage(page, attach));
}
+ @Override
+ public void updat(String deptid, String cardid) {
+ baseMapper.updat(deptid, cardid);
+ }
+
}
--
Gitblit v1.9.3