fix: 添加码格式下拉列表接口

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/QrFormatController.java

@@ -1,7 +1,13 @@
 package com.abi.qms.platform.controller.console;
 
-import com.abi.qms.platform.dto.req.*;
+import com.abi.qms.platform.dto.req.DeleteQrFormatReq;
+import com.abi.qms.platform.dto.req.DisableQrFormatReq;
+import com.abi.qms.platform.dto.req.EnableQrFormatReq;
+import com.abi.qms.platform.dto.req.GetQrFormatDetailReq;
+import com.abi.qms.platform.dto.req.ListQrFormatReq;
+import com.abi.qms.platform.dto.req.SaveQrFormatReq;
 import com.abi.qms.platform.dto.res.GetQrFormatDetailRes;
+import com.abi.qms.platform.dto.res.ListFormatSelectRes;
 import com.abi.qms.platform.dto.res.ListQrFormatRes;
 import com.abi.qms.platform.service.QrFormatService;
 import com.abi.task.common.api.base.BaseResponse;
@@ -10,11 +16,15 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 码格式 Controller
- * 
+ *
  * @author WeiganCai
  * @date 2021-04-19
  */
@@ -68,4 +78,12 @@ public class QrFormatController {
         return BaseResponse.create();
     }
 
+    @ApiOperation("码格式下拉列表")
+    @GetMapping("/listFormatSelect")
+    public BaseResponse<ListFormatSelectRes> listFormatSelect() {
+
+        ListFormatSelectRes res = qrFormatService.listFormatSelect();
+        return BaseResponse.create(res);
+    }
+
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListFormatSelectRes.java

@@ -0,0 +1,42 @@
+package com.abi.qms.platform.dto.res;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/05/26 15:21
+ * @description: 码格式下拉列表出参
+ */
+@Data
+@ApiModel
+public class ListFormatSelectRes implements Serializable {
+
+    @ApiModelProperty("码格式下拉列表")
+    private List<FormatBean> formatBeanList;
+
+    /**
+     *
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @ApiModel(value = "ListFormatSelectRes_FormatBean")
+    public static class FormatBean implements Serializable {
+
+        @ApiModelProperty("码格式id")
+        private Long id;
+
+        @ApiModelProperty("码格式名称")
+        private String name;
+    }
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/QrFormatService.java

@@ -1,7 +1,13 @@
 package com.abi.qms.platform.service;
 
-import com.abi.qms.platform.dto.req.*;
+import com.abi.qms.platform.dto.req.DeleteQrFormatReq;
+import com.abi.qms.platform.dto.req.DisableQrFormatReq;
+import com.abi.qms.platform.dto.req.EnableQrFormatReq;
+import com.abi.qms.platform.dto.req.GetQrFormatDetailReq;
+import com.abi.qms.platform.dto.req.ListQrFormatReq;
+import com.abi.qms.platform.dto.req.SaveQrFormatReq;
 import com.abi.qms.platform.dto.res.GetQrFormatDetailRes;
+import com.abi.qms.platform.dto.res.ListFormatSelectRes;
 import com.abi.qms.platform.dto.res.ListQrFormatRes;
 
 /**
@@ -12,34 +18,40 @@ import com.abi.qms.platform.dto.res.ListQrFormatRes;
  */
 public interface QrFormatService {
 
-	/**
-	 * 保存码格式
-	 */
-	void saveQrFormat(SaveQrFormatReq saveQrFormatReq);
-
-	/**
-	 * 码格式查询分页
-	 */
-	ListQrFormatRes listQrFormat(ListQrFormatReq listQrFormatReq);
-
-	/**
-	 * 码格式查询详情
-	 */
-	GetQrFormatDetailRes getQrFormatDetail(GetQrFormatDetailReq getQrFormatDetailReq);
-
-	/**
-	 * 码格式启用
-	 */
-	void enableQrFormat(EnableQrFormatReq enableQrFormatReq);
-
-	/**
-	 * 码格式禁用
-	 */
-	void disableQrFormat(DisableQrFormatReq disableQrFormatReq);
-
-	/**
-	 * 删除码格式
-	 */
-	void deleteQrFormat(DeleteQrFormatReq deleteQrFormatReq);
-
+    /**
+     * 保存码格式
+     */
+    void saveQrFormat(SaveQrFormatReq saveQrFormatReq);
+
+    /**
+     * 码格式查询分页
+     */
+    ListQrFormatRes listQrFormat(ListQrFormatReq listQrFormatReq);
+
+    /**
+     * 码格式查询详情
+     */
+    GetQrFormatDetailRes getQrFormatDetail(GetQrFormatDetailReq getQrFormatDetailReq);
+
+    /**
+     * 码格式启用
+     */
+    void enableQrFormat(EnableQrFormatReq enableQrFormatReq);
+
+    /**
+     * 码格式禁用
+     */
+    void disableQrFormat(DisableQrFormatReq disableQrFormatReq);
+
+    /**
+     * 删除码格式
+     */
+    void deleteQrFormat(DeleteQrFormatReq deleteQrFormatReq);
+
+    /**
+     * 码格式下拉列表
+     *
+     * @return
+     */
+    ListFormatSelectRes listFormatSelect();
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrFormatServiceImpl.java

@@ -3,6 +3,7 @@ package com.abi.qms.platform.service.impl;
 import com.abi.qms.platform.dao.entity.QrFormat;
 import com.abi.qms.platform.dao.entity.QrRepertoryColumn;
 import com.abi.qms.platform.dao.entity.QrVariable;
+import com.abi.qms.platform.dao.enums.QrFormatUniqueStatusEunm;
 import com.abi.qms.platform.dao.enums.QrFormatUseStatusEnum;
 import com.abi.qms.platform.dao.mapper.QrFormatMapper;
 import com.abi.qms.platform.dao.mapper.QrRepertoryColumnMapper;
@@ -16,6 +17,7 @@ import com.abi.qms.platform.dto.req.GetQrFormatDetailReq;
 import com.abi.qms.platform.dto.req.ListQrFormatReq;
 import com.abi.qms.platform.dto.req.SaveQrFormatReq;
 import com.abi.qms.platform.dto.res.GetQrFormatDetailRes;
+import com.abi.qms.platform.dto.res.ListFormatSelectRes;
 import com.abi.qms.platform.dto.res.ListQrFormatRes;
 import com.abi.qms.platform.infrastructure.task.VerifyUniqueTask;
 import com.abi.qms.platform.infrastructure.util.AssertUtil;
@@ -240,4 +242,19 @@ public class QrFormatServiceImpl implements QrFormatService {
         qrFormatMapper.updateById(update);
     }
 
+    @Override
+    public ListFormatSelectRes listFormatSelect() {
+
+        ListFormatSelectRes res = new ListFormatSelectRes();
+
+        QueryWrapper<QrFormat> qw = new QueryWrapper<>();
+        qw.eq("unique_status", QrFormatUniqueStatusEunm.VERIFY_FAIL.getCode());
+        qw.eq("is_delete", 0);
+        List<QrFormat> formatList = qrFormatMapper.selectList(qw);
+        List<ListFormatSelectRes.FormatBean> beanList = PojoConverterUtils.copyList(formatList, ListFormatSelectRes.FormatBean.class);
+
+        res.setFormatBeanList(beanList);
+        return res;
+    }
+
 }