Explorar o código

Merge branch 'V2.0.1'

zhaoxian %!s(int64=2) %!d(string=hai) anos
pai
achega
f20dbf601f

+ 8 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/duxiaoman/controller/DuxiaomanMaterialInfoController.java

@@ -267,6 +267,14 @@ public class DuxiaomanMaterialInfoController {
     }
 
     /**
+     *审核图片预览
+     */
+    @GetMapping(value = "/materialBos")
+    public String materialBos(String id) {
+       return duxiaomanMaterialInfoService.materialBos(id);
+    }
+
+    /**
      * 将2-审批中状态的素材 进行 更新报备状态
      */
     @GetMapping(value = "/getMaterialChannelAndType")

+ 7 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/duxiaoman/entity/DuxiaomanMaterialInfo.java

@@ -143,6 +143,13 @@ public class DuxiaomanMaterialInfo {
     @Excel(name = "素材类型", width = 15)
     @ApiModelProperty(value = "素材类型")
     private String type;
+
+    /**
+     * 驳回图片ID
+     */
+    @Excel(name = "驳回图片ID", width = 15)
+    @ApiModelProperty(value = "驳回图片ID")
+    private String auditImagesId;
     /**
      * 视频描述
      */

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/duxiaoman/service/IDuxiaomanMaterialInfoService.java

@@ -36,4 +36,6 @@ public interface IDuxiaomanMaterialInfoService extends IService<DuxiaomanMateria
     Result<Object> add(JSONObject json);
 
     Result<Object> getPersonnelInfo(DuxiaomanMaterialInfo duxiaomanMaterialInfo);
+
+    String materialBos(String id);
 }

+ 35 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/duxiaoman/service/impl/DuxiaomanMaterialInfoServiceImpl.java

@@ -291,6 +291,14 @@ public class DuxiaomanMaterialInfoServiceImpl extends ServiceImpl<DuxiaomanMater
                 if (auditStatus == 3) {
                     syncMaterial(materialInfo);
                 }
+                if (auditStatus == 4) {
+                    JSONArray auditImages = result.getJSONArray("audit_images");
+                    if (!Check.isNull(auditImages)) {
+                        JSONObject json = auditImages.getJSONObject(0);
+                        materialInfo.setAuditImagesId(json.getString("id"));
+                    }
+                }
+
                 if ("SCRIPT".equals(materialInfo.getType())) {
                     Project project = projectService.getById(materialInfo.getProjectId());
                     String text = null;
@@ -549,4 +557,31 @@ public class DuxiaomanMaterialInfoServiceImpl extends ServiceImpl<DuxiaomanMater
         }
         return Result.ok(obj);
     }
+
+
+    /**
+     * 审核图片预览
+     */
+    @Override
+    public String materialBos(String id) {
+        try {
+            String datetime = new Date().getTime() + "";
+            StringBuffer md5Str = new StringBuffer();
+            md5Str.append("app_id=").append("1660012052762")
+                    .append("&datetime=").append(datetime)
+                    .append("&id=").append(id).append("1f8a5a1cbd4d626a2aa197b86f6cab8a");
+            String sign = DigestUtils.md5Hex(md5Str.toString());
+            StringBuffer urlStr = new StringBuffer();
+            urlStr.append(duUrl + KuaishouDuXiaoManAPIConstant.MATERIAL_BOS).append("?")
+                    .append("app_id=").append("1660012052762")
+                    .append("&datetime=").append(datetime)
+                    .append("&sign=").append(sign)
+                    .append("&id=").append(id);
+            return urlStr.toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
 }