修改企业注册 图片上传接口 和 企业信息保存接口

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/CompanyDto.java

 package com.yeejoin.amos.boot.module.ugp.api.dto;
 
+import com.alibaba.fastjson.JSONArray;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 企业信息表
@@ -79,6 +83,8 @@ public class CompanyDto  extends BaseDto {
  @ApiModelProperty(value = "成立日期")
  private Date createTime;
 
+ private JSONArray lincensePicUrl;
+
  @ApiModelProperty(value = "管理员身份证附件")
  private String adminLincensePic;
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/CompanyController.java

 package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sun.org.apache.xpath.internal.objects.XObject;
-import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
-import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
-import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
-import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import com.mysql.cj.xdevapi.JsonArray;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
@@ -26,12 +19,8 @@ import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl;
 
-import com.yeejoin.amos.component.feign.config.TokenOperation;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
-import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.*;
-import com.yeejoin.amos.feign.privilege.util.DesUtil;
 
 
 import com.yeejoin.amos.feign.systemctl.Systemctl;
@@ -48,7 +37,6 @@ import java.util.*;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.CompanyServiceImpl;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -112,10 +100,18 @@ public class CompanyController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增企业信息表", notes = "新增企业信息表")
 	public ResponseModel<CompanyDto> save(@RequestBody CompanyDto model) {
-	    model = companyServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
+		JSONArray jsonArray = model.getLincensePicUrl();
+		List<String> adminLincensePic = new ArrayList<>();
+		for(Object o : jsonArray){
+			JSONObject object = JSON.parseObject(JSON.toJSONString(o));
+			String url = object.getString("url");
+			adminLincensePic.add(url);
+		}
+		model.setAdminLincensePic(JSON.toJSONString(adminLincensePic));
+	    return ResponseHelper.buildResponse(companyServiceImpl.createWithModel(model));
 	}
 
+
 	/**
      * 根据sequenceNbr更新
      *
@@ -320,14 +316,14 @@ public class CompanyController extends BaseController {
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/uploadFile")
 	@ApiOperation(httpMethod = "POST", value = "管理员身份证图片上传 无token", notes = "管理员身份证图片上传 无token")
-	public ResponseModel<String> uploadFile(@ApiParam(value = "文件", required = true)@RequestParam MultipartFile adminLicensePic) {
-		if (ValidationUtil.isEmpty(adminLicensePic)){
+	public ResponseModel<String> uploadFile(@ApiParam(value = "文件", required = true)@RequestParam MultipartFile file) {
+		if (ValidationUtil.isEmpty(file)){
 			throw new BadRequest("参数校验失败.");
 		}
 		RequestContext.setAppKey("AMOS_STUDIO");
 		RequestContext.setProduct("AMOS_STUDIO_WEB");
 		RequestContext.setToken(requestContext.getToken());
-		FeignClientResult<Map<String, String>> date = Systemctl.fileStorageClient.updateCommonFile(adminLicensePic);
+		FeignClientResult<Map<String, String>> date = Systemctl.fileStorageClient.updateCommonFile(file);
 		String urlString="";
 		if (date != null) {
 			Map<String, String> map = date.getResult();