Merge remote-tracking branch 'origin/develop' into develop

csf-common/csf-common-model/src/main/java/com/mmc/csf/licence/dto/LicenceGradeDTO.java

+package com.mmc.csf.licence.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author small
+ * @Date 2023/7/13 14:42
+ * @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LicenceGradeDTO {
+
+    private static final long serialVersionUID = -4791023169682602298L;
+    @ApiModelProperty(value = "执照等级id")
+    private Integer id;
+
+
+    @ApiModelProperty(value = "执照等级名称")
+    private String name;
+}

csf-common/csf-common-model/src/main/java/com/mmc/csf/licence/dto/LicenceModelsDTO.java

+package com.mmc.csf.licence.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author small
+ * @Date 2023/7/13 14:45
+ * @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LicenceModelsDTO {
+    private static final long serialVersionUID = -4791023169682602298L;
+    @ApiModelProperty(value = "执照机型id")
+    private Integer id;
+
+
+    @ApiModelProperty(value = "执照机型名称")
+    private String name;
+}

csf-common/csf-common-model/src/main/java/com/mmc/csf/licence/dto/LicenceScaleDTO.java

+package com.mmc.csf.licence.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author small
+ * @Date 2023/7/13 14:46
+ * @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LicenceScaleDTO {
+    private static final long serialVersionUID = -4791023169682602298L;
+    @ApiModelProperty(value = "执照机构规模id")
+    private Integer id;
+    
+    @ApiModelProperty(value = "执照机构规模名称")
+    private String name;
+}

csf-common/csf-common-model/src/main/java/com/mmc/csf/licence/dto/LicenceTypeDTO.java

+package com.mmc.csf.licence.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author small
+ * @Date 2023/7/13 14:46
+ * @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LicenceTypeDTO {
+    private static final long serialVersionUID = -4791023169682602298L;
+    @ApiModelProperty(value = "执照类型id")
+    private Integer id;
+
+
+    @ApiModelProperty(value = "执照类型名称")
+    private String name;
+}

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/ims
-  newTag: a3d3533ec00cf0d1d0cd0b986645e6fe31bbfc5c
+  newTag: 226e4486727b729667062e163dbbf9483dce3405

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

+package com.mmc.csf.release.controller.licence;
+
+import com.mmc.csf.common.util.web.ResultBody;
+import com.mmc.csf.licence.dto.LicenceGradeDTO;
+import com.mmc.csf.licence.dto.LicenceModelsDTO;
+import com.mmc.csf.licence.dto.LicenceScaleDTO;
+import com.mmc.csf.licence.dto.LicenceTypeDTO;
+import com.mmc.csf.release.service.licence.LicenceCommonService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author small
+ * @Date 2023/7/13 14:32
+ * @Version 1.0
+ */
+@Api(tags = {"执照公共下拉列表"})
+@RestController
+@RequestMapping("/licence/pullDown")
+public class LicenceCommonController {
+
+    @Autowired
+    private LicenceCommonService licenceCommonService;
+
+    @ApiOperation(value = "公共——执照等级")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = LicenceGradeDTO.class)})
+    @GetMapping("/licenceGradeList")
+    public ResultBody<LicenceGradeDTO> licenceGradeList() {
+        return licenceCommonService.licenceGradeList();
+    }
+
+    @ApiOperation(value = "公共——执照机型")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = LicenceModelsDTO.class)})
+    @GetMapping("/licenceModelsList")
+    public ResultBody<LicenceModelsDTO> licenceModelsList() {
+        return licenceCommonService.licenceModelsList();
+    }
+
+
+    @ApiOperation(value = "公共——执照类型")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = LicenceModelsDTO.class)})
+    @GetMapping("/licenceTypeList")
+
+    public ResultBody<LicenceTypeDTO> licenceTypeList() {
+        return licenceCommonService.licenceTypeList();
+    }
+
+
+    @ApiOperation(value = "不是公共——新增执照机构规模id")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = LicenceScaleDTO.class)})
+    @GetMapping("/licenceScaleList")
+    public ResultBody<LicenceScaleDTO> licenceScaleList() {
+        return licenceCommonService.licenceScaleList();
+    }
+}

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

+package com.mmc.csf.release.dao.licence;
+
+import com.mmc.csf.release.entity.licence.LicenceGradeDO;
+import com.mmc.csf.release.entity.licence.LicenceModelsDO;
+import com.mmc.csf.release.entity.licence.LicenceScaleDO;
+import com.mmc.csf.release.entity.licence.LicenceTypeDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @Author small
+ * @Date 2023/7/13 14:35
+ * @Version 1.0
+ */
+@Mapper
+public interface LicenceCommonDao {
+    List<LicenceGradeDO> licenceGradeList();
+
+    List<LicenceModelsDO> licenceModelsList();
+
+    List<LicenceTypeDO> licenceTypeList();
+
+    List<LicenceScaleDO> licenceScaleList();
+}

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

+package com.mmc.csf.release.entity.licence;
+
+import com.mmc.csf.licence.dto.LicenceGradeDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author small
+ * @Date 2023/7/13 14:48
+ * @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LicenceGradeDO {
+    private static final long serialVersionUID = -4791023169682602298L;
+    @ApiModelProperty(value = "执照等级id")
+    private Integer id;
+
+
+    @ApiModelProperty(value = "执照等级名称")
+    private String name;
+
+
+    public LicenceGradeDTO licenceGradeDTO() {
+        return LicenceGradeDTO.builder().id(this.id)
+                .name(this.name).build();
+    }
+}

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

+package com.mmc.csf.release.entity.licence;
+
+import com.mmc.csf.licence.dto.LicenceModelsDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author small
+ * @Date 2023/7/13 14:48
+ * @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LicenceModelsDO {
+    private static final long serialVersionUID = -4791023169682602298L;
+    @ApiModelProperty(value = "执照机型id")
+    private Integer id;
+
+
+    @ApiModelProperty(value = "执照机型名称")
+    private String name;
+
+
+    public LicenceModelsDTO licenceModelsDTO() {
+        return LicenceModelsDTO.builder().id(this.id)
+                .name(this.name).build();
+    }
+}

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

+package com.mmc.csf.release.entity.licence;
+
+import com.mmc.csf.licence.dto.LicenceScaleDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author small
+ * @Date 2023/7/13 14:49
+ * @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LicenceScaleDO {
+    private static final long serialVersionUID = -4791023169682602298L;
+    @ApiModelProperty(value = "执照机构规模id")
+    private Integer id;
+
+
+    @ApiModelProperty(value = "执照机构规模名称")
+    private String name;
+
+    public LicenceScaleDTO licenceScaleDTO() {
+        return LicenceScaleDTO.builder().id(this.id)
+                .name(this.name).build();
+    }
+}

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

+package com.mmc.csf.release.entity.licence;
+
+import com.mmc.csf.licence.dto.LicenceTypeDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author small
+ * @Date 2023/7/13 14:49
+ * @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LicenceTypeDO {
+    private static final long serialVersionUID = -4791023169682602298L;
+    @ApiModelProperty(value = "执照类型id")
+    private Integer id;
+
+
+    @ApiModelProperty(value = "执照类型名称")
+    private String name;
+
+    public LicenceTypeDTO licenceTypeDTO() {
+        return LicenceTypeDTO.builder().id(this.id)
+                .name(this.name).build();
+    }
+}

release-service/src/main/java/com/mmc/csf/release/service/licence/LicenceCommonService.java

+package com.mmc.csf.release.service.licence;
+
+import com.mmc.csf.common.util.web.ResultBody;
+
+/**
+ * @Author small
+ * @Date 2023/7/13 14:34
+ * @Version 1.0
+ */
+public interface LicenceCommonService {
+    ResultBody licenceGradeList();
+
+    ResultBody licenceModelsList();
+
+    ResultBody licenceTypeList();
+
+    ResultBody licenceScaleList();
+}

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

+package com.mmc.csf.release.service.licence.impl;
+
+import com.mmc.csf.common.util.web.ResultBody;
+import com.mmc.csf.licence.dto.LicenceGradeDTO;
+import com.mmc.csf.licence.dto.LicenceModelsDTO;
+import com.mmc.csf.licence.dto.LicenceScaleDTO;
+import com.mmc.csf.licence.dto.LicenceTypeDTO;
+import com.mmc.csf.release.dao.licence.LicenceCommonDao;
+import com.mmc.csf.release.entity.licence.LicenceGradeDO;
+import com.mmc.csf.release.entity.licence.LicenceModelsDO;
+import com.mmc.csf.release.entity.licence.LicenceScaleDO;
+import com.mmc.csf.release.entity.licence.LicenceTypeDO;
+import com.mmc.csf.release.service.licence.LicenceCommonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Author small
+ * @Date 2023/7/13 14:34
+ * @Version 1.0
+ */
+@Service
+public class LicenceCommonServiceImpl implements LicenceCommonService {
+
+    @Autowired
+    private LicenceCommonDao licenceCommonDao;
+
+
+    @Override
+    public ResultBody licenceGradeList() {
+        List<LicenceGradeDO> licenceGradeList = licenceCommonDao.licenceGradeList();
+        List<LicenceGradeDTO> collect = licenceGradeList.stream().map(l -> {
+            return l.licenceGradeDTO();
+        }).collect(Collectors.toList());
+        return ResultBody.success(collect);
+    }
+
+    @Override
+    public ResultBody licenceModelsList() {
+        List<LicenceModelsDO> licenceGradeList = licenceCommonDao.licenceModelsList();
+        List<LicenceModelsDTO> collect = licenceGradeList.stream().map(l -> {
+            return l.licenceModelsDTO();
+        }).collect(Collectors.toList());
+        return ResultBody.success(collect);
+    }
+
+    @Override
+    public ResultBody licenceTypeList() {
+        List<LicenceTypeDO> licenceGradeList = licenceCommonDao.licenceTypeList();
+        List<LicenceTypeDTO> collect = licenceGradeList.stream().map(l -> {
+            return l.licenceTypeDTO();
+        }).collect(Collectors.toList());
+        return ResultBody.success(collect);
+    }
+
+    @Override
+    public ResultBody licenceScaleList() {
+        List<LicenceScaleDO> licenceGradeList = licenceCommonDao.licenceScaleList();
+        List<LicenceScaleDTO> collect = licenceGradeList.stream().map(l -> {
+            return l.licenceScaleDTO();
+        }).collect(Collectors.toList());
+        return ResultBody.success(collect);
+    }
+}

release-service/src/main/resources/mapper/licence/LicenceCommonDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mmc.csf.release.dao.licence.LicenceCommonDao">
+
+    <select id="licenceGradeList" resultType="com.mmc.csf.release.entity.licence.LicenceGradeDO">
+        select id, `name`
+        from licence_grade
+    </select>
+
+
+    <select id="licenceModelsList" resultType="com.mmc.csf.release.entity.licence.LicenceModelsDO">
+        select id, `name`
+        from licence_models
+    </select>
+
+    <select id="licenceTypeList" resultType="com.mmc.csf.release.entity.licence.LicenceTypeDO">
+        select id, `name`
+        from licence_type
+    </select>
+
+    <select id="licenceScaleList" resultType="com.mmc.csf.release.entity.licence.LicenceScaleDO">
+        select id, `name`
+        from licence_scale
+    </select>
+</mapper>