修改通知去重复

smart-office-manager-ui/admin/vue.config.js

@@ -8,8 +8,9 @@ module.exports = {
     hot: true, //自动保存
     proxy: {
       "/office": {
-        target: "http://192.168.0.98:11085",
-        // target: 'http://8.136.255.30:11078',
+       // target: "http://localhost:11085",
+        //target: "http://192.168.0.98:11085",
+         target: 'http://8.136.255.30:11085',
         changeOrigin: true,
         secure: false,
         cookieDomainRewrite: "localhost",

smart-office-manager/pom.xml

@@ -23,8 +23,13 @@
             <properties>
                 <profiles.active>develop</profiles.active>
                 <profiles.platform.type>standalone</profiles.platform.type>
-                <profiles.server.port>21085</profiles.server.port>
+                <profiles.server.port>11085</profiles.server.port>
                 <profiles.server.path>/office</profiles.server.path>
+                <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
+                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
+                <profiles.rabbitmq.username>root_mq</profiles.rabbitmq.username>
+                <profiles.rabbitmq.password>xhx@2022</profiles.rabbitmq.password>
+                <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
                 <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
                 <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
                 <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>

smart-office-manager/src/main/java/com/mortals/xhx/base/login/web/StandaloneLoginController.java

@@ -74,7 +74,9 @@ public class StandaloneLoginController extends BaseCRUDJsonBodyMappingController
         try {
             loginForm.validate();
 
-            //userEntity = userService.doLogin(loginName, password, ip);
+            userEntity = userService.doCheckUser(loginName, password);
+
+            //   userEntity = userService.doLogin(loginName, password, ip);
             userEntity.setLastLoginAddress(ip);
 
             recordSysLog(request, userEntity, "用户登录系统成功!");

smart-office-manager/src/main/java/com/mortals/xhx/module/metting/service/impl/MettingRecordServiceImpl.java

@@ -115,7 +115,7 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
      * @return
      */
     public Boolean checkTimesHasOverlap(Date dynaStartTime, Date dynaEndTime, Date fixedStartTime, Date fixedEndTime) {
-        return !(dynaEndTime.getTime() < fixedStartTime.getTime() || dynaStartTime.getTime() > fixedEndTime.getTime());
+        return !(dynaEndTime.getTime() <= fixedStartTime.getTime() || dynaStartTime.getTime() >= fixedEndTime.getTime());
     }