授权牌模板part4

src/main/java/com/caimei/controller/admin/auth/AuthTemplateApi.java

@@ -47,7 +47,8 @@ public class AuthTemplateApi {
 
     @ApiOperation("添加/编辑授权模板")
     @ApiImplicitParam(name = "params", required = true, value = "templateId:模板id；templateImage:模板图片；" +
-            "authUserId:供应商用户id；status:状态：1启用，0停用；qrPostion:二维码位置；qrSize:二维码尺寸")
+            "authUserId:供应商用户id；status:状态：1启用，0停用；qrPosition:二维码位置；qrSize:二维码尺寸；" +
+            "authFlag:1设置为机构授权牌模板；productFlag:1设置为设备授权牌模板")
     @PostMapping("/save")
     public ResponseJson saveTemplate(@RequestBody String params){
         JSONObject parseObject = JSONObject.parseObject(params);
@@ -60,10 +61,7 @@ public class AuthTemplateApi {
         Integer authFlag = parseObject.getInteger("authFlag");
         Integer productFlag = parseObject.getInteger("productFlag");
         if (null != templateId) {
-            if (StringUtils.isEmpty(templateImage)) {
-                return ResponseJson.error("授权牌模板不能为空");
-            }
-            if (null == authUserId) {
+            if ((null != authFlag || null != productFlag) && null == authUserId) {
                 return ResponseJson.error("供应商用户id不能为空");
             }
         }

src/main/java/com/caimei/mapper/cmMapper/AuthTemplateMapper.java

@@ -22,7 +22,7 @@ public interface AuthTemplateMapper {
      */
     List<TemplateVo> getTemplateList(@Param("listType") Integer listType, @Param("authUserId") Integer authUserId);
 
-    void insertTemplate(@Param("templateImage") String templateImage, @Param("authUserId") Integer authUserId, @Param("qrPosition") String qrPosition, @Param("qrSize") Integer qrSize);
+    void insertTemplate(@Param("templateImage") String templateImage, @Param("authUserId") Integer authUserId, @Param("templateSize") String templateSize, @Param("qrPosition") String qrPosition, @Param("qrSize") Integer qrSize);
 
     void updateSelective(@Param("templateId") Integer templateId, @Param("templateImage") String templateImage, @Param("authUserId") Integer authUserId, @Param("status") Integer status, @Param("qrPosition") String qrPosition, @Param("authFlag") Integer authFlag, @Param("productFlag") Integer productFlag);
 

src/main/java/com/caimei/model/po/CmBrandAuthPo.java

@@ -183,7 +183,7 @@ public class CmBrandAuthPo {
     private String authImageLogo;
 
     /**
-     * 授权牌
+     * 授权牌(自定义上传)
      */
     private String authImage;
 
@@ -198,7 +198,7 @@ public class CmBrandAuthPo {
     private String appletsAuthImage;
 
     /**
-     * 授权牌类型：1模板库生成，自定义上传
+     * 授权牌类型：1模板库生成，2自定义上传
      */
     private Integer authImageType;
 

src/main/java/com/caimei/model/vo/AuthFormVo.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -115,6 +116,31 @@ public class AuthFormVo implements Serializable {
      */
     private String remarks;
 
+    /**
+     * 认证编号
+     */
+    private String authCode;
+
+    /**
+     * 认证日期
+     */
+    private Date authDate;
+
+    /**
+     * 授权牌logo(logo与机构名称组合)
+     */
+    private String authImageLogo;
+
+    /**
+     * 授权牌(自定义上传)
+     */
+    private String authImage;
+
+    /**
+     * 授权牌类型：1模板库生成，2自定义上传
+     */
+    private Integer authImageType;
+
     /**
      * 审核状态：0审核未通过，1审核通过，2待审核
      */

src/main/java/com/caimei/model/vo/TemplateVo.java

@@ -21,11 +21,21 @@ public class TemplateVo {
      */
     private String templateImage;
 
+    /**
+     * 模板尺寸
+     */
+    private String templateSize;
+
     /**
      *供应商用户id
      */
     private Integer authUserId;
 
+    /**
+     *供应商名称
+     */
+    private String shopName;
+
     /**
      *作为机构认证模板：1是，其余否
      */

src/main/java/com/caimei/service/auth/impl/AuthServiceImpl.java

@@ -243,9 +243,9 @@ public class AuthServiceImpl implements AuthService {
             if (null == auth.getCreateBy()) {
                 return ResponseJson.error("参数异常，请输入创建人id");
             }
-            if (1 == auth.getAuthImageType() && StringUtils.isEmpty(auth.getAuthImageLogo())) {
+            /*if (1 == auth.getAuthImageType() && StringUtils.isEmpty(auth.getAuthImageLogo())) {
                 return ResponseJson.error("授权牌logo不能为空");
-            }
+            }*/
             if (2 == auth.getAuthImageType() && StringUtils.isEmpty(auth.getAuthImage())) {
                 return ResponseJson.error("授权牌不能为空");
             }

src/main/java/com/caimei/service/auth/impl/AuthTemplateServiceImpl.java

@@ -10,6 +10,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.net.URL;
 import java.util.List;
 
 /**
@@ -43,12 +46,22 @@ public class AuthTemplateServiceImpl implements AuthTemplateService {
     public ResponseJson saveTemplate(Integer templateId, String templateImage, Integer authUserId, Integer status, String qrPosition, Integer qrSize, Integer authFlag, Integer productFlag) {
         boolean insertFlag = null == templateId;
         if (insertFlag) {
-            authTemplateMapper.insertTemplate(templateImage, authUserId, qrPosition, qrSize);
+            Integer width = null;
+            Integer height = null;
+            try {
+                BufferedImage image = ImageIO.read(new URL(templateImage));
+                width = image.getWidth();
+                height = image.getHeight();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            String templateSize = (null == width ? 0 : width) + "," + (null == height ? 0 : height);
+            authTemplateMapper.insertTemplate(templateImage, authUserId, templateSize, qrPosition, qrSize);
         } else {
             if (null != authFlag && 1 == authFlag) {
                 authTemplateMapper.clearAuthFlag(authUserId);
             }
-            if (null != authFlag && 1 == productFlag) {
+            if (null != productFlag && 1 == productFlag) {
                 authTemplateMapper.clearProductFlag(authUserId);
             }
             authTemplateMapper.updateSelective(templateId, templateImage, authUserId, status, qrPosition, authFlag, productFlag);

src/main/java/com/caimei/service/auth/impl/ShopServiceImpl.java

@@ -513,7 +513,7 @@ public class ShopServiceImpl implements ShopService {
     public ResponseJson updateAllAuthImage(Integer authUserId) {
         List<CmBrandAuthPo> authList = authMapper.getAllAuth(authUserId);
         authList.forEach(auth->{
-            String authImage = null;
+            String authImage;
             if (1 == auth.getAuthImageType()) {
                 authImage = authService.generateAuthImage(auth);
                 auth.setAuthImage(authImage);

src/main/resources/mapper/AuthMapper.xml

@@ -293,6 +293,11 @@
                logo,
                customFlag,
                remarks,
+               authCode,
+               authDate,
+               authImageLogo,
+               authImage,
+               authImageType,
                status,
                auditStatus,
                if(shopAuditStatus = 0, shopInvalidReason, invalidReason)                    as invalidReason

src/main/resources/mapper/AuthTemplateMapper.xml

@@ -2,13 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.mapper.cmMapper.AuthTemplateMapper">
     <insert id="insertTemplate">
-        insert into cm_brand_auth_template (authUserId, templateImage, qrPosition, qrSize)
-        values (#{authUserId}, #{templateImage}, #{qrPosition}, #{qrSize})
+        insert into cm_brand_auth_template (authUserId, templateImage, templateSize, qrPosition, qrSize, addTime)
+        values (#{authUserId}, #{templateImage}, #{templateSize}, #{qrPosition}, #{qrSize}, NOW())
     </insert>
     <update id="updateSelective">
         update cm_brand_auth_template
         <set>
-            <if test="authUserId != null">
+            <if test="authUserId != null and null == authFlag and null == productFlag">
                 authUserId = #{authUserId},
             </if>
             <if test="templateImage != null and templateImage != ''">
@@ -41,16 +41,17 @@
     </update>
 
     <select id="getTemplateList" resultType="com.caimei.model.vo.TemplateVo">
-        select id as templateId,authUserId, templateImage, authFlag, productFlag, qrPosition, status, addTime
-        from cm_brand_auth_template
+        select t.id as templateId,t.authUserId,u.name as shopName, templateImage, templateSize, authFlag, productFlag, qrPosition,
+        qrSize, t.status, addTime
+        from cm_brand_auth_template t left join cm_brand_auth_user u on t.authUserId = u.authUserId
         <where>
             <if test="authUserId != null">
-                and authUserId = #{authUserId}
+                and t.authUserId = #{authUserId}
             </if>
             <if test="listType == 2">
-                and status = 1
+                and t.status = 1
             </if>
         </where>
-        order by addTime desc
+        order by t.addTime desc
     </select>
 </mapper>