Sfoglia il codice sorgente

Merge branch 'test' of http://git.tjyourong.com.cn/ctop/adsp-boot into test

hcst_sunzhen 4 anni fa
parent
commit
7a5bb5d41b

+ 7 - 11
jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActivitiProcessController.java

@@ -27,16 +27,16 @@ import org.jeecg.modules.activiti.service.Impl.ActNodeServiceImpl;
 import org.jeecg.modules.activiti.service.Impl.ActZprocessServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.net.URLEncoder;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -130,7 +130,9 @@ public class ActivitiProcessController {
             }
             ActZprocess actProcess = actZprocessService.getById(id);
             // 当删除最后一个版本时 删除关联数据
-            if (actProcess==null) return Result.error("该数据已删除!");
+            if (actProcess==null){
+                return Result.error("该数据已删除!");
+            }
             if(actProcess.getVersion()==1){
                 deleteNodeUsers(id);
             }
@@ -143,7 +145,6 @@ public class ActivitiProcessController {
         return Result.ok("删除成功");
     }
     public void deleteNodeUsers(String processId){
-
         BpmnModel bpmnModel = repositoryService.getBpmnModel(processId);
         List<Process> processes = bpmnModel.getProcesses();
         for(Process process : processes){
@@ -160,11 +161,9 @@ public class ActivitiProcessController {
      */
     @RequestMapping(value = "/convertToModel")
     public Result convertToModel( String id){
-
         ProcessDefinition pd = repositoryService.createProcessDefinitionQuery().processDefinitionId(id).singleResult();
         InputStream bpmnStream = repositoryService.getResourceAsStream(pd.getDeploymentId(), pd.getResourceName());
         ActZprocess actProcess = actZprocessService.getById(id);
-
         try {
             XMLInputFactory xif = XMLInputFactory.newInstance();
             InputStreamReader in = new InputStreamReader(bpmnStream, "UTF-8");
@@ -209,11 +208,8 @@ public class ActivitiProcessController {
     /*通过流程定义id获取流程节点*/
     @RequestMapping(value = "/getProcessNode")
     public Result getProcessNode(String id){
-
         BpmnModel bpmnModel = repositoryService.getBpmnModel(id);
-
         List<ProcessNodeVo> list = new ArrayList<>();
-
         List<Process> processes = bpmnModel.getProcesses();
         if(processes==null||processes.size()==0){
             return Result.ok();

+ 1 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/entity/BytedanceImageInfo.java

@@ -67,6 +67,7 @@ public class BytedanceImageInfo {
 	/**updateTime*/
     @ApiModelProperty(value = "updateTime")
 	private Date updateTime;
+    private Integer type;
 
 	public BytedanceImageInfo(JSONObject dataObject, CtopOauthToken token) {
 		String id = dataObject.getString("id");

+ 2 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/mapper/ByteDanceVideoInfoMapper.java

@@ -16,5 +16,6 @@ public interface ByteDanceVideoInfoMapper extends BaseMapper<ByteDanceVideoInfo>
 
     void replaceBatch(@Param(value = "videoList") List<ByteDanceVideoInfo> videoInfoList);
 
-    void updateVideoType();
+    void updateVideoVerticalType();
+    void updateVideoHorizonType();
 }

+ 4 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/mapper/BytedanceImageInfoMapper.java

@@ -15,4 +15,8 @@ import java.util.List;
 public interface BytedanceImageInfoMapper extends BaseMapper<BytedanceImageInfo> {
 
     void replaceBatch(@Param(value = "imageInfos")List<BytedanceImageInfo> imageInfos);
+
+    void updateImageVerticalType();
+
+    void updateImageHorizonType();
 }

+ 12 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/mapper/xml/ByteDanceVideoInfoMapper.xml

@@ -51,7 +51,17 @@
             )
         </foreach>
     </insert>
-    <update id="updateVideoType">
-        update ctop_bytedance_video_info set type = 2 where height&gt;width
+    <update id="updateVideoVerticalType">
+        update
+            ctop_bytedance_video_info
+        set type = 2
+        where height &gt; width
+        and (height between 1280 and 2560)  and (width between 720 and 1440);
+    </update>
+    <update id="updateVideoHorizonType">
+        update ctop_bytedance_video_info
+            set type = 1
+        where height &lt; width
+        and (width between 1280 and 2560)  and (height between 720 and 1440)
     </update>
 </mapper>

+ 14 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/mapper/xml/BytedanceImageInfoMapper.xml

@@ -32,4 +32,18 @@
             #{imageInfo.updateTime},#{imageInfo.imageUrl})
         </foreach>
     </insert>
+
+    <update id="updateImageVerticalType">
+        update
+            ctop_bytedance_image_info
+        set type = 2
+        where height &gt; width
+        and (height between 1280 and 2560)  and (width between 720 and 1440);
+    </update>
+    <update id="updateImageHorizonType">
+        update ctop_bytedance_image_info
+            set type = 1
+        where height &lt; width
+        and (width between 1280 and 2560)  and (height between 720 and 1440)
+    </update>
 </mapper>

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/IByteDanceVideoInfoService.java

@@ -17,5 +17,5 @@ public interface IByteDanceVideoInfoService extends IService<ByteDanceVideoInfo>
 
     ByteDanceVideoInfo getOneByParams(Long materialId);
 
-    void updateVideoType();
+    void updateMaterialType();
 }

+ 2 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/IBytedanceImageInfoService.java

@@ -13,4 +13,6 @@ import java.util.List;
  */
 public interface IBytedanceImageInfoService extends IService<BytedanceImageInfo> {
     void replaceBatch(List<BytedanceImageInfo> videoInfoList);
+
+    void updateType();
 }

+ 2 - 3
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/ByteDanceAdvertiserDataServiceImpl.java

@@ -32,8 +32,6 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     @Autowired
     private ByteDanceCreativeMapper creativeMapper;
     @Autowired
-    private IByteDanceCampaignService campaignService;
-    @Autowired
     private IByteDanceVideoInfoService videoInfoService;
 
     @Override
@@ -577,7 +575,8 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     public void getMaterialList(CtopOauthToken token) {
         getVideoByPage(token, "", 1);
         getImageByPage(token, "", 1);
-        videoInfoService.updateVideoType();
+        videoInfoService.updateMaterialType();
+        imageInfoService.updateType();
     }
 
     @Autowired

+ 3 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/ByteDanceVideoInfoServiceImpl.java

@@ -37,7 +37,8 @@ public class ByteDanceVideoInfoServiceImpl extends ServiceImpl<ByteDanceVideoInf
     }
 
     @Override
-    public void updateVideoType() {
-        videoInfoMapper.updateVideoType();
+    public void updateMaterialType() {
+        videoInfoMapper.updateVideoVerticalType();
+        videoInfoMapper.updateVideoHorizonType();
     }
 }

+ 7 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/BytedanceImageInfoServiceImpl.java

@@ -18,9 +18,14 @@ import java.util.List;
 @Service
 public class BytedanceImageInfoServiceImpl extends ServiceImpl<BytedanceImageInfoMapper, BytedanceImageInfo> implements IBytedanceImageInfoService {
     @Autowired
-    private BytedanceImageInfoMapper bytedanceImageInfoMapper;
+    private BytedanceImageInfoMapper imageInfoMapper;
     @Override
     public void replaceBatch(List<BytedanceImageInfo> videoInfoList) {
-        bytedanceImageInfoMapper.replaceBatch(videoInfoList);
+        imageInfoMapper.replaceBatch(videoInfoList);
+    }
+
+    @Override
+    public void updateType() {
+        imageInfoMapper.updateVerticalType();
     }
 }