Js
/
lyr-one-test
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

供应商信息 以及 物料管理已对接完成

Browse Source
new
Agoni 1 year ago
parent 9946d271c3
commit 3fb990a4bd
11 changed files with 108 additions and 12 deletions
Show Stats Download Patch File Download Diff File

3
yudao-module-bs/yudao-module-bs-api/src/main/java/cn/iocoder/yudao/module/bs/enums/ErrorCodeConstants.java
Unescape Escape View File

@ -20,4 +20,7 @@ public interface ErrorCodeConstants {
ErrorCode QUOTATION_SHEET_DETAIL_NOT_EXISTS = new ErrorCode(202500, "报价单物料明细不存在");
ErrorCode MATERIEL_NOT_EXISTS = new ErrorCode(202600, "物料不存在");
ErrorCode QUOTATION_SHEET_BIDDING_NOT_EXISTS = new ErrorCode(202700, "报价单物料中标不存在");
ErrorCode SUPPLIER_COMPANY_NOT_EXISTS_Ai = new ErrorCode(202800, "识别营业执照接口返回信息状态失败");
ErrorCode SUPPLIER_COMPANY_NOT_EXISTS_Ai_Error = new ErrorCode(202900, "识别营业执照识别失败");
ErrorCode QUOTATION_SHEET_NOT_EXISTS_PHONE = new ErrorCode(203000, "手机号码不能重复");
}

7
yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/materiel/MaterielController.java
Unescape Escape View File

@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.bs.controller.admin.materiel;
import com.alibaba.fastjson.JSON;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -67,6 +69,11 @@ public class MaterielController {
@PreAuthorize("@ss.hasPermission('bs:materiel:query')")
public CommonResult<MaterielRespVO> getMateriel(@RequestParam("id") Long id) {
MaterielDO materiel = materielService.getMateriel(id);
if (materiel.getExtend()!=null && !materiel.getExtend().equals("")){
materiel.setExtendList(JSON.parseArray(materiel.getExtend(),Object.class));
}else {
materiel.setExtendList(new ArrayList<>());
}
return success(MaterielConvert.INSTANCE.convert(materiel));
}

7
yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/materiel/vo/MaterielBaseVO.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.bs.controller.admin.materiel.vo;
import cn.iocoder.yudao.framework.common.pojo.ImageVo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
@ -33,7 +34,7 @@ public class MaterielBaseVO {
private Integer materielType;
@Schema(description = "单台用量")
@NotNull(message = "单台用量不能为空")
// @NotNull(message = "单台用量不能为空")
private Integer dosage;
@Schema(description = "描述", example = "你说的对")
@ -46,6 +47,8 @@ public class MaterielBaseVO {
private String quality;
@Schema(description = "扩展")
private String extend;
private List<Object> extendList;
@Schema(description = "附件", requiredMode = Schema.RequiredMode.REQUIRED)
private List<ImageVo> files;
}

3
yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/materiel/vo/MaterielExcelVO.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.bs.controller.admin.materiel.vo;
import cn.iocoder.yudao.framework.common.pojo.ImageVo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
@ -52,4 +53,6 @@ public class MaterielExcelVO {
@ExcelProperty("扩展")
private String extend;
@Schema(description = "附件", requiredMode = Schema.RequiredMode.REQUIRED)
private List<ImageVo> files;
}

3
yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/materiel/vo/MaterielExportReqVO.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.bs.controller.admin.materiel.vo;
import cn.iocoder.yudao.framework.common.pojo.ImageVo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
@ -47,4 +48,6 @@ public class MaterielExportReqVO {
@Schema(description = "扩展")
private String extend;
@Schema(description = "附件", requiredMode = Schema.RequiredMode.REQUIRED)
private List<ImageVo> files;
}

6
yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/materiel/vo/MaterielPageReqVO.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.bs.controller.admin.materiel.vo;
import cn.iocoder.yudao.framework.common.pojo.ImageVo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
@ -49,4 +50,9 @@ public class MaterielPageReqVO extends PageParam {
@Schema(description = "扩展")
private String extend;
@Schema(description = "扩展数组")
private List<Object> extendList;
@Schema(description = "附件", requiredMode = Schema.RequiredMode.REQUIRED)
private List<ImageVo> files;
}

10
yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/controller/admin/suppliercompany/SupplierCompanyController.java
Unescape Escape View File

@ -17,12 +17,16 @@ import java.io.IOException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;
import static cn.iocoder.yudao.module.bs.enums.ErrorCodeConstants.SUPPLIER_COMPANY_NOT_EXISTS_Ai;
import static cn.iocoder.yudao.module.bs.enums.ErrorCodeConstants.SUPPLIER_COMPANY_NOT_EXISTS_Ai_Error;
import static cn.iocoder.yudao.module.bs.utils.BaiduOcrHandler.handleBusinessLicense;
import cn.iocoder.yudao.module.bs.controller.admin.suppliercompany.vo.*;
@ -43,11 +47,11 @@ public class SupplierCompanyController {
@PostMapping("/buildBusinessLicense")
@Operation(summary = "百度云营业执照识别")
@PreAuthorize("@ss.hasPermission('bs:supplier-company:create')")
public CommonResult<BusinessLicense> buildBusinessLicense(MultipartFile file) {
public CommonResult<BusinessLicense> buildBusinessLicense(MultipartFile file,String url) {
try {
return success(handleBusinessLicense(file));
return success(handleBusinessLicense(file,url));
} catch (Exception e) {
throw new RuntimeException(e);
throw exception(SUPPLIER_COMPANY_NOT_EXISTS_Ai_Error);
}
}

11
yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/dal/dataobject/materiel/MaterielDO.java
Unescape Escape View File

@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.bs.dal.dataobject.materiel;
import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
import lombok.*;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.ImageVo;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
@ -69,4 +71,13 @@ public class MaterielDO extends TenantBaseDO {
*/
private String extend;
@TableField(exist = false)
private List<Object> extendList;
/**
* 附件
*/
@TableField(typeHandler = JacksonTypeHandler.class)
private List<ImageVo> files;
}

47
yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/service/materiel/MaterielServiceImpl.java
Unescape Escape View File

@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.bs.service.materiel;
import cn.iocoder.yudao.module.bs.dal.dataobject.quotationsheet.QuotationSheetDO;
import cn.iocoder.yudao.module.bs.dal.mysql.quotationsheet.QuotationSheetMapper;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.github.yulichang.base.MPJBaseServiceImpl;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -34,6 +37,10 @@ public class MaterielServiceImpl extends MPJBaseServiceImpl<MaterielMapper, Mate
public Long createMateriel(MaterielCreateReqVO createReqVO) {
// 插入
MaterielDO materiel = MaterielConvert.INSTANCE.convert(createReqVO);
if (createReqVO.getExtendList()!=null){
materiel.setExtend(JSON.toJSONString(createReqVO.getExtendList()));
}
materielMapper.insert(materiel);
// 返回
return materiel.getId();
@ -69,12 +76,48 @@ public class MaterielServiceImpl extends MPJBaseServiceImpl<MaterielMapper, Mate
@Override
public List<MaterielDO> getMaterielList(Collection<Long> ids) {
return materielMapper.selectBatchIds(ids);
List<MaterielDO> materielDOS = materielMapper.selectBatchIds(ids);
if (null!=materielDOS){
materielDOS.forEach(p->{
if (p.getExtend()!=null && !p.getExtend().equals("")){
p.setExtendList(JSON.parseArray(p.getExtend(),Object.class));
}else {
p.setExtendList(new ArrayList<>());
}
});
}
return materielDOS;
}
@Override
public PageResult<MaterielDO> getMaterielPage(MaterielPageReqVO pageReqVO) {
return materielMapper.selectPage(pageReqVO);
PageResult<MaterielDO> materielDOPageResult = materielMapper.selectPage(pageReqVO);
if (null!=materielDOPageResult.getList()){
materielDOPageResult.getList().forEach(p->{
if (p.getExtend()!=null && !p.getExtend().equals("")){
p.setExtendList(JSON.parseArray(p.getExtend(),Object.class));
}else {
p.setExtendList(new ArrayList<>());
}
});
}
return materielDOPageResult;
}
/**
* String 转 List<Map<String,Object>
*/
public static List<Map<Object, Object>> getStrToListMap(String json){
List<Object> list = JSON.parseArray(json);
List< Map<Object,Object>> listw = new ArrayList<Map<Object,Object>>();
for (Object object : list){
Map<Object,Object> ageMap = new HashMap<Object,Object>();
Map <Object,Object> ret = (Map<Object, Object>) object;//取出list里面的值转为map
listw.add(ret);
}
return listw;
}
@Override

6
yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/service/suppliercompany/SupplierCompanyServiceImpl.java
Unescape Escape View File

@ -47,12 +47,16 @@ public class SupplierCompanyServiceImpl extends MPJBaseServiceImpl<SupplierCompa
String companyNumber = numberCreate();
supplierCompany.setCompanyNumber(companyNumber);
supplierCompany.setDeleted(false);
supplierCompanyMapper.insert(supplierCompany);
// supplierCompanyMapper.insert(supplierCompany);
UserCreateReqDTO userCreateReqDTO=new UserCreateReqDTO();
userCreateReqDTO.setPassword("123456Aa@");
userCreateReqDTO.setUsername(supplierCompany.getPhone());
userCreateReqDTO.setNickname(supplierCompany.getBankName());
userCreateReqDTO.setMobile(supplierCompany.getPhone());
Long supplierCompanyDOList = supplierCompanyMapper.selectCount(new QueryWrapper<SupplierCompanyDO>().eq("phone", createReqVO.getPhone()));
if (supplierCompanyDOList >0L){
throw exception(QUOTATION_SHEET_NOT_EXISTS_PHONE);
}
// userCreateReqDTO.setTenantId(supplierCompany.getCompanyNumber());
Long userId = adminUserApi.addUser(userCreateReqDTO);
supplierCompany.setCorrelationUserId(userId);

15
yudao-module-bs/yudao-module-bs-biz/src/main/java/cn/iocoder/yudao/module/bs/utils/BaiduOcrHandler.java
Unescape Escape View File

@ -14,6 +14,10 @@ import java.io.File;
import java.net.URLEncoder;
import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.bs.enums.ErrorCodeConstants.SUPPLIER_COMPANY_NOT_EXISTS;
import static cn.iocoder.yudao.module.bs.enums.ErrorCodeConstants.SUPPLIER_COMPANY_NOT_EXISTS_Ai;
/**
* @author MrFang
* @date 2023年08月15日 11:36
@ -92,18 +96,23 @@ public class BaiduOcrHandler {
* @param businessLicenseImage 营业执照照片（支持：{@linkplain File}及{@linkplain MultipartFile}）
* @return IdCard
*/
public static BusinessLicense handleBusinessLicense(Object businessLicenseImage) throws Exception {
public static BusinessLicense handleBusinessLicense(Object businessLicenseImage,String url) throws Exception {
String accessToken = getAccessToken();
if (StringUtils.isEmpty(accessToken)) {
throw new RuntimeException("获取token失败");
}
String param =null;
if (url!=null&&!url.trim().equals("")){
param = "detect_direction=true&" + "url=" + url;
}else {
String base64ImgParam = getImageBase64Param(businessLicenseImage);
String param = "detect_direction=true&" + "image=" + base64ImgParam;
param = "detect_direction=true&" + "image=" + base64ImgParam;
}
String jsonStr = HttpUtil.post(BaiduOcrConstant.BUSINESS_LICENSE_URL, accessToken, param);
JSONObject jsonObject = JSON.parseObject(jsonStr);
// log.info("营业执照OCR识别结果=>{}", jsonObject);
if (!jsonObject.containsKey("words_result")) {
throw new RuntimeException("识别营业执照接口返回信息状态失败");
throw exception(SUPPLIER_COMPANY_NOT_EXISTS_Ai);
}
BusinessLicense license = new BusinessLicense();
JSONObject wordsResult = jsonObject.getJSONObject("words_result");

Write Preview
Loading…
Cancel
Save