发送短信内容编辑

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/constant/RiskPlanConstants.java

@@ -31,6 +31,6 @@ public interface RiskPlanConstants {
     /**
      * 消息推送公司名称
      */
-    String LAB_SAFETY_MANAGEMENT_SYSTEM = "【实验室安全系统】";
+    String LAB_SAFETY_MANAGEMENT_SYSTEM = "【实验室安全智能】";
 
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabMessageContentServiceImpl.java

@@ -98,6 +98,7 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
 
 
     private final String smsFormat = "{}: {}，发生风险预案,{}";
+    private final String smsFormatString = "【实验室安全智能】{}发生{}预案,{}";
 
     /**
      * 查询消息发布
@@ -203,7 +204,9 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
             deptName = subAddrrs.get(0).getBuildName();
         }
 
-        String format = StrUtil.format(smsFormat, deptName, subject.getName(), StrUtil.isBlank(labRiskPlanLevel.getMessage()) ? labRiskPlanLevel.getRiskName() : labRiskPlanLevel.getMessage());
+//        String format = StrUtil.format(smsFormat, deptName, subject.getName(), StrUtil.isBlank(labRiskPlanLevel.getMessage()) ? labRiskPlanLevel.getRiskName() : labRiskPlanLevel.getMessage());
+        String format = StrUtil.format(smsFormatString, labRiskPlanLevel.getTopName(), labRiskPlanLevel.getRiskName(), StrUtil.isBlank(labRiskPlanLevel.getMessage()) ? "" : labRiskPlanLevel.getMessage());
+        logger.info("new format = {}",format);
         String phone = null;
         String userids = null;
         try {

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanServiceImpl.java

@@ -972,7 +972,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             //首页消息通知
             messageSendService.SendBigViewUpdate(BigViewDataType.SUB_WRAN_MESSAGE);
 
-            //发送大屏左下角预警消息
+            //发送大屏左下角预警消息 （电话短信）
             labMessageContentService.sendWranMessage(subFunction.getSubId(), labRiskPlanLevel, groupId);
 
             //首页预案流程通知

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabRiskPlanMapper.xml

@@ -536,10 +536,12 @@
     </select>
     <select id="selectLabRiskPlanByRiskPlanId" resultType="com.zd.laboratory.domain.LabRiskPlan">
             SELECT DISTINCT
-                (CONCAT( d.dept_class_name, d.`dept_name`, s.`name` )) topName,
+<!--                (CONCAT( d.dept_class_name,'-',d.`dept_name`,'-',s.`name` )) topName,-->
+                (CONCAT( d.dept_class_name,'-',s.`name`,'-',lbfl.room_num )) topName,
                 s.`floor_id` floorId
             FROM lab_subject s
-                INNER JOIN sys_dept d ON d.dept_id = s.build_id
+                LEFT JOIN sys_dept d ON d.dept_id = s.build_id
+                LEFT JOIN lab_build_floor_layout lbfl ON lbfl.sub_id = s.id
             WHERE
 	            s.`id` = #{subId}
      </select>