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 | 361 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 296 insertions(+), 65 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 b611221..75c7343 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -36,21 +36,41 @@
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.config.FtpConfig;
+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.DigestUtil;
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.dto.PermitDTO;
+import org.springblade.modules.permit.dto.PermitRecordDTO;
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.record.dto.RecordDTO;
+import org.springblade.modules.recordLegalperson.dto.RecordLegalpersonDTO;
+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.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
import sun.net.www.http.HttpClient;
+import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.io.*;
import java.net.HttpURLConnection;
@@ -61,6 +81,9 @@
import java.util.Date;
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 +96,12 @@
@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;
+ private final MyAsyncService myAsyncService;
/**
* 详情
@@ -120,7 +133,22 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入permit")
public R<IPage<PermitVO>> page(PermitVO permit, Query query) {
- IPage<PermitVO> pages = permitService.selectPermitPage(Condition.getPage(query), permit);
+ IPage<PermitVO> pages;
+ pages = permitService.selectPermitPage(Condition.getPage(query), permit, permit.getJurisdiction());
+// if (permit.getUsetype().equals("0")) {
+// pages = permitService.selectPermitPage(Condition.getPage(query), permit, null);
+// } else if (permit.getUsetype().equals("1")) {
+// String childer = informationService.selJurchilder(permit.getJurisdiction());
+// String[] split = childer.split(",");
+// String strArrays = "";
+// for (int j = 0; j < split.length; j++) {
+// strArrays += "'" + split[j] + "',";
+// }
+// String jurisdiction = strArrays.substring(0, strArrays.length() - 1);
+// pages = permitService.selectPermitPage(Condition.getPage(query), permit, jurisdiction);
+// } else {
+// pages = permitService.selectPermitPage(Condition.getPage(query), permit, null);
+// }
return R.data(pages);
}
@@ -130,9 +158,10 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入permit")
- public R save(@Valid @RequestBody Permit permit) throws FileNotFoundException {
+ public R save(@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) {
String id = map.get("id").toString();
permitService.removeByIds(Func.toLongList(id));
@@ -141,22 +170,63 @@
permit.setStorage("1");
permit.setPermitime(new Date());
permitService.save(permit);
- String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getEstablishtime());
- String s = "insert into sys_permit(id,creditCode,enterpriseName,representative,establishTime," +
+ //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,permitime,deptid,ptype,representativecell,contacts,contactscell)" +
+ "address,business,region,registration,industry,type,deptid,ptype,representativecell,contacts,contactscell,jurisdiction,cardid,overtime)" +
"values(" + "'" + permit.getId() + "'" + "," + "'" + permit.getCreditcode() + "'" + "," + "'" + permit.getEnterprisename() + "'" + "," + "'"
- + permit.getRepresentative() + "'" + "," +
- "'" + formatStr + "'" + "," + "'" + permit.getRegisteredcapital() + "'" + "," + "'"
+ + 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.getPermitime() + "'" + "," + "'" + permit.getDeptid() + "'" + "," + "'" + permit.getPtype() + "'" + "," +
- "'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'" + permit.getContactscell() + "'"+")" ;
- FtpUtil.sqlFileUpload(s);
- return R.success("新增成功");
+ 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);
+ myAsyncService.FTP(s);
+ return R.success("许可提交成功");
+ }
+
+ /**
+ * 新增
+ */
+ @PostMapping("/saves")
+ public R saves(@Valid @RequestBody Permit permit, HttpServletRequest request) {
+ String fieldNames = request.getHeader("_fieldNames");
+ String cardid = permit.getCardid();
+ String type = permit.getPtype();
+ Map map = permitService.selectIn(cardid, type);
+ if (map != null) {
+ String id = map.get("id").toString();
+ permitService.removeByIds(Func.toLongList(id));
+ }
+ permit.setType("2");
+ permit.setStorage("1");
+ permit.setPermitime(new Date());
+ 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());
+ 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);
}
/**
@@ -166,38 +236,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());
@@ -208,8 +251,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);
}
@@ -220,7 +263,176 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入permit")
public R update(@Valid @RequestBody Permit permit) {
- return R.status(permitService.updateById(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.setJurisdiction(permit.getJurisdiction());
+ information.setContactscell(permit.getContactscell());
+ Dept dept = new Dept();
+ boolean b = permitService.updateById(permit);
+ //本市公司
+ 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);
+ Integer isDeleted = 0;
+ //注册用户
+ User user = new User();
+ user.setDeptId(information.getDepartmentid());
+ user.setTenantId("000000");
+ user.setAccount(permit.getEnterprisename());
+ String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
+ user.setPassword(DigestUtil.encrypt(initPassword));
+ //user.setPassword(initPassword);
+ user.setCreateTime(new Date());
+ user.setUpdateTime(new Date());
+ user.setRoleId("1414575196264300546");
+ user.setStatus(1);
+ user.setIsDeleted(0);
+ 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));
+ }
+
+ 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() + "'";
+ myAsyncService.FTP(s1);
+ }
+ return R.success("成功");
}
/**
@@ -244,9 +456,28 @@
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);
+ /**
+ * 保安公司/培训学校许可设立详情(基本信息和附件列表信息)
+ *
+ * @param record
+ * @return
+ */
+ @GetMapping("/details")
+ public R details(PermitDTO record) {
+ PermitDTO detail = permitService.getDetails(record);
+ return R.data(detail);
+ }
+
+ /**
+ * 许可备案集合信息
+ *
+ * @param record
+ * @return
+ */
+ @GetMapping("/permitRecordList")
+ public R permitRecordList(PermitDTO record) {
+ List<PermitRecordDTO> permitRecordList = permitService.permitRecordList(record);
+ //返回
+ return R.data(permitRecordList);
}
}
--
Gitblit v1.9.3