Merge branch 'develop'

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/LicenseOrganizationsVO.java

+package com.mmc.iuav.user.model.vo;
+
+import com.mmc.iuav.group.Create;
+import com.mmc.iuav.group.Update;
+import io.swagger.annotations.ApiModelProperty;
+import jdk.nashorn.internal.runtime.Debug;
+import lombok.*;
+import org.springframework.validation.annotation.Validated;
+
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import java.util.List;
+
+/**
+ * @Author small
+ * @Date 2023/7/13 16:07
+ * @Version 1.0
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class LicenseOrganizationsVO {
+    private static final long serialVersionUID = -5814724843819090363L;
+    @ApiModelProperty(value = "机构id", example = "1")
+    @NotNull(message = "机构id", groups = Update.class)
+    private Integer id;
+
+    @ApiModelProperty(value = "机构主图不能为空", example = "http://", required = true)
+    @NotBlank(message = "机构主图不能为空", groups = {Create.class, Update.class})
+    private String mainImage;
+
+    @ApiModelProperty(value = "机构副图不能为空", example = "http://", required = true)
+    //@NotBlank(message = "机构副图不能为空", groups = {Create.class, Update.class})
+    private String auxiliaryPicture;
+
+    @ApiModelProperty(value = "机构视频", example = "http://")
+    private String video;
+
+    @ApiModelProperty(value = "机构名称不能为空", example = "科比特智能教育", required = true)
+    @NotBlank(message = "机构名称不能为空", groups = {Create.class, Update.class})
+    @Size(max = 25, message = "机构名称不能超过25个字符")
+    private String name;
+
+    @ApiModelProperty(value = "机构地区编号", example = "110000,130100", required = true)
+    @NotBlank(message = "机构地区不能为空", groups = {Create.class, Update.class})
+    private String region;
+
+    @ApiModelProperty(value = "机构地区名称", example = "河北省,石家庄市", required = false)
+    //@NotBlank(message = "机构地区名称", groups = {Create.class, Update.class})
+    private String regionName;
+
+    @ApiModelProperty(value = "经度", example = "40.892313123", required = true)
+    private Double longitude;
+
+    @ApiModelProperty(value = "纬度", example = "50.892313123", required = true)
+    private Double latitude;
+
+    @ApiModelProperty(value = "机构详细地址", example = "南山区", required = false)
+    //@NotBlank(message = "机构详细地址不能为空", groups = {Create.class, Update.class})
+    private String detailedAddress;
+
+
+    @ApiModelProperty(value = "是否是考点机构 0否 1是", example = "0", required = true)
+    @NotNull(message = "考点机构不能为空 0否 1是", groups = {Create.class, Update.class})
+    private Integer testCenter;
+
+    @ApiModelProperty(value = "机构规模id不能为空", example = "1")
+    //@NotNull(message = "机构规模id不能为空", groups = {Create.class, Update.class})
+    // @Size(max = 4, message = "机构规模id不能超过4", groups = {Create.class, Update.class})
+    @Max(value = 4,  groups = {Create.class, Update.class},message = "机构规模id不能超过4")
+    private Integer scaleId;
+
+    @ApiModelProperty(value = "机构描述", example = "机构描述0001")
+    //@NotNull(message = "机构描述", groups = {Create.class, Update.class})
+    private String description;
+
+    @ApiModelProperty(value = "机构详情", example = "机构详情0001", required = true)
+    @NotNull(message = "机构详情", groups = {Create.class, Update.class})
+    private String detail;
+
+    @ApiModelProperty(value = "后台用户id")
+    private Integer backUserId;
+
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/client/ImsClient.java

+package com.mmc.iuav.user.client;
+
+
+import com.alibaba.fastjson2.JSONArray;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.alibaba.fastjson2.JSONObject;
+import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.entity.CompanyInfoDO;
+import com.mmc.iuav.user.model.vo.LicenseOrganizationsVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.alibaba.fastjson2.JSON.parseObject;
+
+@Component
+public class ImsClient {
+
+    @Value("${iuav.ims.uri}")
+    private String imsAppUri;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    public ResultBody insertOrganizations(CompanyInfoDO companyInfoDO, String token,Integer backUserId){
+        LicenseOrganizationsVO licenseOrganizationsVO = companyInfoDO.buildLicenseOrganizationsVO();
+        licenseOrganizationsVO.setDetail("无");
+        licenseOrganizationsVO.setTestCenter(0);
+        licenseOrganizationsVO.setBackUserId(backUserId);
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.add("token", token);
+
+        HttpEntity<String> entity = new HttpEntity<>(JSONObject.toJSONString(licenseOrganizationsVO), headers);
+        ResponseEntity<ResultBody> responseEntity = restTemplate.exchange(imsAppUri + "/release/licence/background/insertOrg", HttpMethod.POST, entity, ResultBody.class);
+        return responseEntity.getBody();
+    }
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/CooperationController.java

@@ -14,6 +14,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -126,8 +127,8 @@ public class CooperationController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("approvalApplyTag")
     public ResultBody approvalApplyTag(
-            @RequestParam(value = "id") Integer id, @RequestParam(value = "status") Boolean status) {
-        return cooperationService.approvalApplyTag(id, status);
+            @RequestParam(value = "id") Integer id, @RequestParam(value = "status") Boolean status,HttpServletRequest request){
+        return cooperationService.approvalApplyTag(id, status , request.getHeader("token"));
     }
 
     @ApiOperation(value = "app-获取合同标签")

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/CompanyInfoDO.java

@@ -3,6 +3,7 @@ package com.mmc.iuav.user.entity;
 import com.mmc.iuav.user.model.vo.ApplyTagEditVO;
 import com.mmc.iuav.user.model.vo.CompanyAuthVO;
 import com.mmc.iuav.user.model.vo.CompanyInfoVO;
+import com.mmc.iuav.user.model.vo.LicenseOrganizationsVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -80,6 +81,15 @@ public class CompanyInfoDO implements Serializable {
         return CompanyAuthVO.builder().id(this.id).companyName(this.companyName).creditCode(this.creditCode).licenseImg(this.licenseImg).build();
     }
 
+    public LicenseOrganizationsVO buildLicenseOrganizationsVO() {
+        return LicenseOrganizationsVO.builder()
+                .latitude(this.lat)
+                .longitude(this.lon)
+                .name(this.companyName)
+                .mainImage(this.brandLogo)
+                .build();
+    }
+
     public CompanyInfoDO(CompanyInfoVO companyInfo) {
         this.id = companyInfo.getId();
         this.companyType = companyInfo.getCompanyType();

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/enums/RoleEnums.java

@@ -11,8 +11,9 @@ public enum RoleEnums {
     FINANCIAL(3, "财务管理员"),
     FRANCHISEE(4, "加盟商"),
     SERVICE_FRANCHISEE(5, "服务管理员"),
-    LEASE_FRANCHISEE(6, "租赁供应商");
+    LEASE_FRANCHISEE(6, "租赁供应商"),
 
+    Fly_Train(7 ,"飞手培训机构");
     RoleEnums(Integer id, String roleName) {
         this.id = id;
         this.roleName = roleName;

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/CooperationService.java

@@ -7,6 +7,7 @@ import com.mmc.iuav.user.model.qo.ApplyQO;
 import com.mmc.iuav.user.model.qo.CompanyInfoQO;
 import com.mmc.iuav.user.model.vo.*;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -52,7 +53,7 @@ public interface CooperationService {
 
     ResultBody applyTagDetails(Integer id, Integer userAccountId);
 
-    ResultBody approvalApplyTag(Integer id, Boolean status);
+    ResultBody approvalApplyTag(Integer id, Boolean status,String token);
 
     ResultBody getTagIdByUserId(Integer userAccountId);
     ResultBody getContractNoAndStatus(Integer tagId, Integer userAccountId);

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/BackUserAccountServiceImpl.java

@@ -86,6 +86,7 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
             }
         }
         backUserAccountDao.insertBackUserAccount(backUserAccountDO);
+        bUserAccountVO.setId(backUserAccountDO.getId());
         // 添加角色
         roleDao.insertUserRoleRel(backUserAccountDO.getId(), bUserAccountVO.getRoleId());
         // 添加单位信息

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CooperationServiceImpl.java

@@ -7,6 +7,7 @@ import com.mmc.iuav.http.BizException;
 import com.mmc.iuav.page.PageResult;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.response.ResultEnum;
+import com.mmc.iuav.user.client.ImsClient;
 import com.mmc.iuav.user.constant.fdd.FddConstant;
 import com.mmc.iuav.user.dao.CompanyAuthDao;
 import com.mmc.iuav.user.dao.CompanyDao;
@@ -28,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.IOException;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -54,6 +56,9 @@ public class CooperationServiceImpl implements CooperationService {
     @Autowired
     private CompanyDao companyDao;
 
+    @Autowired
+    private ImsClient imsClient;
+
     @Override
     public List<CooperationTagVO> listTag() {
         List<CooperationTagDO> list = cooperationDao.listTags();
@@ -194,7 +199,7 @@ public class CooperationServiceImpl implements CooperationService {
 
     @Transactional
     @Override
-    public ResultBody approvalApplyTag(Integer id, Boolean status) {
+    public ResultBody approvalApplyTag(Integer id, Boolean status,String token){
         // 判断用户是否已经是该渠道
         UserApplyTagDO userApplyTag = cooperationDao.getUserApplyTag(id);
         int count =
@@ -219,6 +224,11 @@ public class CooperationServiceImpl implements CooperationService {
                 throw new BizException(ResultEnum.COOPERATION_CHECK_NOT_PASS_ERROR);
             }
             SmsUtil.sendPassCooperationApply(bUserAccountVO.getPhoneNum());
+            //如果加盟商是培训机构还要生成这个培训机构的基本信息
+            if(userApplyTag.getCooperationTagId() == 4) {
+                log.info("飞手培训机构信息 =====》,{}",userApplyTag.getCompanyInfoDO());
+                return imsClient.insertOrganizations(userApplyTag.getCompanyInfoDO(),token,bUserAccountVO.getId());
+            }
         } else {
             SmsUtil.sendNotPassCooperationApply(account.getPhoneNum());
             cooperationDao.updateApplyTagStatus(id, 2);
@@ -253,7 +263,10 @@ public class CooperationServiceImpl implements CooperationService {
             bUserAccountVO.setRoleId(RoleEnums.LEASE_FRANCHISEE.getId());
         } else if (userApplyTagDO.getCooperationTagId().equals(5)) {
             bUserAccountVO.setRoleId(RoleEnums.SERVICE_FRANCHISEE.getId());
-        } else {
+        } else if (userApplyTagDO.getCooperationTagId().equals(4)) {
+            bUserAccountVO.setRoleId(RoleEnums.Fly_Train.getId());
+        }
+        else {
             bUserAccountVO.setRoleId(RoleEnums.FRANCHISEE.getId());
         }
         // 添加单位id

csm-service/cms-service-user/src/main/resources/application-dev.yml

@@ -38,12 +38,12 @@ spring:
   #        login-password: druid
   redis:
     database: 1
-    host: redis.default
+    host: 172.24.1.207
     password: ${REDIS_PASSWORD}
     port: 6379
   #rabbitMQ
   rabbitmq:
-    host: amqp-cn-zvp2ozhnj001.cn-shenzhen.amqp-0.vpc.mq.amqp.aliyuncs.com
+    host: 172.24.1.207
     port: 5672
     username: MjphbXFwLWNuLXp2cDJvemhuajAwMTpMVEFJNEZ6Q3B5ckEzM1BlZ254V1M2WFY=
     password: ${RABBITMQ_PASSWORD}

csm-service/cms-service-user/src/main/resources/application-local.yml

@@ -10,9 +10,8 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
   redis:
     database: 1
-    host: 8.139.4.51
+    host: 127.0.0.1
     port: 6379
-    password: MMC@2022&REDIS
   #rabbitMQ
   rabbitmq:
     host: 8.139.4.51

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: e36e70dcfb1edeed8a4c36747058ee68a92b0bfe
+  newTag: 7014c0f4759c385c47536425de2eba8af240d338