Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/flyer/vo/RegistrationVO.java

@@ -18,6 +18,8 @@ import java.util.List;
 @AllArgsConstructor
 public class RegistrationVO implements Serializable {
     private static final long serialVersionUID = -3364708963790356041L;
+    @ApiModelProperty(value = "模拟用户id（后面从token获取，临时传下）")
+    private Integer id;
     @ApiModelProperty(value = "姓名")
     private String name;
     @ApiModelProperty(value = "城市")

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 41b7c2796a4725d6e4455fa4c9672fa411b3fb3c
+  newTag: cf075ff8f7b24e87f2697d4d78c3493a6e164adc

release-service/src/main/java/com/mmc/csf/release/controller/FlyerTrainingController.java

@@ -29,8 +29,8 @@ public class FlyerTrainingController {
     @ApiOperation(value = "飞手报名")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("/pilotRegistration")
-    public ResultBody pilotRegistration(@RequestBody RegistrationVO registrationVO, @ApiParam(value = "模拟用户id") Integer id) {
-        return flyerTrainingService.pilotRegistration(registrationVO, id);
+    public ResultBody pilotRegistration(@RequestBody RegistrationVO registrationVO) {
+        return flyerTrainingService.pilotRegistration(registrationVO);
     }
 
 

release-service/src/main/java/com/mmc/csf/release/service/FlyerTrainingService.java

@@ -18,7 +18,7 @@ public interface FlyerTrainingService {
      * @param id             id
      * @return {@link ResultBody}
      */
-    ResultBody pilotRegistration(RegistrationVO registrationVO, Integer id);
+    ResultBody pilotRegistration(RegistrationVO registrationVO);
 
     /**
      * 获取无人机飞行员执照

release-service/src/main/java/com/mmc/csf/release/service/impl/FlyerTrainingServiceImpl.java

 package com.mmc.csf.release.service.impl;
 
 import com.mmc.csf.common.util.page.PageResult;
-import com.mmc.csf.release.dao.FlyerTrainingDao;
 import com.mmc.csf.common.util.web.ResultBody;
+import com.mmc.csf.release.dao.FlyerTrainingDao;
 import com.mmc.csf.release.entity.CurriculumInfoDO;
 import com.mmc.csf.release.entity.FlightSkillsDO;
-import com.mmc.csf.release.entity.InspectionDO;
 import com.mmc.csf.release.entity.PilotRegistrationDO;
 import com.mmc.csf.release.flyer.qo.CurriculumQo;
 import com.mmc.csf.release.flyer.vo.CurriculumInfoVO;
-import com.mmc.csf.release.service.FlyerTrainingService;
 import com.mmc.csf.release.flyer.vo.DronePilotLicenseVO;
 import com.mmc.csf.release.flyer.vo.RegistrationVO;
-import com.mmc.csf.release.task.vo.TaskServiceVO;
+import com.mmc.csf.release.service.FlyerTrainingService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
@@ -35,8 +33,8 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
     private FlyerTrainingDao flyerTrainingDao;
 
     @Override
-    public ResultBody pilotRegistration(RegistrationVO registrationVO, Integer id) {
-        PilotRegistrationDO pilotRegistrationDO = new PilotRegistrationDO(registrationVO, id);
+    public ResultBody pilotRegistration(RegistrationVO registrationVO) {
+        PilotRegistrationDO pilotRegistrationDO = new PilotRegistrationDO(registrationVO,registrationVO.getId());
         if (CollectionUtils.isNotEmpty(registrationVO.getIndustryAppAuth())) {
             // 将行业应用认证的id用逗号拼接
             String industryAppAuth = registrationVO.getIndustryAppAuth().stream().map(Object::toString).collect(Collectors.joining(","));