From ebb5012dc221db17bfad74c3bdfd91d46aa29c03 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 04 Dec 2021 11:24:41 +0800
Subject: [PATCH] 1.许可
---
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 184 ++++++++++++++++++++++++++++-----------------
1 files changed, 115 insertions(+), 69 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 4b88363..f982f2b 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;
/**
* 详情
@@ -132,7 +136,8 @@
@ApiOperation(value = "新增", notes = "传入permit")
public R save(@Valid @RequestBody Permit permit) throws FileNotFoundException {
String cardid = permit.getCardid();
- Map map = permitService.selectIn(cardid);
+ String type = permit.getPtype();
+ Map map = permitService.selectIn(cardid, type);
if (map != null) {
String id = map.get("id").toString();
permitService.removeByIds(Func.toLongList(id));
@@ -141,22 +146,19 @@
permit.setStorage("1");
permit.setPermitime(new Date());
permitService.save(permit);
- String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getEstablishtime());
- 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)" +
- "values(" + "'" + permit.getId() + "'" + "," + "'" + permit.getCreditcode() + "'" + "," + "'" + permit.getEnterprisename() + "'" + "," + "'"
- + permit.getRepresentative() + "'" + "," +
- "'" + formatStr + "'" + "," + "'" + permit.getRegisteredcapital() + "'" + "," + "'"
- + permit.getOrganizationcode() + "'" + "," + "'" + permit.getRegistrationnumber() + "'" + "," +
- "'" + permit.getIdentificationnumber() + "'" + "," + "'" + permit.getEnterprises() + "'" + "," + "'" +
- permit.getAddress() + "'" + "," + "'" + permit.getBusiness() + "'" + "," + "'" +
- permit.getRegion() + "'" + "," + "'" + permit.getRegistration() + "'" + "," + "'" + permit.getIndustry()+ "'" + "," + "'"
- + permit.getType() + "'" + "," +
- "'" + pertime + "'" + "," + "'" + permit.getDeptid() + "'" + "," + "'" + permit.getPtype() + "'" + "," +
- "'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'" + permit.getContactscell() + "'"+")" ;
- FtpUtil.sqlFileUpload(s);
+// 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,enterpriseName,representative," +
+// "address,business,region,registration,industry,type,permitime,ptype,representativecell,contacts,contactscell,jurisdiction,cardid,overtime)" +
+// "values(" + "'" + permit.getId() + "'" + ","+ "'" + permit.getEnterprisename() + "'" + "," + "'"
+// + permit.getRepresentative() + "'" + "," + "'" +
+// permit.getAddress() + "'" + "," + "'" + permit.getBusiness() + "'" + "," + "'" +
+// permit.getRegion() + "'" + "," + "'" + permit.getRegistration() + "'" + "," + "'" + permit.getIndustry() + "'" + "," + "'"
+// + permit.getType() + "'" + "," + "'" + pertime + "'" + "," + "'" + permit.getPtype() + "'" + "," +
+// "'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'"
+// + permit.getContactscell() + "'" + "," + "'" + permit.getJurisdiction() + "'" +
+// "," + "'" + permit.getCardid() + "'"+ "," + "'" + overtime+ "'" + ")";
+// FtpUtil.sqlFileUpload(s);
return R.success("新增成功");
}
@@ -167,38 +169,11 @@
@ApiOperation(value = "新增", notes = "传入permit")
public R storage(@Valid @RequestBody Permit permit) {
String cardid = permit.getCardid();
- Map map = permitService.selectIn(cardid);
+ String type = permit.getPtype();
+ Map map = permitService.selectIn(cardid, type);
if (map != null) {
permit.setStorage("0");
permitService.updateById(permit);
-// String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getEstablishtime());
-// String s1 =
-// "update sys_permit set creditCode = " + "'" + permit.getCreditcode()+ "'"
-// + ",enterpriseName = " + "'" + permit.getEnterprisename()+"'"
-// + ",representative = " + "'" + permit.getRepresentative()+"'"
-// + ",establishTime = " + "'" + formatStr+"'"
-// + ",registeredCapital = " + "'" + permit.getRegisteredcapital()+"'"
-// + ",organizationCode = " + "'" + permit.getOrganizationcode()+"'"
-// + ",registrationNumber = " + "'" +permit.getRegistrationnumber()+"'"
-// + ",identificationNumber = " + "'" + permit.getIdentificationnumber()+"'"
-// + ",enterprises = " + "'" + permit.getEnterprises()+"'"
-// + ",address = " + "'" + permit.getAddress()+"'"
-// + ",business = " + "'" + permit.getBusiness()+"'"
-// + ",region = " + "'" + permit.getRegion()+"'"
-// + ",registration = " + "'" +permit.getRegistration()+"'"
-// + ",industry = " + "'" +permit.getIndustry()+"'"
-// + ",type = " + "'" +permit.getType()+"'"
-// + ",politicaloutlook = " + "'" +user.getPoliticaloutlook()+"'"
-// + ",healstats = " + "'" +user.getHealstats()+"'"
-// + ",height = " + "'" +user.getHeight()+"'"
-// + ",address = " + "'" +user.getAddress()+"'"
-// + ",registered = " + "'" +user.getRegistered()+"'"
-// + ",rtime = " + "'" +rtime+"'"
-// + ",securitynumber = " + "'" +user.getSecuritynumber()+"'"
-// + ",hold = " + "'" +user.getHold()+"'"
-// + ",jurisdiction = " + "'" +user.getJurisdiction()+"'"
-// + " " +"where id = " + "'" + user.getId() + "'";
-// FtpUtil.sqlFileUpload(s1);
} else {
permit.setStorage("0");
permit.setPermitime(new Date());
@@ -209,8 +184,8 @@
@PostMapping("/selectIn")
- public R selectIn(String cardid) {
- Map map = permitService.selectIn(cardid);
+ public R selectIn(String cardid, String type) {
+ Map map = permitService.selectIn(cardid, type);
return R.data(map);
}
@@ -221,6 +196,83 @@
@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 = " + "'" + permit.getType() + "'" +
+// ",papprove = " + "'" + permit.getPapprove() + "'"+
+// ",xapprove = " + "'" + permit.getXapprove() + "'"+
+// ",sapprove = " + "'" + permit.getSapprove() + "'"+
+// ",popinion = " + "'" + permit.getPopinion() + "'"+
+// ",sopinion = " + "'" + permit.getSopinion() + "'"+
+// ",xopinion = " + "'" + permit.getXopinion() + "'"+
+// " " +"where id = " + "'" + permit.getId() + "'";
+// FtpUtil.sqlFileUpload(s1);
+ } else {
+ String s1 = "update sys_permit set type = " + "'" + permit.getType() + "'" +
+ ",papprove = " + "'" + permit.getPapprove() + "'"+
+ ",xapprove = " + "'" + permit.getXapprove() + "'"+
+ ",sapprove = " + "'" + permit.getSapprove() + "'"+
+ ",popinion = " + "'" + permit.getPopinion() + "'"+
+ ",sopinion = " + "'" + permit.getSopinion() + "'"+
+ ",xopinion = " + "'" + permit.getXopinion() + "'"+
+ " " +"where id = " + "'" + permit.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ }
return R.status(permitService.updateById(permit));
}
@@ -243,11 +295,5 @@
@ApiOperation(value = "删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(permitService.removeByIds(Func.toLongList(ids)));
- }
-
- public static void main(String[] args) {
- String id = "1";
- String s = "delete from sys_permit where id=" + id + ";";
- System.out.println(s);
}
}
--
Gitblit v1.9.3