执法端-计划

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntPlanNoticeController.java

@@ -116,4 +116,16 @@ public class AppEntPlanNoticeController {
         efcodeCpNoticeMessageService.insertByBo(bo);
         return R.ok();
     }
+
+    /**
+     * 标记某个预告下所有消息为企业已读
+     *
+     * @param noticeId 预告ID
+     * @return 操作结果
+     */
+    @PutMapping("/message/markViewed")
+    public R<Void> markViewed(@RequestParam String noticeId) {
+        efcodeCpNoticeMessageService.markEnterpriseViewed(noticeId);
+        return R.ok();
+    }
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpNoticeMessageService.java

@@ -73,4 +73,11 @@ public interface IEfcodeCpNoticeMessageService {
      * @return 未读消息数量
      */
     Long countUnreadNoticeMessage(String enterpriseNumber);
+
+    /**
+     * 标记某个预告下所有消息为企业已读
+     *
+     * @param noticeId 预告ID
+     */
+    void markEnterpriseViewed(String noticeId);
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeMessageServiceImpl.java

@@ -6,6 +6,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -166,4 +167,20 @@ public class EfcodeCpNoticeMessageServiceImpl implements IEfcodeCpNoticeMessageS
         msgWrapper.eq(EfcodeCpNoticeMessage::getIsDelete, 0);
         return baseMapper.selectCount(msgWrapper);
     }
+
+    /**
+     * 标记某个预告下所有消息为企业已读
+     */
+    @Override
+    public void markEnterpriseViewed(String noticeId) {
+        if (StringUtils.isBlank(noticeId)) {
+            return;
+        }
+        LambdaUpdateWrapper<EfcodeCpNoticeMessage> updateWrapper = Wrappers.lambdaUpdate();
+        updateWrapper.eq(EfcodeCpNoticeMessage::getNoticeId, noticeId)
+            .eq(EfcodeCpNoticeMessage::getEnterpriseViewed, 0)
+            .eq(EfcodeCpNoticeMessage::getIsDelete, 0)
+            .set(EfcodeCpNoticeMessage::getEnterpriseViewed, 1);
+        baseMapper.update(null, updateWrapper);
+    }
 }

zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_edit.vue

@@ -256,7 +256,7 @@
                 </div>
                 <van-search
                     v-model="enterpriseSearchKeyword"
-                    placeholder="输入≥ 3 个字符检索企业,不要输入深圳,深圳市"
+                    placeholder="输入≥ 2 个字符检索企业,不要输入深圳,深圳市"
                     shape="round"
                     @update:model-value="onEnterpriseSearchInput"
                 />
@@ -274,7 +274,7 @@
                             <div class="enterprise-item-name">{{ item.enterpriseName }}</div>
                             <div class="enterprise-item-number">{{ item.enterpriseNumber }}</div>
                         </div>
-                        <van-empty v-if="enterpriseSearchKeyword.length >= 3 && !enterpriseOptions.length" description="未检索到匹配企业" image-size="80" />
+                        <van-empty v-if="enterpriseSearchKeyword.length >= 2 && !enterpriseOptions.length" description="未检索到匹配企业" image-size="80" />
                     </template>
                 </div>
             </div>
@@ -463,7 +463,7 @@ const onOpenEnterprisePicker = () => {
 const onEnterpriseSearchInput = (val) => {
     if (enterpriseSearchTimer) clearTimeout(enterpriseSearchTimer);
     const keyword = (val || '').trim();
-    if (keyword.length < 3) {
+    if (keyword.length < 2) {
         enterpriseOptions.value = [];
         return;
     }

zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_message.vue

@@ -73,11 +73,45 @@ const loading = ref(false);
 const inputMessage = ref('');
 const sending = ref(false);
 const messageAreaRef = ref(null);
+let pollTimer = null;
 
 onMounted(() => {
     loadMessages();
+    startPolling();
 });
 
+onUnmounted(() => {
+    stopPolling();
+});
+
+const startPolling = () => {
+    stopPolling();
+    pollTimer = setInterval(() => {
+        pollMessages();
+    }, 16000);
+};
+
+const stopPolling = () => {
+    if (pollTimer) {
+        clearInterval(pollTimer);
+        pollTimer = null;
+    }
+};
+
+// 轮询加载新消息（静默，不显示loading）
+const pollMessages = () => {
+    if (!noticeId.value) return;
+    getNoticeMessages(noticeId.value, (res) => {
+        if (res.code === 200 && Array.isArray(res.data)) {
+            const oldCount = messageList.value.length;
+            messageList.value = res.data;
+            if (res.data.length > oldCount) {
+                scrollToBottom();
+            }
+        }
+    });
+};
+
 const loadMessages = () => {
     if (!noticeId.value) return;
     loading.value = true;

zdxt-web-client/zdxt-efcode-enterprise-app/src/api/enterprise/planNotice.js

@@ -1,4 +1,4 @@
-import { _get, _post } from "../../http/index";
+import { _get, _post, _put } from "../../http/index";
 
 let enterpriseAppBaseUrl = "/app-ent";
 
@@ -13,3 +13,6 @@ export const getPlanNoticeMessageList = (params, success, error) => _get(enterpr
 
 //执法预告新增留言
 export const addPlanNoticeMessage = (params, success, error) => _post(enterpriseAppBaseUrl +"/planNotice/message",params,success,error);
+
+//标记预告消息为企业已读
+export const markMessageViewed = (noticeId, success, error) => _put(enterpriseAppBaseUrl +"/planNotice/message/markViewed?noticeId=" + noticeId, {}, success, error);

zdxt-web-client/zdxt-efcode-enterprise-app/src/router/enterprise-app/ent-main-router.js

@@ -8,7 +8,7 @@ const routes = [
     {
         path: "/enterprisetest",
         redirect: "/enterprise/enterpriseHome",
-        name: "enterpriseRoot",
+        name: "enterpriseRootTest",
     },
     // 企业端登录
     {

zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/plan/planNoticeMessage.vue

@@ -59,7 +59,7 @@
 <script setup name="planNoticeMessage">
 import { showToast } from 'vant';
 import 'vant/es/toast/style';
-import { getPlanNoticeMessageList, addPlanNoticeMessage } from '@/api/enterprise/planNotice';
+import { getPlanNoticeMessageList, addPlanNoticeMessage, markMessageViewed } from '@/api/enterprise/planNotice';
 
 const router = useRouter();
 const route = useRoute();
@@ -72,11 +72,52 @@ const loading = ref(false);
 const inputMessage = ref('');
 const sending = ref(false);
 const messageAreaRef = ref(null);
+let pollTimer = null;
 
 onMounted(() => {
     loadMessages();
+    // 打开页面时标记所有消息为企业已读
+    if (noticeId.value) {
+        markMessageViewed(noticeId.value);
+    }
+    // 启动15秒轮询
+    startPolling();
+});
+
+onUnmounted(() => {
+    stopPolling();
 });
 
+const startPolling = () => {
+    stopPolling();
+    pollTimer = setInterval(() => {
+        pollMessages();
+    }, 15000);
+};
+
+const stopPolling = () => {
+    if (pollTimer) {
+        clearInterval(pollTimer);
+        pollTimer = null;
+    }
+};
+
+// 轮询加载新消息（静默加载，不显示loading）
+const pollMessages = () => {
+    if (!noticeId.value) return;
+    getPlanNoticeMessageList({ noticeId: noticeId.value }, (res) => {
+        if (res.code === 200 && Array.isArray(res.data)) {
+            const oldCount = messageList.value.length;
+            messageList.value = res.data;
+            // 有新消息时滚动到底部，并标记已读
+            if (res.data.length > oldCount) {
+                scrollToBottom();
+                markMessageViewed(noticeId.value);
+            }
+        }
+    });
+};
+
 const loadMessages = () => {
     if (!noticeId.value) return;
     loading.value = true;