提交

src/main/java/com/gz/job/MountArchiveFileJob.java

@@ -24,6 +24,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Profile;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 import tk.mybatis.mapper.entity.Example;
@@ -134,7 +135,8 @@ public class MountArchiveFileJob {
                                 // TODO: 2021/3/17 发送rabbitmq 队列消息
                                 if (ObjectUtil.isNotNull(archiveRVO)) {
                                     OcrEtlVO ocrBean = BeanUtil.copyProperties(archiveRVO, OcrEtlVO.class);
-                                    ocrBean.setFileUrl(serverFileUrlPrefix + archiveFileDTO.getFilePath() + "/" + archiveFileDTO.getFileName());
+//                                    ocrBean.setFileUrl(serverFileUrlPrefix + archiveFileDTO.getFilePath() + "/" + archiveFileDTO.getFileName());
+                                    ocrBean.setFileUrl(archiveFileDTO.getFilePath() + "/" + archiveFileDTO.getFileName());
                                     ocrBean.setSecondaryArchiveId(secondaryArchiveDTO.getId());
                                     log.info("【ocr识别】发起识别队列，参数[{}]", JSON.toJSONString(ocrBean));
                                     rabbitTemplate.convertAndSend(dataExchangeName, ocrBindingKey, JSON.toJSONString(ocrBean));
@@ -159,6 +161,7 @@ public class MountArchiveFileJob {
     public void testOcr(){
         // TODO: 2021/5/7 提交已经归档但是未ocr识别的历史数据进行ocr识别
         Example example = new Example(ArchiveFileDTO.class);
+//        example.and().andLike("originalFileName","%ZY·BH%");
         example.setOrderByClause("id ASC");
         List<ArchiveFileDTO> archiveFileDTOS = archiveFileMapper.selectByExample(example);
         for (int i = 0; i < archiveFileDTOS.size(); i++) {
@@ -166,7 +169,8 @@ public class MountArchiveFileJob {
             ArchiveRVO archiveRVO = archiveMapper.selectByPk(archiveFileDTO.getArchiveId());
             OcrEtlVO ocrBean = BeanUtil.copyProperties(archiveRVO, OcrEtlVO.class);
             ocrBean.setSecondaryArchiveId(archiveFileDTO.getSecondaryArchiveId());
-            ocrBean.setFileUrl(serverFileUrlPrefix + archiveFileDTO.getFilePath() + "/" + archiveFileDTO.getFileName());
+//            ocrBean.setFileUrl(serverFileUrlPrefix + archiveFileDTO.getFilePath() + "/" + archiveFileDTO.getFileName());
+            ocrBean.setFileUrl(archiveFileDTO.getFilePath() + "/" + archiveFileDTO.getFileName());
             log.info("【ocr识别】发起识别队列，参数[{}]", JSON.toJSONString(ocrBean));
             rabbitTemplate.convertAndSend(dataExchangeName, ocrBindingKey, JSON.toJSONString(ocrBean));
         }

src/main/java/com/gz/service/archive/impl/ArchiveFileServiceImpl.java

@@ -138,7 +138,8 @@ public class ArchiveFileServiceImpl implements ArchiveFileService {
             ArchiveRVO d = archiveMapper.selectByPk(archiveFileDTO.getArchiveId());
             OcrEtlVO ocrEtlVO = BeanUtil.copyProperties(d, OcrEtlVO.class);
             ocrEtlVO.setSecondaryArchiveId(secondaryArchiveId);
-            ocrEtlVO.setFileUrl(serverFileUrlPrefix + archiveFileDTO.getFilePath() + "/" + archiveFileDTO.getFileName());
+            ocrEtlVO.setFileUrl(archiveFileDTO.getFilePath() + "/" + archiveFileDTO.getFileName());
+//            ocrEtlVO.setFileUrl(serverFileUrlPrefix + archiveFileDTO.getFilePath() + "/" + archiveFileDTO.getFileName());
             rabbitTemplate.convertAndSend(dataExchangeName, ocrBindingKey, JSON.toJSONString(ocrEtlVO));
         }
         return archiveFileDTO;

src/main/resources/application-dev.yml

@@ -58,7 +58,7 @@ spring:
   # redis配置
   redis:
     # redis地址
-    host: 127.0.0.1
+    host: 192.168.113.5
     # redis端口
     port: 6379
     # redis库

src/main/resources/mapper/archiveMapper.xml

@@ -39,7 +39,20 @@
                 AND a.ml = #{ml} or a.ml in (select `code` FROM tab_archives_tree where parent_id = (SELECT id FROM `tab_archives_tree` where code = #{ml}))
             </if>
             <if test="bgqx != null and bgqx != ''">
-                AND a.bgqx = #{bgqx}
+                <choose>
+                    <when test="bgqx == 'D10' or bgqx == '005'">
+                        AND a.bgqx in ('D10','005')
+                    </when>
+                    <when test="bgqx == 'D30' or bgqx == '004'">
+                        AND a.bgqx in ('D30','004')
+                    </when>
+                    <when test="bgqx == 'Y'.toString() or bgqx == '001'">
+                        AND a.bgqx in ('Y','001')
+                    </when>
+                    <otherwise>
+                        AND a.bgqx = #{bgqx}
+                    </otherwise>
+                </choose>
             </if>
             <if test="mj != null and mj != ''">
                 AND a.mj = #{mj}

src/main/resources/static/js/lay-module/layuimini/miniTab.js

@@ -229,7 +229,7 @@ layui.define(["element", "layer", "jquery"], function (exports) {
                 if (!checkTab) {
                     miniTab.create({
                         tabId: tabId,
-                        href: href,
+                        href: href + '?t' + new Date().getTime(), // 添加随机数防止缓存
                         title: title,
                         isIframe: false,
                         maxTabNum: options.maxTabNum,

src/main/resources/static/page/archive/list.html

@@ -242,7 +242,11 @@
         }
 
         let initBgqx = function () {
-            http.get('system/dict/selectDictByCode', {code: searchParam.ml === 'WS' ? 'BAOGUANQIXIANYI' : 'BAOGUANQIXIANER'}, false, function (res) {
+            let code = 'BAOGUANQIXIANER'
+            if(searchParam.ml === 'WS' || searchParam.ml === ''){
+                code = 'BAOGUANQIXIANYI'
+            }
+            http.get('system/dict/selectDictByCode', {code: code}, false, function (res) {
                 let html = '';
                 for (let i in res.data) {
                     html += '<option value="' + res.data[i].dictCode + '">' + res.data[i].dictName + '</option>'