Merge branch 'feature/1.0.0' of github.com:ab-inbev-apac/abi-cloud-qr-platform into feature/1.0.0

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

@@ -119,6 +119,14 @@ public class FactoryController {
         return BaseResponse.create(result);
     }
 
+    @ApiOperation("供应商包材厂是否加密")
+    @GetMapping("isEncryption")
+    public BaseResponse<OutIsEncryptionRes>  isEncryption(@Validated GetIsEncryptionReq getIsEncryptionReq) throws Exception {
+        //修改是否加密状态
+        OutIsEncryptionRes res=factoryService.GetIsEncryption(getIsEncryptionReq);
+        //包装出参
+        return BaseResponse.create(res);
+    }
 
     //    6.03已废弃
 //    @ApiOperation("啤酒厂下拉框")

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/GetIsEncryptionReq.java

@@ -0,0 +1,28 @@
+package com.abi.qms.platform.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author liguosong
+ * @version 1.0
+ * @date 2021/6/18 14:45
+ */
+@Data
+@ApiModel
+public class GetIsEncryptionReq {
+
+    @NotNull(message = "ID为空")
+    @ApiModelProperty(value = "供应商ID")
+    private Long id;
+
+    @NotNull(message = "码包加密状态为空")
+    @ApiModelProperty(value = "码包是否加密0-否，1-是")
+    private Integer isQrCodeEncode;
+
+
+}

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

@@ -0,0 +1,18 @@
+package com.abi.qms.platform.dto.res;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author liguosong
+ * @version 1.0
+ * @date 2021/6/18 15:12
+ */
+@Data
+@ApiModel
+public class OutIsEncryptionRes {
+
+    @ApiModelProperty("返回是否加密状态0-否，1-是")
+    private Integer status;
+}

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

@@ -3,13 +3,7 @@ package com.abi.qms.platform.service;
 
 import com.abi.qms.platform.dao.entity.BaseFactory;
 import com.abi.qms.platform.dto.req.*;
-import com.abi.qms.platform.dto.res.ExcelImportRes;
-import com.abi.qms.platform.dto.res.GetFactoryDetailRes;
-import com.abi.qms.platform.dto.res.ListBeerFactorySelectRes;
-import com.abi.qms.platform.dto.res.ListFactoryEnableRes;
-import com.abi.qms.platform.dto.res.ListFactoryRes;
-import com.abi.qms.platform.dto.res.ListFactorySelectRes;
-import com.abi.qms.platform.dto.res.ListCoverFactorySelectRes;
+import com.abi.qms.platform.dto.res.*;
 import com.abi.task.common.excel.preperties.FactoryProperty;
 
 import java.util.List;
@@ -64,6 +58,13 @@ public interface FactoryService {
      */
     BaseFactory getFactoryByCode(String factoryCode,Integer factoryType);
 
+    /**
+     * 是否加密
+     * @param getIsEncryptionReq
+     */
+    OutIsEncryptionRes GetIsEncryption(GetIsEncryptionReq getIsEncryptionReq);
+
+
     //    6.03已废弃
 //    /**
 //     * 包材厂下拉列表（数据权限隔离）

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

@@ -13,17 +13,8 @@ import com.abi.qms.platform.dao.enums.FirstFactoryEnum;
 import com.abi.qms.platform.dao.enums.TrueFalseEnum;
 import com.abi.qms.platform.dao.enums.ValidEnum;
 import com.abi.qms.platform.dao.mapper.*;
-import com.abi.qms.platform.dto.req.DisableFactoryReq;
-import com.abi.qms.platform.dto.req.EnableFactoryReq;
-import com.abi.qms.platform.dto.req.GetFactoryDetailReq;
-import com.abi.qms.platform.dto.req.ListFactoryReq;
-import com.abi.qms.platform.dto.req.ListFactorySelectReq;
-import com.abi.qms.platform.dto.req.SaveFactoryReq;
-import com.abi.qms.platform.dto.res.ExcelImportRes;
-import com.abi.qms.platform.dto.res.GetFactoryDetailRes;
-import com.abi.qms.platform.dto.res.ListFactoryEnableRes;
-import com.abi.qms.platform.dto.res.ListFactoryRes;
-import com.abi.qms.platform.dto.res.ListFactorySelectRes;
+import com.abi.qms.platform.dto.req.*;
+import com.abi.qms.platform.dto.res.*;
 import com.abi.qms.platform.infrastructure.util.AssertUtil;
 import com.abi.qms.platform.infrastructure.util.PageUtil;
 import com.abi.qms.platform.infrastructure.util.UserUtil;
@@ -509,6 +500,26 @@ public class FactoryServiceImpl implements FactoryService {
         return baseFactory;
     }
 
+    /**
+     * 是否加密
+     * @param getIsEncryptionReq
+     */
+    @Override
+    public OutIsEncryptionRes GetIsEncryption(GetIsEncryptionReq getIsEncryptionReq){
+        //1.查询是否存在
+        BaseFactory factory = baseFactoryMapper.selectById(getIsEncryptionReq.getId());
+        AssertUtil.isNull(factory, "供应商不存在");
+        //2.判断是否包材厂
+        if (!FactoryTypeEnum.COVER.is(factory.getFactoryType())) {
+            throw new BusinessException("该供应商不是包材厂，无法设置是否加密");
+        }
+        //3-修改是否加密状态
+        factory.setIsQrCodeEncode(getIsEncryptionReq.getIsQrCodeEncode());
+        baseFactoryMapper.updateById(factory);
+        OutIsEncryptionRes res=new OutIsEncryptionRes();
+        res.setStatus(getIsEncryptionReq.getIsQrCodeEncode());
+        return res;
+    }
 //    6.03已废弃
 //    @Override
 //    public ListFactorySelectRes listPackageFactorySelect(ListFactorySelectReq req) {