1.增加企业负责人信息-tzs

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderInfoDto.java

@@ -137,4 +137,10 @@ public class CylinderInfoDto extends BaseDto {
     @ApiModelProperty(value = "联系电话")
     private String contactPhone;
 
+    @ApiModelProperty(value = "企业负责人手机")
+    private String personMobilePhone;
+
+    @ApiModelProperty(value = "企业负责人")
+    private String unitPerson;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderInfoMapper.xml

@@ -94,10 +94,13 @@
                 eu.address,
                 eu.custom_name,
                 eu.custom_type,
-                eu.contact_phone
+                eu.contact_phone,
+                cu.person_mobile_phone,
+                cu.unit_person
             from
             tz_cylinder_info ci
             left join tz_end_user eu on ci.end_custom_code = eu.custom_code
+            left join tz_cylinder_unit cu on cu.app_id = ci.app_id
             where
              ci.sequence_code = #{sequenceCode}
    </select>

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderInfoServiceImpl.java

@@ -19,6 +19,7 @@ import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -628,11 +629,13 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
             cylWarningMsgDto.setUserPeoplePhone(cylinderInfoDto.getContactPhone());
             cylWarningMsgDto.setCylSeq(cylinderInfoDto.getSequenceCode());
             cylWarningMsgDto.setCompanyName(cylinderInfoDto.getUnitName());
+            cylWarningMsgDto.setPhone(cylinderInfoDto.getPersonMobilePhone());
+            cylWarningMsgDto.setPeople(cylinderInfoDto.getUnitPerson());
             // 2.循环调用规则 触发计算等级及发送消息
             if (log.isInfoEnabled()) {
                 log.info("调用规则对象！+：{}", JSON.toJSONString(cylWarningMsgDto));
             }
-            ruleTrigger.publish(cylWarningMsgDto, "气瓶监管", null);
+            ruleTrigger.publish(cylWarningMsgDto, "气瓶监管/cylwarningmsg", null);
         } catch (Exception e) {
             log.error("调用规则失败！:{}", JSON.toJSONString(cylinderInfoDto));
         }