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)); } } 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======="); } } 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ä¿åç³è¯·è¡¨PDF 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, "ä¿åç³è¯·è¡¨PDF ", "ä¿åç³è¯·è¡¨PDF "), BD_SIGNED_PDF(9, "ç¾ç½²åä¿åç³è¯·è¡¨PDF", "ç¾ç½²åä¿åç³è¯·è¡¨PDF"), COM_SING_IMG(10, "ä¼ä¸å°ç« ", "ä¼ä¸å°ç« "), BD_DONE_PDF(10, "æç»æ¥å", "æç»æ¥å"), ; 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); } 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); } 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; } 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 ; } 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="æåºç ") 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="å ³è对象ç¼ç ") 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(); } 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); /** * 主é®å é¤ * 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.*; /** * ä¼ä¸ä¿¡æ¯è¡¨Serviceå®ç° @@ -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) { 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) { 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"; //æå»ºè¯·æ±åæ°