459242451@qq.com 2 năm trước cách đây
mục cha
commit
a732d989c7

+ 6 - 0
README.md

@@ -138,3 +138,9 @@ docker push 10.11.208.18:18080/hses/yjzh-web:v1.1
 http://10.11.208.12:31000/sqpchd/#/home
 http://10.11.208.12:31000/sqpc/#/home
 
+> Minio
+
+http://minio.xt.wenhq.top:8083
+accesskey: AKIAIOSFODNN7EXAMPLE secretkey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
+
+

+ 0 - 0
ruoyi-admin/start-duty.sh → ruoyi-admin/nacos/start-duty.sh


+ 0 - 0
ruoyi-admin/start-file.sh → ruoyi-admin/nacos/start-file.sh


+ 0 - 0
ruoyi-admin/start-incident.sh → ruoyi-admin/nacos/start-incident.sh


+ 0 - 0
ruoyi-admin/start-plan.sh → ruoyi-admin/nacos/start-plan.sh


+ 0 - 0
ruoyi-admin/start-resource.sh → ruoyi-admin/nacos/start-resource.sh


+ 0 - 0
ruoyi-admin/start-task.sh → ruoyi-admin/nacos/start-task.sh


+ 0 - 0
ruoyi-admin/start-user.sh → ruoyi-admin/nacos/start-user.sh


+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/IncidentController.java

@@ -297,10 +297,10 @@ public class IncidentController extends BaseController {
                             StringBuilder message = new StringBuilder();
                             for (Object o1 : jsonArray) {
                                 JSONObject jsonObject = JSONUtil.parseObj(o1);
-                                if ("0".equals(jsonObject.getStr("status"))) {
+                                if ("0".equals(jsonObject.getStr("readState"))) {
                                     // 未读
                                     unMessage.append(jsonObject.getStr("nickName")).append("、");
-                                } else if ("1".equals(jsonObject.getStr("status"))) {
+                                } else if ("1".equals(jsonObject.getStr("readState"))) {
                                     // 已读
                                     message.append(jsonObject.getStr("nickName")).append("、");
                                 }