`fix`

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TblTaskController.java

@@ -376,9 +376,16 @@ public class TblTaskController extends BaseController
                 "                          taskinfo.tblTaskLogList.filter(\n" +
                 "                            function(ii) { return ii.taskStatus === 3}\n" +
                 "                          )[0].logDes\n" +
-                "                        ).qsdes }";
+                "                        ).gzldata[0].value1 }";
         Object xchs = JSUtils.runjs(runjs);
 
+        runjs = commjs+"return JSON.parse(\n" +
+                "                          taskinfo.tblTaskLogList.filter(\n" +
+                "                            function(ii) { return ii.taskStatus === 3}\n" +
+                "                          )[0].logDes\n" +
+                "                        ).czff }";
+        Object czff = JSUtils.runjs(runjs);
+
 
         String datap = "事件分类："+(task.getTaskType()==null?"-": typemap.get(task.getTaskType())) + "\r\n";
         datap+="区域："+areamap.get(task.getTaskArea())+ "\r\n";
@@ -387,9 +394,9 @@ public class TblTaskController extends BaseController
         datap+="工单号："+(task.getTaskCode()==null?"-": task.getTaskCode())+ "\r\n";
         datap+="事件地址："+(task.getTaskAddr()==null?"-": task.getTaskAddr())+ "\r\n";
         datap+="事件内容："+(task.getTaskContent()==null?"-": task.getTaskContent())+ "\r\n";
-        datap+="事件类型："+(task.getTaskEventType()==null?"-": taskeventtype.get(task.getTaskContent()))+ "\r\n";
+        datap+="事件类型："+(task.getTaskEventType()==null?"-": taskeventtype.get(task.getTaskEventType()+""))+ "\r\n";
         datap+="现场核实："+(xchs==null?"-": xchs.toString() )+ "\r\n";
-        datap+="处理方法：";
+        datap+="处理方法："+(czff==null?"-": czff.toString() )+ "\r\n";;
 
         Map<String,Object> data = new HashMap<>();
 

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,8 +6,8 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://${DATABASE_HOST:localhost}:${DATABASE_PORT:3306}/nnbp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                url: jdbc:mysql://${DATABASE_HOST:xt.wenhq.top}:${DATABASE_PORT:8583}/nnbp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://${DATABASE_HOST:localhost}:${DATABASE_PORT:3306}/nnbp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://${DATABASE_HOST:xt.wenhq.top}:${DATABASE_PORT:8583}/nnbp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: ${DATABASE_USER:root}
                 password: ${DATABASE_PWD:root}
             # 从库数据源