From 3414e42ae766b0457a03fb97995abf07e2d074c2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 18 一月 2024 10:38:46 +0800
Subject: [PATCH] 调整
---
server/service/src/main/java/com/doumee/service/business/CompanyService.java | 11
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 507 +++++++++++++++++++++++++++++++++++
server/service/src/main/java/com/doumee/dao/business/model/Company.java | 33 ++
server/service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 51 +++
server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java | 6
server/company/src/main/java/com/doumee/api/business/CompanyController.java | 30 ++
server/service/src/main/java/com/doumee/dao/business/MultifileMapper.java | 5
server/platform/src/main/java/com/doumee/task/ScheduleTool.java | 25 +
server/service/src/main/java/com/doumee/service/business/SmsEmailService.java | 2
server/service/src/main/java/com/doumee/core/utils/Constants.java | 45 +-
server/service/src/main/java/com/doumee/service/business/third/SignService.java | 65 +++
server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java | 5
server/service/src/main/java/com/doumee/dao/business/join/CompanySolutionJoinMapper.java | 15 +
server/service/src/main/java/com/doumee/dao/business/model/Multifile.java | 4
14 files changed, 746 insertions(+), 58 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/CompanyController.java b/server/company/src/main/java/com/doumee/api/business/CompanyController.java
index 643b271..4089b44 100644
--- a/server/company/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/company/src/main/java/com/doumee/api/business/CompanyController.java
@@ -36,7 +36,9 @@
@PostMapping("/create")
@RequiresPermissions("business:company:create")
public ApiResponse create(@RequestBody Company company) {
- return ApiResponse.success(companyService.create(company));
+ companyService.create(company);
+ companyService.startSignAuth(company.getId());
+ return ApiResponse.success(null);
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@@ -65,6 +67,29 @@
@RequiresPermissions("business:company:update")
public ApiResponse updateById(@RequestBody Company company) {
companyService.updateById(company);
+ companyService.startSignAuth(company.getId());
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鏍规嵁ID绂佺敤鍚敤")
+ @PostMapping("/updateStatus")
+ @RequiresPermissions("business:company:update")
+ public ApiResponse updateStatus(@RequestBody Company company) {
+ companyService.updateStatus(company);
+ return ApiResponse.success(null);
+ }
+ @ApiOperation("浼佷笟鏇存崲鎵嬫満鍙�")
+ @PostMapping("/updatePhone")
+ @RequiresPermissions("business:company:update")
+ public ApiResponse updatePhone(@RequestBody Company company) {
+ companyService.updatePhone(company);
+ return ApiResponse.success(null);
+ }
+ @ApiOperation("鏍规嵁ID鐢靛瓙绛捐璇佷紒涓氫俊鎭�")
+ @PostMapping("/startSignAuth/{id}")
+ @RequiresPermissions("business:company:update")
+ public ApiResponse startSignAuth(@PathVariable Integer id) {
+ companyService.startSignAuth(id);
return ApiResponse.success(null);
}
@@ -93,7 +118,8 @@
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:company:query")
- public ApiResponse findById(@PathVariable Integer id) {
+ public ApiResponse<Company> findById(@PathVariable Integer id) {
+
return ApiResponse.success(companyService.findById(id));
}
}
diff --git a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
index 92e1799..401b57e 100644
--- a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -1,6 +1,8 @@
package com.doumee.task;
+import com.doumee.service.business.CompanyService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
@@ -14,16 +16,27 @@
*/
@Component
@EnableScheduling
+@Slf4j
public class ScheduleTool {
-
-
+ @Autowired
+ private CompanyService companyService;
/**
- * 瀹氭椂澶勭悊鐖櫕婧愭暟鎹紝鐢熸垚绱犳潗搴撴暟鎹�
* @throws Exception
*/
- @Scheduled(fixedDelay=30*60*1000,initialDelay = 30000)
- public void dealOploadEvent() throws Exception {
-
+ @Scheduled(fixedDelay= 60*1000,initialDelay = 30000)
+ public void dealComSignAuthStatus() throws Exception {
+ log.info("==============瀹氭椂鏌ヨ浼佷笟鐢靛瓙绛捐璇佺姸鎬�=======start======");
+ companyService.dealSignAuthStatus();
+ log.info("==============瀹氭椂鏌ヨ浼佷笟鐢靛瓙绛捐璇佺姸鎬�======end=======");
+ }
+ /**
+ * @throws Exception
+ */
+ @Scheduled(fixedDelay= 60*1000,initialDelay = 30000)
+ public void dealComSigIdStatus() throws Exception {
+ log.info("==============瀹氭椂涓婁紶寰呬笂浼犵殑浼佷笟鐢靛瓙鍗扮珷鏁版嵁=======start======");
+ companyService.dealSignIdStatus();
+ log.info("==============瀹氭椂涓婁紶寰呬笂浼犵殑浼佷笟鐢靛瓙鍗扮珷鏁版嵁======end=======");
}
}
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 84bc8b1..20c9d1b 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -63,6 +63,8 @@
public static final String SIGN_URL = "SIGN_URL";
public static final String SIGN_APPKEY = "SIGN_APPKEY";
public static final String SIGN_APPSECRET = "SIGN_APPSECRET";
+ public static final String COMPANY_FILE ="COMPANY_FILE" ;
+ public static final String SMS_COMNAME = "SMS_COMNAME";
/**
* 浼佷笟鏁版嵁鏉ユ簮 0骞冲彴娉ㄥ唽 1鍚庡彴瀵煎叆
@@ -71,7 +73,17 @@
public static final int platformRegister = 0;
public static final int backstageImport = 1;
}
+ public static String getRandom6Num( ) {
+ Random random = new Random();
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < 6; i++) {
+ int digit = random.nextInt(10);
+ sb.append(digit);
+ }
+
+ return sb.toString();
+ }
public static BigDecimal formatBigdecimal(BigDecimal d) {
if (d == null) {
d = new BigDecimal(0.0);
@@ -324,27 +336,22 @@
int basedata = 2;
}
/**
- * 鍏宠仈瀵硅薄绫诲瀷 0浼佷笟钀ヤ笟鎵х収 1宸ュ晢鍙樻洿鐧昏 2椤圭洰鐢虫姤浼佷笟璧勬枡 3浼佷笟璇勫垎琛� 4璇婃柇鎶ュ憡 5璇婃柇鏈嶅姟璧勬枡 6涓撳璇勫垎鎶ュ憡 7鏈嶅姟鏈烘瀯涓婁紶鏈嶅姟璧勬枡 8浼佷笟璧勮川 9浼佷笟涓爣閫氱煡涔� 10椤圭洰鍥剧墖
+ * 鍏宠仈瀵硅薄绫诲瀷
+ 鍏宠仈瀵硅薄绫诲瀷 0浼佷笟钀ヤ笟鎵х収 1鐞嗚禂鎶ユ浜嬫晠瑙嗛鎴栧浘鐗� 2鐞嗚禂鍛樺伐鍏崇郴璇佹槑鏉愭枡 3鐞嗚禂闂ㄨ瘖璧勬枡 4鐞嗚禂浣忛櫌璧勬枡 5鐞嗚禂浼ゆ畫璧勬枡 6鐞嗚禂璧斾粯缁撴鏉愭枡 7浼佷笟韬唤璇佸彿 8淇濆崟鐢宠琛≒DF 9绛剧讲鍚庝繚鍗曠敵璇疯〃PDF 10浼佷笟绛剧珷 11鏈�缁堟姤鍗�
*/
public enum MultiFile{
- BUSINESS_LICENSE(0, "浼佷笟钀ヤ笟鎵х収", "浼佷笟钀ヤ笟鎵х収"),
- BUSINESS_CHANGE(1, "宸ュ晢鍙樻洿鐧昏", "宸ュ晢鍙樻洿鐧昏"),
- BUSINESS_DECLARE(2, "椤圭洰鐢虫姤浼佷笟璧勬枡", "椤圭洰鐢虫姤浼佷笟璧勬枡"),
- BUSINESS_SCORE(3, "浼佷笟璇勫垎琛�", "浼佷笟璇勫垎琛�"),
- BUSINESS_DIAGNOSIS(4, "璇婃柇鎶ュ憡", "璇婃柇鎶ュ憡"),
- BUSINESS_DIA_SERVICE(5, "璇婃柇鏈嶅姟璧勬枡", "璇婃柇鏈嶅姟璧勬枡"),
- BUSINESS_EXPERT(6, "涓撳璇勫垎鎶ュ憡", "涓撳璇勫垎鎶ュ憡"),
- BUSINESS_UP_SERVICE(7, "鏈嶅姟鏈烘瀯涓婁紶鏈嶅姟璧勬枡", "鏈嶅姟鏈烘瀯涓婁紶鏈嶅姟璧勬枡"),
- BUSINESS_ZZ(8, "浼佷笟璧勮川", "浼佷笟璧勮川"),
- BUSINESS_NOTICE(9, "浼佷笟涓爣閫氱煡涔�", "浼佷笟涓爣閫氱煡涔�"),
- BUSINESS_PROURL(10, "椤圭洰鍥剧墖", "椤圭洰鍥剧墖"),
-
- COMPANY_CHANGE_LICENSE(11,"鍙樻洿浼佷笟钀ヤ笟鎵х収","鍙樻洿浼佷笟钀ヤ笟鎵х収"),
-
- COMPANY_CHANGE_CHANGE(12,"鍙樻洿宸ュ晢鍙樻洿鐧昏","鍙樻洿宸ュ晢鍙樻洿鐧昏"),
- BUSINESS_HC(13, "缁煎悎鏈嶅姟鍗曚綅鏍告煡璧勬枡", "缁煎悎鏈嶅姟鍗曚綅鏍告煡璧勬枡"),
-
- BUSINESS_UP_EXTRA(14, "鏈嶅姟鏈烘瀯涓婁紶鏈嶅姟琛ュ厖璧勬枡", "鏈嶅姟鏈烘瀯涓婁紶鏈嶅姟琛ュ厖璧勬枡"),
+ COM_BUSINESS_LICENSE(0, "浼佷笟钀ヤ笟鎵х収", "浼佷笟钀ヤ笟鎵х収"),
+ LP_SGXC_FILE(1, "鐞嗚禂鎶ユ浜嬫晠瑙嗛鎴栧浘鐗�", "鐞嗚禂鎶ユ浜嬫晠瑙嗛鎴栧浘鐗�"),
+ LP_YGGX_FILE(2, "鐞嗚禂鍛樺伐鍏崇郴璇佹槑鏉愭枡 ", "鐞嗚禂鍛樺伐鍏崇郴璇佹槑鏉愭枡 "),
+ LP_MZCL_FILE(3, "鐞嗚禂闂ㄨ瘖璧勬枡 ", "鐞嗚禂闂ㄨ瘖璧勬枡"),
+ LP_ZYCL_FILE(4, "鐞嗚禂浣忛櫌璧勬枡", "鐞嗚禂浣忛櫌璧勬枡"),
+ LP_SCZL_FILE(5, "鐞嗚禂浼ゆ畫璧勬枡", "鐞嗚禂浼ゆ畫璧勬枡"),
+ LP_JACL_FILE(6, "鐞嗚禂璧斾粯缁撴鏉愭枡", "鐞嗚禂璧斾粯缁撴鏉愭枡"),
+ COM_IDCARD_IMG(7, "浼佷笟韬唤璇佸彿", "浼佷笟韬唤璇佸彿"),
+ BD_APPLY_PDF(8, "淇濆崟鐢宠琛≒DF ", "淇濆崟鐢宠琛≒DF "),
+ BD_SIGNED_PDF(9, "绛剧讲鍚庝繚鍗曠敵璇疯〃PDF", "绛剧讲鍚庝繚鍗曠敵璇疯〃PDF"),
+ COM_SING_IMG(10, "浼佷笟鍗扮珷", "浼佷笟鍗扮珷"),
+ BD_DONE_PDF(10, "鏈�缁堟姤鍗�", "鏈�缁堟姤鍗�"),
;
diff --git a/server/service/src/main/java/com/doumee/dao/business/MultifileMapper.java b/server/service/src/main/java/com/doumee/dao/business/MultifileMapper.java
index 5cb5f87..9056c09 100644
--- a/server/service/src/main/java/com/doumee/dao/business/MultifileMapper.java
+++ b/server/service/src/main/java/com/doumee/dao/business/MultifileMapper.java
@@ -1,12 +1,15 @@
package com.doumee.dao.business;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.CompanyPermission;
import com.doumee.dao.business.model.Multifile;
+
+import java.util.List;
/**
* @author 姹熻箘韫�
* @date 2024/01/16 10:03
*/
public interface MultifileMapper extends BaseMapper<Multifile> {
-
+ void insertBatchSomeColumn(List<Multifile> list);
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/join/CompanySolutionJoinMapper.java b/server/service/src/main/java/com/doumee/dao/business/join/CompanySolutionJoinMapper.java
new file mode 100644
index 0000000..9fc7eba
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/join/CompanySolutionJoinMapper.java
@@ -0,0 +1,15 @@
+package com.doumee.dao.business.join;
+
+import com.doumee.dao.business.model.CompanySolution;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2024/01/16 10:03
+ */
+public interface CompanySolutionJoinMapper extends MPJJoinMapper<CompanySolution> {
+
+ void insertBatchSomeColumn(List<CompanySolution> solutionList);
+}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Company.java b/server/service/src/main/java/com/doumee/dao/business/model/Company.java
index a46d1f1..09bc4dc 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -10,6 +10,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 浼佷笟淇℃伅琛�
@@ -51,6 +52,9 @@
@ApiModelProperty(value = "鍚嶇О")
@ExcelColumn(name="鍚嶇О")
private String name;
+ @ApiModelProperty(value = "娉曚汉濮撳悕")
+ @ExcelColumn(name="娉曚汉濮撳悕")
+ private String legalName;
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
@@ -107,9 +111,15 @@
@ApiModelProperty(value = "浼佷笟閭")
@ExcelColumn(name="浼佷笟閭")
private String email;
+ @ApiModelProperty(value = "浼佷笟鐢靛瓙绔犵紪鐮�")
+ @ExcelColumn(name="浼佷笟鐢靛瓙绔犵紪鐮�")
+ private String signId;
+ @ApiModelProperty(value = "浼佷笟鐢靛瓙绔犵姸鎬� 0鏈笂浼� 1宸蹭笂浼� 2涓婁紶澶辫触")
+ @ExcelColumn(name="浼佷笟鐢靛瓙绔犵姸鎬�")
+ private Integer signIdStatus;
- @ApiModelProperty(value = "浼佷笟鐢靛瓙绛捐璇佺姸鎬� 0寰呰璇� 1宸茶璇� 2璁よ瘉澶辫触", example = "1")
- @ExcelColumn(name="浼佷笟鐢靛瓙绛捐璇佺姸鎬� 0寰呰璇� 1宸茶璇� 2璁よ瘉澶辫触")
+ @ApiModelProperty(value = "浼佷笟鐢靛瓙绛捐璇佺姸鎬� 0寰呰璇� 1璁よ瘉涓� 2璁よ瘉澶辫触 3璁よ瘉閫氳繃", example = "1")
+ @ExcelColumn(name="浼佷笟鐢靛瓙绛捐璇佺姸鎬� 0寰呰璇� 1璁よ瘉涓� 2璁よ瘉澶辫触 3璁よ瘉閫氳繃")
private Integer signStatus;
@ApiModelProperty(value = "鐢靛瓙绛捐璇佹椂闂�")
@@ -123,4 +133,23 @@
@TableField(exist = false)
private int hasPerimission ;
+ @ApiModelProperty(value = "鏂规闆嗗悎" )
+ @TableField(exist = false)
+ private List<CompanySolution> solutionList;
+ @ApiModelProperty(value = "钀ヤ笟鎵х収" )
+ @TableField(exist = false)
+ private Multifile businessImg;
+ @ApiModelProperty(value = "娉曚汉韬唤璇佺収鐗�" )
+ @TableField(exist = false)
+ private List<Multifile> idcardImgList;
+ @ApiModelProperty(value = "浼佷笟绛剧珷鍥剧墖" )
+ @TableField(exist = false)
+ private Multifile signImg;
+
+ @ApiModelProperty(value = "楠岃瘉鐮�")
+ @TableField(exist = false)
+ private String captche;
+
+
+
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java b/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
index e007b67..312ff3f 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -9,6 +10,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 浼佷笟鍙敤淇濋櫓鏂规鍏宠仈琛�
@@ -74,5 +76,8 @@
@ApiModelProperty(value = "鏄惁鍙噺淇� 0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍙噺淇� 0鍚� 1鏄�")
private Integer canReduce;
+ @ApiModelProperty(value = "鏂规鍚嶇О" )
+ @TableField(exist = false)
+ private String solutionName ;
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java b/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
index e6ef80f..e2d07a6 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -69,6 +70,9 @@
@ApiModelProperty(value = "鏂囦欢鍦板潃")
@ExcelColumn(name="鏂囦欢鍦板潃")
private String fileurl;
+ @ApiModelProperty(value = "鏂囦欢瀹屾暣璁块棶鍦板潃")
+ @TableField(exist = false)
+ private String fileurlFull;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@ExcelColumn(name="鎺掑簭鐮�")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java b/server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
index 0360869..e5a67f4 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
@@ -65,7 +65,7 @@
@ApiModelProperty(value = "鎵嬫満鍙�", example = "1")
@ExcelColumn(name="鎵嬫満鍙�")
- private Integer phone;
+ private String phone;
@ApiModelProperty(value = "閭")
@ExcelColumn(name="閭")
@@ -73,11 +73,11 @@
@ApiModelProperty(value = "鐘舵�� 0鏈娇鐢� 1宸蹭娇鐢�")
@ExcelColumn(name="鐘舵�� 0鏈娇鐢� 1宸蹭娇鐢�")
- private String status;
+ private Integer status;
@ApiModelProperty(value = "绫诲瀷 0鐭俊 1閭欢")
@ExcelColumn(name="绫诲瀷 0鐭俊 1閭欢")
- private String type;
+ private Integer type;
@ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜", example = "1")
@ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜")
diff --git a/server/service/src/main/java/com/doumee/service/business/CompanyService.java b/server/service/src/main/java/com/doumee/service/business/CompanyService.java
index a69ed84..54c2b3a 100644
--- a/server/service/src/main/java/com/doumee/service/business/CompanyService.java
+++ b/server/service/src/main/java/com/doumee/service/business/CompanyService.java
@@ -18,8 +18,9 @@
* @param company 瀹炰綋瀵硅薄
* @return Integer
*/
- Integer create(Company company);
-
+ Company create(Company company);
+ void updateStatus(Company company);
+ void updatePhone(Company company);
/**
* 涓婚敭鍒犻櫎
*
@@ -46,7 +47,7 @@
*
* @param company 瀹炰綋瀵硅薄
*/
- void updateById(Company company);
+ Company updateById(Company company);
/**
* 鎵归噺涓婚敭鏇存柊
@@ -94,4 +95,8 @@
* @return long
*/
long count(Company company);
+
+ void startSignAuth(Integer id);
+ void dealSignAuthStatus();
+ void dealSignIdStatus();
}
diff --git a/server/service/src/main/java/com/doumee/service/business/SmsEmailService.java b/server/service/src/main/java/com/doumee/service/business/SmsEmailService.java
index 435cf79..d647275 100644
--- a/server/service/src/main/java/com/doumee/service/business/SmsEmailService.java
+++ b/server/service/src/main/java/com/doumee/service/business/SmsEmailService.java
@@ -19,7 +19,7 @@
* @return Integer
*/
Integer create(SmsEmail smsEmail);
-
+ Integer sendSms(SmsEmail smsEmail);
/**
* 涓婚敭鍒犻櫎
*
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 0204f3e..641ceeb 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -7,22 +8,32 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.CompanyMapper;
-import com.doumee.dao.business.CompanyPermissionMapper;
-import com.doumee.dao.business.model.Company;
-import com.doumee.dao.business.model.CompanyPermission;
-import com.doumee.dao.business.model.Insurance;
+import com.doumee.dao.business.*;
+import com.doumee.dao.business.join.CompanySolutionJoinMapper;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.CompanyService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.service.business.third.SignService;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.Synchronized;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import java.util.List;
+import java.io.File;
+import java.lang.reflect.Array;
+import java.net.URI;
+import java.util.*;
/**
* 浼佷笟淇℃伅琛⊿ervice瀹炵幇
@@ -35,18 +46,294 @@
@Autowired
private CompanyMapper companyMapper;
@Autowired
+ private SystemUserMapper systemUserMapper;
+ @Autowired
+ private SignService signService;
+ @Autowired
+ private SolutionsMapper solutionsMapper;
+ @Autowired
+ private CompanySolutionJoinMapper companySolutionJoinMapper;
+ @Autowired
private CompanyPermissionMapper companyPermissionMapper;
+ @Autowired
+ private MultifileMapper multifileMapper;
+ @Autowired
+ private SmsEmailMapper smsEmailMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Override
- public Integer create(Company company) {
-
+ @Transactional
+ public Company create(Company company) {
+ isValidCreateParam(company);
+ if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
+ .eq(Company::getCode,company.getCode())
+ .or().eq(Company::getPhone,company.getPhone())
+ .or().eq(Company::getUsername,company.getUsername())
+ .or().eq(Company::getName,company.getName()))>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氥�愬悕绉般�戙�愮粺涓�淇＄敤浠ｇ爜鎴栬�呫�愭墜鏈哄彿銆戝凡瀛樺湪锛岃纭鍚庨噸鏂版彁浜わ紒");
+ }
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ company.setCreator(user.getId());
+ company.setCreateDate(new Date());
+ company.setIsdeleted(Constants.ZERO);
+ company.setStatus(Constants.ZERO);
+ company.setType(Constants.ZERO);
+ company.setSignStatus(Constants.ZERO);
+ company.setSignIdStatus(Constants.ZERO);
companyMapper.insert(company);
- return company.getId();
+ company.setEditDate(company.getCreateDate());
+ company.setEditor(user.getId());
+ //澶勭悊鐧婚檰璐﹀彿淇℃伅
+ dealSystemUserData(company);
+ //澶勭悊闄勪欢淇℃伅
+ dealFileData(company);
+ //澶勭悊鍏宠仈鏂规
+ dealSolutionsData(company);
+ return company;
+ }
+
+ private void dealSystemUserData(Company company) {
+ if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted,Boolean.TRUE)
+ .eq(SystemUser::getUsername,company.getUsername()))>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ櫥褰曡处鍙峰凡瀛樺湪锛岃鏇存柊閲嶈瘯~");
+ }
+ SystemUser user = new SystemUser();
+ user.setUsername(company.getUsername());
+ // 鐢熸垚瀵嗙爜鐩�
+ String salt = RandomStringUtils.randomAlphabetic(6);
+ // 鐢熸垚瀵嗙爜
+ user.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.DEFAULT_PASSWORD).getCode(), salt));
+ user.setSalt(salt);
+ user.setType(Constants.ONE);
+ user.setFixed(Boolean.TRUE);
+ user.setDeleted(Boolean.FALSE);
+ user.setCompanyId(company.getId());
+ user.setMobile(company.getPhone());
+ user.setCreateUser(company.getCreator());
+ user.setCreateTime(company.getCreateDate());
+ user.setStatus(Constants.ZERO);
+ systemUserMapper.insert(user);
+ }
+ private void dealSystemUserDataForUpdate (Company company,String oldUserName) {
+ if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted,Boolean.TRUE)
+ .eq(SystemUser::getUsername,company.getUsername()))>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ櫥褰曡处鍙峰凡瀛樺湪锛岃鏇存柊閲嶈瘯~");
+ }
+ SystemUser model = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted,Boolean.TRUE)
+ .eq(SystemUser::getUsername,oldUserName).last("limit 1"));
+ if(model ==null){
+ SystemUser user = new SystemUser();
+ user.setUsername(company.getUsername());
+ // 鐢熸垚瀵嗙爜鐩�
+ String salt = RandomStringUtils.randomAlphabetic(6);
+ // 鐢熸垚瀵嗙爜
+ user.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.DEFAULT_PASSWORD).getCode(), salt));
+ user.setSalt(salt);
+ user.setType(Constants.ONE);
+ user.setFixed(Boolean.TRUE);
+ user.setDeleted(Boolean.FALSE);
+ user.setCompanyId(company.getId());
+ user.setMobile(company.getPhone());
+ user.setCreateUser(company.getCreator());
+ user.setCreateTime(company.getCreateDate());
+ user.setStatus(Constants.ZERO);
+ systemUserMapper.insert(user);//鎻掑叆鏂扮殑绠＄悊鍛樿处鍙�
+ }else{
+ model.setUsername(company.getUsername());
+ model.setCreateUser(company.getCreator());
+ model.setCreateTime(company.getCreateDate());
+ systemUserMapper.updateById(model);//淇敼鍘熸潵鐨勮秴绾х鐞嗗憳璐﹀彿
+ }
+
+ }
+
+
+ /**
+ * 鏂板鍏宠仈鏂规
+ * @param company
+ */
+ private void dealSolutionsData(Company company) {
+ List<Integer> sIds = new ArrayList<>();
+ List<CompanySolution> list = new ArrayList<>();
+ int num =0;
+ for(CompanySolution s :company.getSolutionList()){
+ if(s.getSolutionBaseId() == null){
+ continue;
+ }
+ sIds.add(s.getSolutionBaseId());
+ s.setCompanyId(company.getId());
+ s.setIsdeleted(Constants.ZERO);
+ s.setCanAdd(Constants.formatIntegerNum(s.getCanAdd()));
+ s.setCanReduce(Constants.formatIntegerNum(s.getCanReduce()));
+ s.setCreateDate(company.getCreateDate());
+ s.setCreator(company.getCreator());
+ s.setSortnum(num++);
+ s.setStatus(Constants.ZERO);
+ list.add(s);
+ }
+ if(list.size() ==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇锋坊鍔犳湁鏁堢殑淇濋櫓鏂规淇℃伅锛�");
+ }
+ List<Solutions> solutionsList = solutionsMapper.selectList(new QueryWrapper<Solutions>().lambda()
+ .in(Solutions::getId,sIds)
+ .eq(Solutions::getIsdeleted,Constants.ZERO));
+ if(solutionsList.size()!= list.size()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇锋坊鍔犳湁鏁堢殑淇濋櫓鏂规淇℃伅鍝�");
+ }
+ for(Solutions s:solutionsList){
+ if(Constants.equalsInteger(s.getStatus(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"淇濋櫓鏂规銆�"+s.getName()+"銆戝凡琚鐢紝涓嶈兘杩涜璇ユ搷浣�");
+ }
+ }
+ companySolutionJoinMapper.insertBatchSomeColumn(list);
+ }
+
+ private void isValidCreateParam(Company company) {
+ if(StringUtils.isBlank(company.getPhone())
+ ||StringUtils.isBlank(company.getName())
+ ||StringUtils.isBlank(company.getUsername())
+ ||StringUtils.isBlank(company.getCode())
+ ||StringUtils.isBlank(company.getCaptche())
+ ||StringUtils.isBlank(company.getLegalName())
+ ||StringUtils.isBlank(company.getEmail())
+ ||company.getSolutionList() == null
+ ||company.getSolutionList().size() == 0
+ ||StringUtils.isBlank(company.getEmail())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ //鎵嬫満楠岃瘉鐮佹牎楠�
+ SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,company.getPhone(),company.getCaptche());
+
+ }
+
+ private void dealFileData(Company company ) {
+
+ List<Multifile> multifileList = new ArrayList<>();
+ if(company.getBusinessImg()!=null && StringUtils.isNotBlank(company.getBusinessImg().getFileurl())){
+ multifileList.add(initMultiFileByCompay(company,company.getBusinessImg(),Constants.MultiFile.COM_BUSINESS_LICENSE.getKey()));
+ }else {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犺惀涓氭墽鐓э紒");
+ }
+ if(company.getSignImg()!=null && StringUtils.isNotBlank(company.getSignImg().getFileurl())){
+ multifileList.add(initMultiFileByCompay(company,company.getSignImg(),Constants.MultiFile.COM_SING_IMG.getKey()));
+ }else {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犵數瀛愮绔狅紒");
+ }
+ if(company.getIdcardImgList()!=null && company.getIdcardImgList()!=null&& company.getIdcardImgList().size()>0){
+ for(Multifile f : company.getIdcardImgList()){
+ multifileList.add(initMultiFileByCompay(company,f,Constants.MultiFile.COM_IDCARD_IMG.getKey()));
+ }
+ }else {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犺韩浠借瘉鎵弿浠讹紒");
+ }
+ multifileMapper.insertBatchSomeColumn(multifileList);
+ }
+ private void dealFileDataForUpdate(Company company ) {
+
+ List<Multifile> multifileList = new ArrayList<>();
+ List<Integer> objList = new ArrayList<>();
+ if(company.getBusinessImg()!=null && StringUtils.isNotBlank(company.getBusinessImg().getFileurl())){
+ multifileList.add(initMultiFileByCompay(company,company.getBusinessImg(),Constants.MultiFile.COM_BUSINESS_LICENSE.getKey()));
+ objList.add(Constants.MultiFile.COM_BUSINESS_LICENSE.getKey());
+ }else {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犺惀涓氭墽鐓э紒");
+ }
+ if(company.getSignImg()!=null && StringUtils.isNotBlank(company.getSignImg().getFileurl())){
+ multifileList.add(initMultiFileByCompay(company,company.getSignImg(),Constants.MultiFile.COM_SING_IMG.getKey()));
+ objList.add(Constants.MultiFile.COM_SING_IMG.getKey());
+ company.setSignIdStatus(Constants.ZERO);//鏍囪鐢靛瓙绛剧珷鏈笂浼�
+ }
+ if(company.getIdcardImgList()!=null && company.getIdcardImgList()!=null){
+ for(Multifile f : company.getIdcardImgList()){
+ multifileList.add(initMultiFileByCompay(company,f,Constants.MultiFile.COM_IDCARD_IMG.getKey()));
+ }
+ objList.add(Constants.MultiFile.COM_IDCARD_IMG.getKey());
+ }
+ if(objList.size()>0){
+ multifileMapper.update(null,new UpdateWrapper<Multifile>().lambda()
+ .set(Multifile::getIsdeleted,Constants.ONE)
+ .set(Multifile::getEditDate,company.getEditDate())
+ .set(Multifile::getEditor,company.getEditor())
+ .eq(Multifile::getObjId,company.getId())
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .in(Multifile::getObjType,objList)
+ );
+ multifileMapper.insertBatchSomeColumn(multifileList);
+ }
+ }
+
+ private Multifile initMultiFileByCompay(Company company, Multifile file, int key) {
+ file.setCompanyId(company.getId());
+ file.setIsdeleted(Constants.ZERO);
+ file.setCreateDate(company.getEditDate());
+ file.setCreator(company.getEditor());
+ file.setObjId(company.getId());
+ file.setObjType(key);
+ file.setType(Constants.formatIntegerNum(file.getType()));
+ if(file.getFileurl().endsWith(".mp4")){
+ file.setType(Constants.TWO);
+ }
+ return file;
}
@Override
public void deleteById(Integer id) {
companyMapper.deleteById(id);
+ }
+ @Override
+ public void updateStatus(Company company){
+ if(company.getId() == null || company.getStatus()==null || company.getStatus()<0||company.getStatus()>1){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST );
+ }
+ Company model = companyMapper.selectById(company.getId());
+ if(model == null || !Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO) ){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY );
+ }
+ if(Constants.equalsInteger(model.getStatus(),company.getStatus())){
+ //濡傛灉鐘舵�佷笉鍙戠敓鏀瑰彉锛岀洿鎺ヨ繑鍥�
+ return;
+ }
+ LoginUserInfo user= (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
+ //鏇存柊鏁版嵁鐘舵��
+ companyMapper.update(null,new UpdateWrapper<Company>()
+ .lambda()
+ .eq(Company::getId,model.getId())
+ .set(Company::getEditDate,new Date())
+ .set(Company::getEditor,user.getId())
+ .set(Company::getStatus,company.getStatus())
+ );
+ }
+ @Override
+ public void updatePhone(Company company){
+ if(company.getId() == null ||StringUtils.isBlank(company.getPhone())
+ || StringUtils.isBlank(company.getCaptche())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST );
+ }
+ SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,company.getPhone(),company.getCaptche());
+ Company model = companyMapper.selectById(company.getId());
+ if(model == null || StringUtils.equals(model.getPhone(),company.getPhone()) ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎵嬫満鍙锋湭鍙戠敓鏀瑰彉~" );
+ }
+
+ if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
+ .eq(Company::getPhone,company.getPhone())
+ .eq(Company::getIsdeleted,Constants.ZERO))>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氥�愭墜鏈哄彿銆戝凡瀛樺湪锛岃纭鍚庨噸鏂版彁浜わ紒");
+ }
+
+ LoginUserInfo user= (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
+ //鏇存崲鎵嬫満鍙�
+ companyMapper.update(null,new UpdateWrapper<Company>()
+ .lambda()
+ .eq(Company::getId,model.getId())
+ .set(Company::getEditDate,new Date())
+ .set(Company::getEditor,user.getId())
+ .set(Company::getPhone,company.getPhone())
+ );
}
@Override
@@ -62,14 +349,71 @@
}
companyMapper.deleteBatchIds(ids);
}
+ private void isValidUpdateParam(Company company) {
+ if( StringUtils.isBlank(company.getName())
+ ||StringUtils.isBlank(company.getUsername())
+ ||StringUtils.isBlank(company.getCode())
+ ||StringUtils.isBlank(company.getCaptche())
+ ||StringUtils.isBlank(company.getLegalName())
+ ||StringUtils.isBlank(company.getEmail()) ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ }
@Override
- public void updateById(Company company) {
+ public Company updateById(Company company) {
+ isValidUpdateParam(company);
Company model = findById(company.getId());
if(model == null || !Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO) ){
throw new BusinessException(ResponseStatus.DATA_EMPTY );
}
+ if(StringUtils.equals(company.getEmail(),model.getEmail())){
+ company.setEmail(null);
+ }
+ if(StringUtils.equals(company.getUsername(),model.getUsername())){
+ company.setUsername(null);
+ }
+
+ if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
+ .ne(Company::getId,company.getId())
+ .and(w->w.eq(Company::getCode,company.getCode())
+ .or().eq(Company::getUsername,company.getUsername())
+ .or().eq(Company::getName,company.getName()))
+ )>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氥�愬悕绉般�戙�愮粺涓�淇＄敤浠ｇ爜鎴栬�呫�愪紒涓氳处鍙枫�戝凡瀛樺湪锛岃纭鍚庨噸鏂版彁浜わ紒");
+ }
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ dealFileDataForUpdate(company);
+
+ Company update = new Company();
+ update.setIsdeleted(company.getId());
+ update.setName(company.getName());
+ update.setCode(company.getCode());
+ update.setEditDate(new Date());
+ update.setEditor(user.getId());
+ update.setUsername(company.getUsername());
+ update.setTaxAccount(company.getTaxAccount());
+ update.setTaxAddr(company.getTaxAddr());
+ update.setTaxCode(company.getTaxCode());
+ update.setTaxBank(company.getTaxBank());
+ update.setEmail(company.getEmail());
+ update.setInvoiceAddr(company.getInvoiceAddr());
+ update.setSignIdStatus(company.getSignIdStatus());
+ update.setInvoiceEmail(company.getInvoiceEmail());
+ if(StringUtils.isNotBlank(company.getEmail())){
+ //濡傛灉閭鍙戠敓鏀瑰彉
+ update.setSignStatus(Constants.ZERO);
+ }
companyMapper.updateById(company);
+ company.setCreator(update.getEditor());
+ company.setCreateDate(update.getEditDate());
+ if(StringUtils.isNotBlank(company.getUsername())){
+ //澶勭悊鐧婚檰璐﹀彿淇℃伅
+ dealSystemUserDataForUpdate(company,model.getUsername());
+ }
+
+ return company;
}
@Override
@@ -84,7 +428,49 @@
@Override
public Company findById(Integer id) {
- return companyMapper.selectById(id);
+ Company model = findById(id);
+ if(model == null ||Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ MPJLambdaWrapper<CompanySolution> csWrapper = new MPJLambdaWrapper<>();
+ csWrapper.selectAll(CompanySolution.class);
+ csWrapper.selectAs(Solutions::getName,CompanySolution::getSolutionName);
+ csWrapper.leftJoin(Solutions.class,Solutions::getId,CompanySolution::getSolutionBaseId);
+ csWrapper.eq(CompanySolution::getCompanyId,id);
+ csWrapper.eq(CompanySolution::getIsdeleted,Constants.ZERO);
+ csWrapper.orderByAsc(CompanySolution::getSortnum);
+ model.setSolutionList(companySolutionJoinMapper.selectJoinList(CompanySolution.class,csWrapper));
+
+ initImgData(model);
+ return model;
+ }
+
+ private void initImgData(Company model) {
+ List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getCompanyId,model.getId())
+ .eq(Multifile::getIsdeleted,Constants.ZERO));
+ if(multifiles!=null){
+ String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.COMPANY_FILE).getCode();
+ for(Multifile f : multifiles){
+ if(StringUtils.isBlank(f.getFileurl())){
+ continue;
+ }
+ f.setFileurlFull(path+f.getFileurl());
+ if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.COM_BUSINESS_LICENSE.getKey())){
+ //钀ヤ笟鎵х収
+ model.setBusinessImg(f);
+ }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.COM_SING_IMG.getKey())){
+ //浼佷笟鐢靛瓙绔�
+ model.setSignImg(f);
+ }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.COM_IDCARD_IMG.getKey())){
+ //娉曚汉韬唤璇�
+ if(model.getIdcardImgList()==null){
+ model.setIdcardImgList(new ArrayList<>());
+ }
+ model.getIdcardImgList().add(f);
+ }
+ }
+ }
}
@Override
@@ -92,6 +478,105 @@
QueryWrapper<Company> wrapper = new QueryWrapper<>(company);
return companyMapper.selectOne(wrapper);
}
+ /**
+ * 鐢靛瓙绛捐璇�
+ * public boolean organizationCreate (String fullname,String creditCode,String legalName,String email,File businessimg,String notifyUrl){
+ */
+ @Override
+ public void startSignAuth(Integer id){
+ Company company = companyMapper.selectById(id);
+ Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjType,Constants.MultiFile.COM_BUSINESS_LICENSE.getKey())
+ .eq(Multifile::getObjId,company.getId())
+ .last("limit 1"));
+ if(f == null){
+ return;
+ }
+ String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.COMPANY_FILE).getCode();
+ boolean status = signService.organizationCreate(company.getName(),company.getCode(),company.getLegalName(),company.getEmail(), path + f.getFileurl(),null);
+ Company update = new Company();
+ update.setId(company.getId());
+ update.setSignStatus(status?Constants.ONE:Constants.TWO);
+ update.setSignDate(new Date());
+ //鏇存柊璁よ瘉鐘舵��
+ companyMapper.updateById(update);
+ }
+ /**
+ * 鐢靛瓙绛捐璇�
+ * public boolean organizationCreate (String fullname,String creditCode,String legalName,String email,File businessimg,String notifyUrl){
+ */
+ @Override
+ @Synchronized//鍗曚緥鎵ц
+ public void dealSignAuthStatus(){
+ List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
+ .eq(Company::getIsdeleted,Constants.ZERO)
+ .eq(Company::getSignStatus,Constants.ONE));
+ if(companyList!=null && companyList.size()>0){
+ for(Company company :companyList){
+ //鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃壒鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
+ int status = signService.organizationAuditStatus(company.getEmail());
+ if(status == 1){
+ Company update = new Company();
+ update.setId(company.getId());
+ update.setSignStatus( Constants.THREE);
+ update.setSignDate(new Date());
+ //鏇存柊璁よ瘉鐘舵��
+ companyMapper.updateById(update);
+ }else{
+ Company update = new Company();
+ update.setId(company.getId());
+ update.setSignStatus(Constants.TWO);
+ update.setSignDate(new Date());
+ //鏇存柊璁よ瘉鐘舵��
+ companyMapper.updateById(update);
+ }
+
+ }
+ }
+
+ }
+ /**
+ * 鐢靛瓙鍗扮珷鑷姩涓婁紶
+ * public boolean organizationCreate (String fullname,String creditCode,String legalName,String email,File businessimg,String notifyUrl){
+ */
+ @Override
+ @Synchronized//鍗曚緥鎵ц
+ public void dealSignIdStatus(){
+ List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
+ .eq(Company::getIsdeleted,Constants.ZERO)
+ .eq(Company::getSignStatus,Constants.ONE)
+ .eq(Company::getSignIdStatus,Constants.ZERO));
+ if(companyList!=null && companyList.size()>0){
+ for(Company company :companyList){
+ //鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃壒鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
+ Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjType,Constants.MultiFile.COM_SING_IMG.getKey())
+ .eq(Multifile::getObjId,company.getId())
+ .last("limit 1"));
+ if(f !=null &&StringUtils.isNotBlank(f.getFileurl())){
+ String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.COMPANY_FILE).getCode();
+ String signId = signService.uploadEntSign(company.getName(),path+f.getFileurl(),company.getEmail());
+ Company update = new Company();
+ update.setId(company.getId());
+ if(StringUtils.isNotBlank(signId)){
+ update.setSignIdStatus( Constants.ONE);
+ update.setSignId(signId);
+ //鏇存柊璁よ瘉鐘舵��
+ companyMapper.updateById(update);
+ }else{
+ update.setSignIdStatus(Constants.TWO);
+ //鏇存柊璁よ瘉鐘舵��
+ companyMapper.updateById(update);
+ }
+
+ }
+
+ }
+ }
+
+ }
@Override
public List<Company> findList(Company company) {
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
index 1159de3..ea97e2a 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
@@ -1,7 +1,11 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.SmsEmailMapper;
import com.doumee.dao.business.model.SmsEmail;
@@ -10,10 +14,13 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.service.business.third.EmayService;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
/**
@@ -26,12 +33,56 @@
@Autowired
private SmsEmailMapper smsEmailMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private EmayService emayService;
+
+ public static void isCaptcheValide(SmsEmailMapper smsEmailMapper, String phone, String captche) {
+ SmsEmail model = smsEmailMapper.selectOne(new QueryWrapper<SmsEmail>().lambda()
+ .eq(SmsEmail::getType, Constants.ZERO)
+ .eq(SmsEmail::getPhone, phone)
+ .eq(SmsEmail::getRemark, captche)
+ .eq(SmsEmail::getIsdeleted, Constants.ZERO)
+ );
+ if(model == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝楠岃瘉鐮佷笉姝ｇ‘锛岃閲嶆柊鍙戦�佸啀璇曪紒");
+ }
+ if(!Constants.equalsInteger(model.getStatus(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝楠岃瘉鐮佸凡澶辨晥锛岃閲嶆柊鍙戦�佸啀璇曪紒");
+ }
+ if(model.getCreateDate() !=null && System.currentTimeMillis() - model.getCreateDate().getTime() > 3*60*100){
+ model.setStatus(Constants.ONE);
+ model.setEditDate(new Date());
+ smsEmailMapper.updateById(model);
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝楠岃瘉鐮佸凡澶辨晥锛岃閲嶆柊鍙戦�佸啀璇晘");
+ }
+ model.setStatus(Constants.ONE);
+ model.setEditDate(new Date());
+ smsEmailMapper.updateById(model);
+ }
@Override
public Integer create(SmsEmail smsEmail) {
smsEmailMapper.insert(smsEmail);
return smsEmail.getId();
}
+ @Override
+ public Integer sendSms(SmsEmail smsEmail) {
+ if(StringUtils.isBlank(smsEmail.getPhone())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ String code = Constants.getRandom6Num();
+ smsEmail.setRemark(code);
+ smsEmail.setIsdeleted(Constants.ZERO);
+ smsEmail.setCreateDate(new Date());
+ smsEmail.setStatus(Constants.ZERO);
+ smsEmail.setType(Constants.ZERO);
+ smsEmail.setTitle("鐭俊楠岃瘉鐮�");
+ smsEmail.setContent(systemDictDataBiz.queryByCode(Constants.SMS,Constants.SMS_COMNAME).getCode()+"楠岃瘉鐮佷负锛�"+code+"锛屾楠岃瘉鐮佹湁鏁堜负3鍒嗛挓銆傝鍕挎硠闇�");
+ smsEmailMapper.insert(smsEmail);
+ return smsEmail.getId();
+ }
@Override
public void deleteById(Integer id) {
diff --git a/server/service/src/main/java/com/doumee/service/business/third/SignService.java b/server/service/src/main/java/com/doumee/service/business/third/SignService.java
index bba9890..e89cce8 100644
--- a/server/service/src/main/java/com/doumee/service/business/third/SignService.java
+++ b/server/service/src/main/java/com/doumee/service/business/third/SignService.java
@@ -19,9 +19,15 @@
import javax.annotation.PostConstruct;
import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.net.URL;
import java.util.Date;
import java.util.IdentityHashMap;
import java.util.Map;
+import java.util.UUID;
/**
* <ul>
@@ -113,12 +119,16 @@
* @param creditCode
* @param legalName
* @param email
- * @param businessimg
+ * @param businessimgPath
* @param notifyUrl
* @return
*/
- public boolean organizationCreate (String fullname,String creditCode,String legalName,String email,File businessimg,String notifyUrl){
+ public boolean organizationCreate (String fullname,String creditCode,String legalName,String email,String businessimgPath, String notifyUrl){
try {
+ File businessimg =netFileToLoclFile(businessimgPath);
+ if(businessimg == null || !businessimg.isFile() || !businessimg.exists()){
+ return false;
+ }
Map<String, Object> params=bodyParams;
String url=SERVICE_URL+"/v2/user/organizationCreate";
params.put("name",fullname);
@@ -131,6 +141,7 @@
params.put("legalName",legalName);
params.put("emailOrMobile",email);
String str= HttpClientUtils.init().getPost(url,null,params,true);
+ businessimg.delete();
saveInterfaceLog(url,"銆愮數瀛愮銆戝彂璧蜂紒涓氳璇佺敵璇�",JSONObject.toJSONString(params),str);
JSONObject json = JSONObject.parseObject(str);
if(json!=null && json.getBoolean("success")){
@@ -149,12 +160,16 @@
* @param creditCode
* @param legalName
* @param email
- * @param businessimg
+ * @param businessimgPath
* @param notifyUrl
* @return
*/
- public boolean organizationReApply(String fullname,String creditCode,String legalName,String email,File businessimg,String notifyUrl){
+ public boolean organizationReApply(String fullname,String creditCode,String legalName,String email,String businessimgPath,String notifyUrl){
try {
+ File businessimg = new File(new URI(businessimgPath));
+ if(businessimg == null|| !businessimg.isFile() || !businessimg.exists()){
+ return false ;
+ }
Map<String, Object> params=bodyParams;
String url=SERVICE_URL+"/v2/user/organizationReapply";
params.put("name",fullname);
@@ -167,6 +182,7 @@
params.put("legalName",legalName);
params.put("emailOrMobile",email);
String str= HttpClientUtils.init().getPost(url,null,params,true);
+ businessimg.delete();
saveInterfaceLog(url,"銆愮數瀛愮銆戦噸鏂板彂璧蜂紒涓氳璇佺敵璇�",JSONObject.toJSONString(params),str);
JSONObject json = JSONObject.parseObject(str);
if(json!=null && json.getBoolean("success")){
@@ -180,6 +196,33 @@
}
+ /**
+ * 缃戠粶鏂囦欢杞湰鍦颁复鏃舵枃浠�
+ * @param fileUrl
+ * @return
+ */
+ public static File netFileToLoclFile(String fileUrl) {
+
+ try {
+ URL url = new URL(fileUrl);
+ InputStream inputStream = url.openConnection().getInputStream();
+
+ File file = File.createTempFile( "temp",""+UUID.randomUUID().toString()+fileUrl.substring(fileUrl.lastIndexOf("."))); // 鎸囧畾淇濆瓨鍒版湰鍦扮殑鏂囦欢鍚嶅強璺緞
+ OutputStream outputStream = new FileOutputStream(file);
+ byte[] buffer = new byte[1024];
+ int bytesRead;
+ while ((bytesRead = inputStream.read(buffer)) != -1) {
+ outputStream.write(buffer, 0, bytesRead);
+ }
+
+ outputStream.close();
+ inputStream.close();
+ return file;
+ }catch (Exception e){
+
+ }
+ return null;
+ }
/**
* 鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃壒鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
* @param email
@@ -206,22 +249,23 @@
/**
* 鍙戣捣绛剧害
* @param name
- * @param file
+ * @param fileUrl
* @param fullname
* @param creditCoe
* @param email
* @param postionJson
*/
- public String applySign(String name,File file,String fullname,String creditCoe,String email,String postionJson,String singId){
+ public String applySign(String name,String fileUrl,String fullname,String creditCoe,String email,String postionJson,String singId){
try {
String url=SERVICE_URL+"/v2/sign/applySign";
Map<String, Object> params=bodyParams;
params.put("contractName",name); //鍚堝悓鍚嶇О
params.put("serverCa",1); //浣跨敤浜戣瘉涔�
- params.put("file",file);
+// params.put("file",file);
+ params.put("url",fileUrl);
params.put("dealType",5); //鎸囧畾鍚堝悓鏂囦欢绛剧讲鏂瑰紡 5 涓洪儴鍒嗚嚜鍔ㄧ
params.put("positionType",1); //鎸囧畾閫氳繃琛ㄥ崟鍩熸柟寮忚缃瀛椾綅缃�
- params.put("fileType",0);
+ params.put("fileType",1);
params.put("needQifengSign",1);
JSONArray signatories=new JSONArray();
SignatoryReq sReq=new SignatoryReq();
@@ -304,11 +348,12 @@
/**
* 涓婁紶浼佷笟鑷畾涔夊嵃绔�(杩斿洖鍗扮珷ID)
* @param signName
- * @param signImgFile
+ * @param path
*/
- public String uploadEntSign(String signName,File signImgFile,String email ) {
+ public String uploadEntSign(String signName,String path,String email ) {
try {
+ File signImgFile = new File(new URI(path));
Map<String, Object> params = bodyParams;
String url = SERVICE_URL + "/v2/user/uploadEntSign";
//鏋勫缓璇锋眰鍙傛暟
--
Gitblit v1.9.3