fix: 修复默认图片功能和添加日志搜索类星星

Reviewed-on: #161

htmlweb/web/backstage/oa/ocr/prevailcloudlog/list.html

@@ -16,7 +16,14 @@
                                     <input name='search_callTime'  id='search_callTime'  class='form-control' placeholder='字段名称'/>
                         </div>-->
                     <div class="form-group">
+                        <select class="form-control" style="width: 78px" name='type' id='type'>
+                            <option value="">全部</option>
+                            <option value="0">图片</option>
+                            <option value="1">数据回传</option>
+                            <option value="2">账号</option>
+                        </select>
                         <select class="form-control" name='callStatus' id='callStatus'>
+                            <option value="">全部</option>
                             <option value="100">成功</option>
                             <option value="999">失败</option>
                             <option value="500">异常</option>
@@ -79,6 +86,7 @@
                                 pageSize: params.limit,
                                 start: (params.offset / params.limit) + 1,
                                 status: $("#callStatus").val(),
+                                type: $("#type").val(),
                                 callTimeStart: params.callTimeStart,
                                 callTimeEnd: params.callTimeEnd,
                             };
@@ -113,7 +121,7 @@
                                     if (oData.type == 0) {
                                         listOperation = "图片";
                                     } else if (oData.type == 1) {
-                                        listOperation = "工作流";
+                                        listOperation = "数据回传";
                                     } else if (oData.type == 2) {
                                         listOperation = "账号";
                                     } else {

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPrevailCloudLogController.java

@@ -7,6 +7,7 @@ import cn.jyjz.xiaoyao.ocr.service.OcrPrevailCloudLogService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -32,9 +33,15 @@ public class OcrPrevailCloudLogController {
     public ResultVo<IPage<OcrPrevailCloudLog>> list(@RequestParam(name = "start", defaultValue = "1") Integer start,
                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                     @RequestParam(name = "status", required = false) String status,
+                                                    @RequestParam(name = "type", required = false) String type,
                                                     HttpServletRequest request) {
         QueryWrapper<OcrPrevailCloudLog> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("status", status);
+        if (!StringUtils.isEmpty(status)) {
+            queryWrapper.eq("status", status);
+        }
+        if (!StringUtils.isEmpty(type)) {
+            queryWrapper.eq("type", type);
+        }
         ResultVo<IPage<OcrPrevailCloudLog>> resultVo = new ResultVo<>();
         ParamterPage paramterPage = new ParamterPage();
         paramterPage.setPagesize(pageSize);

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUsersearchController.java

@@ -103,7 +103,8 @@ public class OcrUsersearchController extends BaseController{
 				queryWrapper.orderByAsc(orderName);
 			}
 		}else{
-			queryWrapper.orderByDesc(Arrays.asList("IZTOP","REORDER"));
+			queryWrapper.orderByDesc("IZTOP");
+			queryWrapper.orderByAsc("REORDER");
 		}
 
 

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/PrevailCloudApiController.java

@@ -43,7 +43,7 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("/test/api")
-public class ApiTestController {
+public class PrevailCloudApiController {
 
     @Resource
     private ApiConfig apiConfig;
@@ -77,8 +77,6 @@ public class ApiTestController {
         if(StringUtils.isBlank(accountNoStr)){
             return "业务主体不能为空";
         }
-        Long tenantNo = Long.parseLong(request.getParameter("tenantNo"));
-        Long accountNo = Long.parseLong(request.getParameter("accountNo"));
         return "";
     }
 
@@ -133,13 +131,13 @@ public class ApiTestController {
                 if (pictureSourceResult.getLivePhoto() == null) {
                     List<Map<String, Object>> livePhoto = new ArrayList<>();
                     Map<String, Object> map = new HashMap<>();
-                    map.put("imgUrl", "http://47.93.59.251/api/image/default.png");
+                    map.put("imgUrl", StringUtils.isEmpty(apiConfig.getDefaultPictureImg()) ? "http://47.93.59.251/api/image/default.png" : apiConfig.getDefaultPictureImg());
                     map.put("imgName", "default.png");
                     livePhoto.add(map);
                     pictureSourceResult.setLivePhoto(livePhoto);
-                    pictureSourceResult.setRequestParam(pictureSourceParameter);
-//                    continue;
                 }
+                //赋值日志参数
+                pictureSourceResult.setRequestParam(pictureSourceParameter);
                 size++;
                 //将可以处理数据放入处理队列中
                 TaskQueue.pictureDisposePushData(pictureSourceResult, ocrPictureService, ocrPrevailCloudLogService);
@@ -219,8 +217,9 @@ public class ApiTestController {
                 map.put("imgName", "default.png");
                 livePhoto.add(map);
                 pictureSourceResult.setLivePhoto(livePhoto);
-                pictureSourceResult.setRequestParam(pictureSourceParameter);
             }
+            //赋值默认参数
+            pictureSourceResult.setRequestParam(pictureSourceParameter);
             //将可以处理数据放入处理队列中
             TaskQueue.pictureDisposePushData(pictureSourceResult, ocrPictureService, ocrPrevailCloudLogService);
         }
@@ -318,6 +317,15 @@ public class ApiTestController {
                             for (PictureSourceResult pictureSourceResult : totalList) {
                                 int retryCount = 0;
                                 boolean addedToQueue = false;
+                                //1.如果不存在图片默认一个默认图片，方便走测试。
+                                if (pictureSourceResult.getLivePhoto() == null) {
+                                    List<Map<String, Object>> livePhoto = new ArrayList<>();
+                                    Map<String, Object> map = new HashMap<>();
+                                    map.put("imgUrl", StringUtils.isEmpty(apiConfig.getDefaultPictureImg()) ? "http://47.93.59.251/api/image/default.png" : apiConfig.getDefaultPictureImg());
+                                    map.put("imgName", "default.png");
+                                    livePhoto.add(map);
+                                    pictureSourceResult.setLivePhoto(livePhoto);
+                                }
                                 if (pictureSourceResult.getLivePhoto() != null && !pictureSourceResult.getLivePhoto().isEmpty()) {
                                     size++;
                                     // 尝试将数据加入队列

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/TaskQueue.java

@@ -44,17 +44,6 @@ public class TaskQueue {
     public static boolean pictureDisposePushData(PictureSourceResult pictureSourceResult, OcrPictureService ocrPictureService, OcrPrevailCloudLogService ocrPrevailCloudLogService) {
         try {
             Long taskId = pictureSourceResult.getTaskId();
-            OcrPrevailCloudLog ocrPrevailCloudLog = OcrPrevailCloudLog.builder()
-                    .formId(pictureSourceResult.getTaskId())
-                    .requestParam(pictureSourceResult.getRequestParam().toString())
-                    .responseParam(pictureSourceResult.toString())
-                    .type(PrevailCloudConstant.PULL_PICTURE_SOURCE)
-                    .status(100)
-                    .build();
-            ocrPrevailCloudLogService.save(ocrPrevailCloudLog);
-            resultSet.add(String.valueOf(taskId));
-            pictureDisposeQueue.put(pictureSourceResult);
-
             OcrPicture ocrPicture = ocrPictureService.selectByRemark(String.valueOf(taskId));
             if (ocrPicture != null) {
                 OcrTaskchildPicture taskchildPicture = ocrPictureService.getOcrTaskChildPictureByPictureId(ocrPicture.getId().toString());
@@ -68,6 +57,17 @@ public class TaskQueue {
                     return true;
                 }
             }
+            //添加日志
+            OcrPrevailCloudLog ocrPrevailCloudLog = OcrPrevailCloudLog.builder()
+                    .formId(pictureSourceResult.getTaskId())
+                    .requestParam(pictureSourceResult.getRequestParam().toString())
+                    .responseParam(pictureSourceResult.toString())
+                    .type(PrevailCloudConstant.PULL_PICTURE_SOURCE)
+                    .status(100)
+                    .build();
+            ocrPrevailCloudLogService.save(ocrPrevailCloudLog);
+            resultSet.add(String.valueOf(taskId));
+            pictureDisposeQueue.put(pictureSourceResult);
         } catch (InterruptedException e) {
             OcrPrevailCloudLog ocrPrevailCloudLog = OcrPrevailCloudLog.builder()
                     .formId(pictureSourceResult.getTaskId())

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PictureSourceTimerJob.java

@@ -4,9 +4,11 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.jyjz.xiaoyao.admin.dataDao.DepartmentMybatisDao;
 import cn.jyjz.xiaoyao.admin.dataobject.Department;
+import cn.jyjz.xiaoyao.common.base.util.StringUtils;
 import cn.jyjz.xiaoyao.ocr.api.PrevailCloudApi;
 import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceParameter;
 import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceResult;
+import cn.jyjz.xiaoyao.ocr.api.utils.ApiConfig;
 import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
 import cn.jyjz.xiaoyao.ocr.service.OcrPrevailCloudLogService;
 import cn.jyjz.xiaoyao.ocr.thread.TaskQueue;
@@ -22,8 +24,10 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -53,6 +57,9 @@ public class PictureSourceTimerJob {
 
     private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
+    @Resource
+    private ApiConfig apiConfig;
+
     /**
      * 请求图片数据job （定时执行 每日拉取上一日全部数据）
      *
@@ -96,6 +103,15 @@ public class PictureSourceTimerJob {
         int count = totalList.size();
         int size = 0;
         for (PictureSourceResult pictureSourceResult : totalList) {
+            //1.如果不存在图片默认一个默认图片，方便走测试。
+            if (pictureSourceResult.getLivePhoto() == null) {
+                List<Map<String, Object>> livePhoto = new ArrayList<>();
+                Map<String, Object> map = new HashMap<>();
+                map.put("imgUrl", StringUtils.isEmpty(apiConfig.getDefaultPictureImg()) ? "http://47.93.59.251/api/image/default.png" : apiConfig.getDefaultPictureImg());
+                map.put("imgName", "default.png");
+                livePhoto.add(map);
+                pictureSourceResult.setLivePhoto(livePhoto);
+            }
             if (pictureSourceResult.getLivePhoto() != null) {
                 size++;
                 pictureSourceResult.setRequestParam(pictureSourceParameter);

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/timerJob/PullPictureDataJob.java

@@ -4,9 +4,11 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.jyjz.xiaoyao.admin.dataDao.DepartmentMybatisDao;
 import cn.jyjz.xiaoyao.admin.dataobject.Department;
+import cn.jyjz.xiaoyao.common.base.util.StringUtils;
 import cn.jyjz.xiaoyao.ocr.api.PrevailCloudApi;
 import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceParameter;
 import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceResult;
+import cn.jyjz.xiaoyao.ocr.api.utils.ApiConfig;
 import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
 import cn.jyjz.xiaoyao.ocr.service.OcrPrevailCloudLogService;
 import cn.jyjz.xiaoyao.ocr.thread.TaskQueue;
@@ -20,8 +22,10 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -40,6 +44,9 @@ public class PullPictureDataJob {
     @Resource
     private OcrPrevailCloudLogService ocrPrevailCloudLogService;
 
+    @Resource
+    private ApiConfig apiConfig;
+
     //    @Scheduled(cron = "0 5 0 * * ?") // 每天晚上0点五分执行一次
     public void pullPicture() {
         //配置查询参数信息
@@ -101,6 +108,15 @@ public class PullPictureDataJob {
         int count = totalList.size();
         int size = 0;
         for (PictureSourceResult pictureSourceResult : totalList) {
+            //1.如果不存在图片默认一个默认图片，方便走测试。
+            if (pictureSourceResult.getLivePhoto() == null) {
+                List<Map<String, Object>> livePhoto = new ArrayList<>();
+                Map<String, Object> map = new HashMap<>();
+                map.put("imgUrl", StringUtils.isEmpty(apiConfig.getDefaultPictureImg()) ? "http://47.93.59.251/api/image/default.png" : apiConfig.getDefaultPictureImg());
+                map.put("imgName", "default.png");
+                livePhoto.add(map);
+                pictureSourceResult.setLivePhoto(livePhoto);
+            }
             if (pictureSourceResult.getLivePhoto() != null) {
                 size++;
                 // 将可以处理数据放入处理队列中

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml

@@ -266,6 +266,6 @@
                       '，备注：', t2.TASKCOMMENT)
         FROM ocr_taskchild_picture t1
                  LEFT JOIN oa_userapprove_t t2 ON t1.ID = t2.FORMID
-        where t1.PICTUREID = #{id,jdbcType=BIGINT}
+        where t1.PICTUREID = #{id,jdbcType=BIGINT} and t2.STATSHIS = 3
     </select>
 </mapper>