Merge branch 'develop' of http://git.mmcuav.cn/iuav/cms into develop

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/TeamMessageDO.java

+package com.mmc.iuav.user.model.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author han
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TeamMessageDO{
+    /**
+     * 飞手ID
+     */
+    private Integer pilotId;
+    /**
+     * 飞手的用户ID
+     */
+    private Integer pilotUserId;
+    /**
+     * 飞手的团队管理员ID
+     */
+    private Integer pilotMessageId;
+}

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

@@ -5,7 +5,7 @@ import com.mmc.iuav.group.Page;
 import com.mmc.iuav.group.Update;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.controller.BaseController;
-import com.mmc.iuav.user.entity.dronepilot.PilotCertificationDO;
+import com.mmc.iuav.user.model.dto.TeamMessageDO;
 import com.mmc.iuav.user.model.dto.RoleInfoDTO;
 import com.mmc.iuav.user.model.dto.dronepilot.*;
 import com.mmc.iuav.user.model.qo.dronepilot.*;
@@ -13,7 +13,6 @@ import com.mmc.iuav.user.model.vo.CompanyInfoVO;
 import com.mmc.iuav.user.model.vo.PilotAuditSumVO;
 import com.mmc.iuav.user.model.vo.dronepilot.PilotCertificationVO;
 import com.mmc.iuav.user.service.dronepilot.PilotCertificationService;
-import com.sun.xml.bind.v2.TODO;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -201,4 +200,11 @@ public class PilotCertificationController extends BaseController {
         return certificationService.selectPilotIdList(this.getUserLoginInfoFromRedis(request).getUserAccountId());
     }
 
+    @ApiOperation(value = "查询飞手的团队信息（团队管理员的ID）")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = TeamMessageDO.class)})
+    @GetMapping("/selectPilotTeam")
+    public TeamMessageDO selectPilotTeam(@RequestParam Integer pilotId){
+        return certificationService.selectPilotTeam(pilotId);
+    }
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/dronepilot/PilotCertificationDao.java

@@ -2,10 +2,8 @@ package com.mmc.iuav.user.dao.dronepilot;
 
 import com.mmc.iuav.user.entity.CompanyInfoDO;
 import com.mmc.iuav.user.entity.UserAccountDO;
-import com.mmc.iuav.user.entity.dronepilot.PilotAbilityDO;
-import com.mmc.iuav.user.entity.dronepilot.PilotCertificationDO;
-import com.mmc.iuav.user.entity.dronepilot.PilotCertificationLogDO;
-import com.mmc.iuav.user.entity.dronepilot.PilotReasonDO;
+import com.mmc.iuav.user.entity.dronepilot.*;
+import com.mmc.iuav.user.model.dto.TeamMessageDO;
 import com.mmc.iuav.user.model.dto.dronepilot.FlyingTeam;
 import com.mmc.iuav.user.model.qo.dronepilot.*;
 import com.mmc.iuav.user.model.vo.dronepilot.PilotAbilityVO;
@@ -157,4 +155,9 @@ public interface PilotCertificationDao {
      * @return {@link String}
      */
     String getPilotApplyPhone(Integer pilotId);
+
+    /**
+     * 通过通过飞手ID查询飞手的团队信息
+     */
+    TeamMessageDO selectPilotTeam(Integer pilotId);
 }

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

@@ -2,13 +2,13 @@ package com.mmc.iuav.user.service.dronepilot;
 
 import com.mmc.iuav.page.PageResult;
 import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.model.dto.TeamMessageDO;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.dto.dronepilot.PilotAbilityDTO;
 import com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationDTO;
 import com.mmc.iuav.user.model.dto.dronepilot.PilotCertificationInteriorDTO;
 import com.mmc.iuav.user.model.dto.dronepilot.PilotReasonDTO;
 import com.mmc.iuav.user.model.qo.dronepilot.*;
-import com.mmc.iuav.user.model.vo.CompanyInfoVO;
 import com.mmc.iuav.user.model.vo.dronepilot.PilotCertificationVO;
 
 import java.util.List;
@@ -59,4 +59,9 @@ public interface PilotCertificationService {
     ResultBody deletePilotFromTeam(Integer pilotId);
 
     List<Integer> selectPilotIdList(Integer backUserId);
+
+    /**
+     * 通过通过飞手ID查询飞手的团队信息
+     */
+    TeamMessageDO selectPilotTeam(Integer pilotId);
 }

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

@@ -22,6 +22,7 @@ import com.mmc.iuav.user.entity.dronepilot.*;
 import com.mmc.iuav.user.entity.userpoints.UserPointsDO;
 import com.mmc.iuav.user.entity.userpoints.UserPointsDetails;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
+import com.mmc.iuav.user.model.dto.TeamMessageDO;
 import com.mmc.iuav.user.model.dto.dronepilot.*;
 import com.mmc.iuav.user.model.qo.dronepilot.*;
 import com.mmc.iuav.user.model.vo.CompanyInfoVO;
@@ -680,6 +681,11 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
         return userIdList;
     }
 
+    @Override
+    public TeamMessageDO selectPilotTeam(Integer pilotId) {
+        return certificationDao.selectPilotTeam(pilotId);
+    }
+
     public JSONObject spellMsg(String name, String result){
         JSONObject data=new JSONObject();
 

csm-service/cms-service-user/src/main/resources/mapper/dronepilot/PilotCertificationDao.xml

@@ -524,5 +524,12 @@
         select phone_num from pilot_certification pc left join user_account ua on pc.user_account_id = ua.id
         where pc.id = #{pilotId}
     </select>
+    <select id="selectPilotTeam" resultType="com.mmc.iuav.user.model.dto.TeamMessageDO">
+        SELECT p.id AS pilotId, p.pilot_user_id AS pilotUserId, cm.user_account_id AS pilotMessageId
+        FROM pilot_join_team p
+                 JOIN company_back_user cb ON p.back_user_id = cb.back_user_account_id
+                 JOIN company_member cm ON cb.company_info_id = cm.company_info_id
+        WHERE p.id = #{pilotId};
+    </select>
 
 </mapper>

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: 894d7be623eced6509af2c43ce3cee0eb3485a5b
+  newTag: 514ec5e56c0e94a037f29318695e72fe27053949