Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/ims into develop

.github/workflows/alibabacloud.yml → .github/workflows/develop.yml

@@ -7,13 +7,13 @@ on:
 env:
   REGION_ID: cn-shenzhen
   REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
-  NAMESPACE: sharefly
+  NAMESPACE: sharefly-dev
   IMAGE: ims
   TAG: ${{ github.sha }}
 
   ACR_EE_REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
   ACR_EE_INSTANCE_ID: cri-yhk5zgfc2v1sia6l
-  ACR_EE_NAMESPACE: sharefly
+  ACR_EE_NAMESPACE: sharefly-dev
   ACR_EE_IMAGE: ims
   ACR_EE_TAG: ${{ github.sha }}
   JAVA_VERSION: '8'
@@ -62,5 +62,5 @@ jobs:
           git config user.name "Chuck"
           git config user.email "Chuck@users.noreply.github.com"
           git remote set-url origin "$GITLAB_URL"
-          git commit -am "generated Image update"
+          git commit -am "Generated Image New Tag"
           git push origin develop
\ No newline at end of file

.github/workflows/master.yml

+name: Build and Push to ACR
+
+on:
+  push:
+    branches: [ "master" ]
+
+env:
+  REGION_ID: cn-shenzhen
+  REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
+  NAMESPACE: sharefly
+  IMAGE: ims
+  TAG: ${{ github.sha }}
+
+  ACR_EE_REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
+  ACR_EE_INSTANCE_ID: cri-yhk5zgfc2v1sia6l
+  ACR_EE_NAMESPACE: sharefly
+  ACR_EE_IMAGE: ims
+  ACR_EE_TAG: ${{ github.sha }}
+  JAVA_VERSION: '8'
+  GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/ims.git
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    environment: prod
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{env.JAVA_VERSION}}
+
+      - name: Login to ACR EE with the AccessKey pair
+        uses: aliyun/acr-login@v1
+        with:
+          login-server: "https://${{ env.ACR_EE_REGISTRY }}"
+          region-id: "${{ env.REGION_ID }}"
+          username: "QD--KeBiTeHangKong@1354706964800968"
+          password: "MMC@2023&ACR"
+          instance-id: "${{ env.ACR_EE_INSTANCE_ID }}"
+
+      - name: Build and push image to ACR EE
+        run: |
+          mvn clean package
+          docker build -t "$ACR_EE_REGISTRY/$ACR_EE_NAMESPACE/$ACR_EE_IMAGE:$TAG" .
+          docker push "$ACR_EE_REGISTRY/$ACR_EE_NAMESPACE/$ACR_EE_IMAGE:$TAG"
+
+      - name: Kustomize Set Image
+        run: |-
+          cd kustomization/overlays/prod
+          curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"  | bash /dev/stdin 3.8.6
+          ./kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
+
+      - name: Commit and Push
+        run: |
+          git config user.name "Chuck"
+          git config user.email "Chuck@users.noreply.github.com"
+          git remote set-url origin "$GITLAB_URL"
+          git commit -am "Generated Image New Tag"
+          git push origin master
\ No newline at end of file

.gitignore

@@ -6,4 +6,4 @@ target
 .settings
 .idea
 *.iml
-*/application.yml
+*/application.yml
\ No newline at end of file

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/task/vo/IndustryVO.java

+package com.mmc.csf.release.task.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author 作者 LW
+ * @version 创建时间：2023年5月19日 上午9:56:04
+ * @explain 行业-数据载体类
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class IndustryVO implements Serializable{
+	private static final long serialVersionUID = -7659647039766377385L;
+	private Integer id;
+	private String industryIcon;
+	private String name;
+	private String shortName;
+	private Integer industryType;
+	private String propagate1;
+	private String propagate2;
+	private String image;
+	private String video;
+}

kustomization/base/deployment.yaml

@@ -18,7 +18,7 @@ spec:
           image: REGISTRY/NAMESPACE/IMAGE:TAG
           resources:
             limits:
-              memory: 2048Mi
+              memory: 4096Mi
               cpu: 100m
           ports:
             - containerPort: 10001

kustomization/overlays/dev/kustomization.yaml

@@ -10,8 +10,11 @@ commonAnnotations:
   note: This is dev!
 patches:
 - path: ./configMap.yaml
-- path: ./service.yaml
+- path: ./service-patch.yaml
+  target:
+    kind: Service
+    name: ims-svc
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
-  newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/ims
-  newTag: 109477f7d1e12814d3d28600cda6c90e3ce66713
+  newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
+  newTag: 9cb0bc4d66c050ad8e137d75e5c8dcb87ee09b59

kustomization/overlays/dev/service-patch.yaml

+- op: replace
+  path: /spec/ports/0/nodePort
+  value: 30002
\ No newline at end of file

kustomization/overlays/dev/service.yaml

-apiVersion: v1
-kind: Service
-metadata:
-  name: ims-svc
-  namespace: default
-spec:
-  selector:
-    app: ims
-  type: NodePort
-  ports:
-    - protocol: TCP
-      port: 10001
-      nodePort: 30001
\ No newline at end of file

kustomization/overlays/prod/configMap.yaml

@@ -3,4 +3,4 @@ kind: ConfigMap
 metadata:
   name: ims-map
 data:
-  SPRING_PROFILES_ACTIVE: prod
+  SPRING_PROFILES_ACTIVE: dev
\ No newline at end of file

kustomization/overlays/prod/kustomization.yaml

 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../base
+- ../../base
 namespace: prod
 #namePrefix: prod-
 commonLabels:
@@ -9,4 +9,12 @@ commonLabels:
 commonAnnotations:
   note: This is prod!
 patches:
-  - configMap.yaml
+- path: configMap.yaml
\ No newline at end of file
+- path: service-patch.yaml
+  target:
+    kind: Service
+    name: ims-svc
+images:
+- name: REGISTRY/NAMESPACE/IMAGE:TAG
+  newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/ims
+  newTag: d39b5a94225527270920384fde1448bbe58a61c3

kustomization/overlays/prod/service-patch.yaml

+- op: replace
+  path: /spec/ports/0/nodePort
+  value: 30001
\ No newline at end of file

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

@@ -56,4 +56,11 @@ public class FlyerTrainingController {
     public ResultBody queryCurriculumInfoList(@RequestBody CurriculumQo curriculumQo) {
         return ResultBody.success(flyerTrainingService.queryCurriculumInfoList(curriculumQo));
     }
+
+    @ApiOperation(value = "考证-技能")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CurriculumInfoVO.class)})
+    @GetMapping("/licenseOrSkillQueryCurriculum")
+    public ResultBody licenseOrSkillQueryCurriculum(@ApiParam(value = "考证/技能 0：考证 1：技能") @RequestParam(value = "type") Integer type) {
+        return flyerTrainingService.licenseOrSkillQueryCurriculum(type);
+    }
 }

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

@@ -2,9 +2,11 @@ package com.mmc.csf.release.controller;
 
 import com.mmc.csf.common.util.group.Create;
 import com.mmc.csf.common.util.web.ResultBody;
+import com.mmc.csf.release.entity.AppTypeDO;
 import com.mmc.csf.release.forum.vo.DynamicVO;
 import com.mmc.csf.release.service.TaskService;
 import com.mmc.csf.release.task.qo.TaskServiceQo;
+import com.mmc.csf.release.task.vo.IndustryVO;
 import com.mmc.csf.release.task.vo.OrderTaskVO;
 import com.mmc.csf.release.task.vo.TaskServiceDetailVO;
 import com.mmc.csf.release.task.vo.TaskServiceVO;
@@ -48,4 +50,25 @@ public class TaskController {
         return taskService.reservationService(orderTaskVO);
     }
 
+    @ApiOperation(value = "web-小程序-行业列表-全部")
+    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = IndustryVO.class) })
+    @GetMapping("listAllIndustry")
+    public ResultBody listAllIndustry() {
+        return taskService.listAllIndustry();
+    }
+
+    @ApiOperation(value = "web-小程序-应用列表-全部")
+    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = AppTypeDO.class) })
+    @GetMapping("listAllAppType")
+    public ResultBody listAllAppType() {
+        return taskService.listAllAppType();
+    }
+
+    @ApiOperation(value = "web-小程序-作业服务列表-全部")
+    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = TaskServiceVO.class) })
+    @GetMapping("listAllTaskService")
+    public ResultBody listAllTaskService() {
+        return taskService.listAllTaskService();
+    }
+
 }

release-service/src/main/java/com/mmc/csf/release/dao/FlyerTrainingDao.java

@@ -43,4 +43,19 @@ public interface FlyerTrainingDao {
      * @return {@link List}<{@link CurriculumInfoDO}>
      */
     List<CurriculumInfoDO> listPageCurriculumInfo(CurriculumQo curriculumQo);
+
+    /**
+     * 查询考证视频
+     *
+     * @return {@link List}<{@link CurriculumInfoDO}>
+     */
+    List<CurriculumInfoDO> selectLicensesCurriculum();
+
+    /**
+     * 查询技能课程
+     *
+     * @param type 类型
+     * @return {@link List}<{@link CurriculumInfoDO}>
+     */
+    List<CurriculumInfoDO> selectSkillCurriculum(Integer type);
 }

release-service/src/main/java/com/mmc/csf/release/dao/TaskDao.java

 package com.mmc.csf.release.dao;
 
-import com.mmc.csf.release.entity.InspComtDO;
-import com.mmc.csf.release.entity.InspectionDO;
-import com.mmc.csf.release.entity.TaskOrderDO;
+import com.mmc.csf.common.util.web.ResultBody;
+import com.mmc.csf.release.entity.*;
 import com.mmc.csf.release.task.qo.TaskServiceQo;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -70,4 +69,23 @@ public interface TaskDao {
      * @return {@link List}<{@link InspComtDO}>
      */
     List<InspComtDO> getEvaluateInfoList(int size);
+
+    /**
+     * 获取所有行业信息
+     */
+    List<IndustryDO> listAllIndustry();
+
+    /**
+     * 列出所有应用程序类型
+     *
+     * @return {@link List}<{@link AppTypeDO}>
+     */
+    List<AppTypeDO> listAllAppType();
+
+    /**
+     * 列出所有任务服务
+     *
+     * @return {@link List}<{@link InspectionDO}>
+     */
+    List<InspectionDO> listAllTaskService();
 }

release-service/src/main/java/com/mmc/csf/release/entity/AppTypeDO.java

+package com.mmc.csf.release.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 应用类型表(AppTypeDO)实体类
+ *
+ * @author makejava
+ * @since 2023-05-19 10:01:54
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AppTypeDO implements Serializable {
+    private static final long serialVersionUID = -33771594030748645L;
+    
+    private Integer id;
+    /**
+     * 应用名称
+     */
+    private String appName;
+    
+    private Date createTime;
+
+
+}
+

release-service/src/main/java/com/mmc/csf/release/entity/IndustryDO.java

+package com.mmc.csf.release.entity;
+
+import com.mmc.csf.release.task.vo.IndustryVO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 行业管理(IndustryDO)实体类
+ *
+ * @author makejava
+ * @since 2023-05-19 09:51:16
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class IndustryDO implements Serializable {
+    private static final long serialVersionUID = -43925052782251392L;
+    
+    private Integer id;
+    /**
+     * 行业名称
+     */
+    private String name;
+    /**
+     * 行业图标
+     */
+    private String industryIcon;
+    /**
+     * 简称
+     */
+    private String shortName;
+    /**
+     * 0飞行服务，1个人服务，2设备售卖，3设备租赁，4设备返祖
+     */
+    private Integer industryType;
+    /**
+     * 行业宣传语1
+     */
+    private String propagate1;
+    /**
+     * 行业宣传语2
+     */
+    private String propagate2;
+    /**
+     * 图片地址
+     */
+    private String image;
+    /**
+     * 视频地址
+     */
+    private String video;
+    /**
+     * 是否删除  0 未删除  1 删除
+     */
+    private Integer del;
+    
+    private Date updateTime;
+    
+    private Date addTime;
+    /**
+     * 行业编号
+     */
+    private String number;
+    
+    private Integer sort;
+    /**
+     * 是否上架   1上架  0下架
+     */
+    private Integer shelf;
+    /**
+     * 是否是演示专用行业：0：否 1：是
+     */
+    private Integer demons;
+
+
+    public IndustryVO buildIndustryVO(){
+        return IndustryVO.builder()
+                .id(this.id)
+                .industryIcon(this.industryIcon)
+                .name(this.name)
+                .shortName(this.shortName)
+                .industryType(this.industryType)
+                .propagate1(this.propagate1)
+                .propagate2(this.propagate2)
+                .image(this.image)
+                .video(this.video).build();
+    }
+
+
+}
+

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

@@ -41,4 +41,12 @@ public interface FlyerTrainingService {
      * @return {@link Object}
      */
     PageResult queryCurriculumInfoList(CurriculumQo taskServiceQo);
+
+    /**
+     * 许可证或技能查询课程
+     *
+     * @param type 类型
+     * @return {@link ResultBody}
+     */
+    ResultBody licenseOrSkillQueryCurriculum(Integer type);
 }

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

@@ -8,31 +8,52 @@ import com.mmc.csf.release.task.vo.TaskServiceDetailVO;
 
 /**
  * @Author LW
- * @date 2023/5/17 13:56
- * 概要：
+ *
+ * @date 2023/5/17 13:56 概要：
  */
 public interface TaskService {
-    /**
-     * 查询任务服务列表
-     *
-     * @param taskServiceQo 任务服务
-     * @return {@link ResultBody}
-     */
-    PageResult queryTaskServiceList(TaskServiceQo taskServiceQo);
+  /**
+   * 查询任务服务列表
+   *
+   * @param taskServiceQo 任务服务
+   * @return {@link ResultBody}
+   */
+  PageResult queryTaskServiceList(TaskServiceQo taskServiceQo);
 
-    /**
-     * 通过id获取服务详情
-     *
-     * @param id id
-     * @return {@link ResultBody}<{@link TaskServiceDetailVO}>
-     */
-    ResultBody<TaskServiceDetailVO> getInspectionById(Integer id);
+  /**
+   * 通过id获取服务详情
+   *
+   * @param id id
+   * @return {@link ResultBody}<{@link TaskServiceDetailVO}>
+   */
+  ResultBody<TaskServiceDetailVO> getInspectionById(Integer id);
 
-    /**
-     * 预订服务
-     *
-     * @param orderTaskVO 订单任务
-     * @return {@link ResultBody}
-     */
-    ResultBody reservationService(OrderTaskVO orderTaskVO);
+  /**
+   * 预订服务
+   *
+   * @param orderTaskVO 订单任务
+   * @return {@link ResultBody}
+   */
+  ResultBody reservationService(OrderTaskVO orderTaskVO);
+
+  /**
+   * 列出所有行业
+   *
+   * @return {@link ResultBody}
+   */
+  ResultBody listAllIndustry();
+
+  /**
+   * 列出所有应用程序类型
+   *
+   * @return {@link ResultBody}
+   */
+  ResultBody listAllAppType();
+
+  /**
+   * 列出所有任务服务
+   *
+   * @return {@link ResultBody}
+   */
+  ResultBody listAllTaskService();
 }

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

@@ -93,4 +93,18 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
         List<CurriculumInfoVO> list = curriculumList.stream().map(CurriculumInfoDO::buildCurriculumInfoVO).collect(Collectors.toList());
         return PageResult.buildPage(pageNo, curriculumQo.getPageSize(), count, list);
     }
+
+
+    @Override
+    public ResultBody licenseOrSkillQueryCurriculum(Integer type) {
+        List<CurriculumInfoDO> curriculumInfoList;
+        if (type == 0) {
+            // 表示查询考证的
+            curriculumInfoList = flyerTrainingDao.selectLicensesCurriculum();
+        } else {
+            curriculumInfoList = flyerTrainingDao.selectSkillCurriculum(type);
+        }
+        return ResultBody.success(curriculumInfoList == null ? null : curriculumInfoList.stream()
+                .map(CurriculumInfoDO::buildCurriculumInfoVO).collect(Collectors.toList()));
+    }
 }

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

@@ -8,11 +8,13 @@ import com.mmc.csf.common.util.redis.RedisConstant;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.common.util.web.ResultEnum;
 import com.mmc.csf.release.dao.TaskDao;
+import com.mmc.csf.release.entity.IndustryDO;
 import com.mmc.csf.release.entity.InspComtDO;
 import com.mmc.csf.release.entity.InspectionDO;
 import com.mmc.csf.release.entity.TaskOrderDO;
 import com.mmc.csf.release.service.TaskService;
 import com.mmc.csf.release.task.qo.TaskServiceQo;
+import com.mmc.csf.release.task.vo.IndustryVO;
 import com.mmc.csf.release.task.vo.OrderTaskVO;
 import com.mmc.csf.release.task.vo.TaskServiceDetailVO;
 import com.mmc.csf.release.task.vo.TaskServiceVO;
@@ -37,6 +39,7 @@ public class TaskServiceImpl implements TaskService {
     private TaskDao taskDao;
     @Autowired
     private RedisTemplate redisTemplate;
+
     @Override
     public PageResult queryTaskServiceList(TaskServiceQo taskServiceQo) {
         Integer SZ = 440300;
@@ -70,11 +73,11 @@ public class TaskServiceImpl implements TaskService {
             int size = (int) (100 * Math.random() + 98);
             List<InspComtDO> evaluateInfoList = taskDao.getEvaluateInfoList(size);
             String toJSONString = JSONObject.toJSONString(evaluateInfoList);
-            redisTemplate.opsForValue().set(key,toJSONString ,2L, TimeUnit.DAYS);
+            redisTemplate.opsForValue().set(key, toJSONString, 2L, TimeUnit.DAYS);
             taskServiceDetailVO.setEvaluateInfo(evaluateInfoList.stream().map(InspComtDO::buildEvaluateInfoVO).collect(Collectors.toList()));
             taskServiceDetailVO.setItem(evaluateInfoList.size());
-        }else {
-            String listStr  = (String) redisTemplate.opsForValue().get(key);
+        } else {
+            String listStr = (String) redisTemplate.opsForValue().get(key);
             List<InspComtDO> array = JSONArray.parseArray(listStr, InspComtDO.class);
             taskServiceDetailVO.setEvaluateInfo(array.stream().map(InspComtDO::buildEvaluateInfoVO).collect(Collectors.toList()));
             taskServiceDetailVO.setItem(array.size());
@@ -85,7 +88,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     public ResultBody reservationService(OrderTaskVO orderTaskVO) {
         Integer count = taskDao.getIndustryAndInspect(orderTaskVO.getIndustryId(), orderTaskVO.getInspectionId());
-        if (count == 0 ) {
+        if (count == 0) {
             return ResultBody.error(ResultEnum.INSPECTION_NOT_EXIST);
         }
         InspectionDO inspectionDO = taskDao.getInspectionById(orderTaskVO.getInspectionId());
@@ -93,8 +96,8 @@ public class TaskServiceImpl implements TaskService {
             return ResultBody.error(ResultEnum.INSPECTION_NOT_EXIST);
         }
         TaskOrderDO taskOrderDo = new TaskOrderDO(orderTaskVO);
-        if (CollectionUtils.isNotEmpty(orderTaskVO.getFilePath())){
-            taskOrderDo.setImageUrl(String.join(",",orderTaskVO.getFilePath()));
+        if (CollectionUtils.isNotEmpty(orderTaskVO.getFilePath())) {
+            taskOrderDo.setImageUrl(String.join(",", orderTaskVO.getFilePath()));
         }
         taskOrderDo.setUserAccountId(1);
         taskOrderDo.defaultInfo();
@@ -103,4 +106,26 @@ public class TaskServiceImpl implements TaskService {
         taskDao.insertOrderTask(taskOrderDo);
         return ResultBody.success();
     }
+
+
+    @Override
+    public ResultBody listAllIndustry() {
+        //查找所有服务
+        List<IndustryVO> collect = taskDao.listAllIndustry()
+                .stream().map(IndustryDO::buildIndustryVO)
+                .collect(Collectors.toList());
+        return ResultBody.success(collect);
+    }
+
+    @Override
+    public ResultBody listAllAppType() {
+
+        return ResultBody.success(taskDao.listAllAppType());
+    }
+
+    @Override
+    public ResultBody listAllTaskService() {
+        List<InspectionDO> inspectionList = taskDao.listAllTaskService();
+        return ResultBody.success(inspectionList.stream().map(InspectionDO::buildTaskService).collect(Collectors.toList()));
+    }
 }

release-service/src/main/resources/mapper/flyer/FlyerTrainingDao.xml

@@ -64,4 +64,32 @@
         order by ci.create_time desc
         LIMIT #{pageNo},#{pageSize}
     </select>
+    <select id="selectLicensesCurriculum" resultType="com.mmc.csf.release.entity.CurriculumInfoDO">
+        SELECT ci.id,
+               ci.curriculum_name,
+               ci.supplier_id,
+               ci.curriculum_price,
+               ci.curriculum_desc,
+               ci.is_free        free,
+               ci.drone_pilot_license_id,
+               ci.flight_skills,
+               cv.curriculum_url videoUrl
+        from curriculum_info ci
+                 INNER JOIN curriculum_video cv ON ci.id = cv.curriculum_info_id
+        where ci.drone_pilot_license_id is not null
+    </select>
+    <select id="selectSkillCurriculum" resultType="com.mmc.csf.release.entity.CurriculumInfoDO">
+        SELECT ci.id,
+               ci.curriculum_name,
+               ci.supplier_id,
+               ci.curriculum_price,
+               ci.curriculum_desc,
+               ci.is_free        free,
+               ci.drone_pilot_license_id,
+               ci.flight_skills,
+               cv.curriculum_url videoUrl
+        from curriculum_info ci
+                 INNER JOIN curriculum_video cv ON ci.id = cv.curriculum_info_id
+        where ci.flight_skills is not null
+    </select>
 </mapper>
\ No newline at end of file

release-service/src/main/resources/mapper/work/TaskDao.xml

@@ -105,4 +105,41 @@
         FROM insp_comt
         ORDER BY RAND() LIMIT #{size}
     </select>
+
+    <select id="listAllIndustry" resultType="com.mmc.csf.release.entity.IndustryDO">
+        select
+        i.id,i.name,i.short_name,i.industry_type,i.number,i.propagate1,i.propagate2,i.image,i.video,i.sort,i.is_shelf,i.industry_icon
+        from industry i
+        <where>
+            i.is_del = 0 and is_shelf = 1
+        </where>
+        order by i.sort ASC
+    </select>
+    <select id="listAllAppType" resultType="com.mmc.csf.release.entity.AppTypeDO">
+        select id,
+               app_name,
+               create_time
+        from app_type
+    </select>
+    <select id="listAllTaskService" resultType="com.mmc.csf.release.entity.InspectionDO">
+        select i.id,
+               i.name,
+               i.service_type,
+               i.limit_active,
+               i.work_type_id,
+               i.light_spot,
+               i.number,
+               i.video,
+               i.image,
+               i.sort,
+               i.is_shelf,
+               i.content,
+               i.order_num,
+               i.is_del,
+               i.fake_num,
+               i.card_img,
+               i.is_show_code
+        from inspection i
+        where i.is_del = 0 and i.is_shelf = 1
+    </select>
 </mapper>
\ No newline at end of file