Merge remote-tracking branch 'origin/yufei' into yufei

gdg

2021-01-29 d7427ab305dc17af447f5832903691eee329850c

 src/main/java/com/nanometer/smartlab/dao/SysAlarmPersonDao.xml

@@ -9,6 +9,7 @@
    <result property="warningLevel" column="warning_level" typeHandler="com.nanometer.smartlab.entity.handler.WarningLevelHandler"></result>
      <result property="userId" column="user_id"></result>
      <result property="warningPoint" column="warning_point"></result>
    <result property="refId" column="daping_alarm_id"/>
  </resultMap>

  <insert id="insertSysAlarmPerson" parameterType="com.nanometer.smartlab.entity.SysAlarmPerson">
@@ -24,5 +25,14 @@
      and  warning_time = #{warningTime}
      and  warning_level = #{warningLevel}
  </select>

  <select id="selectByCode" resultType="com.nanometer.smartlab.entity.SysAlarmPerson">
      select
       id,
       container_code as containerCode,
       warning_id as warningId,
       daping_alarm_id as refId
      from sys_warning
      where container_code = #{containerCode}
      and  warning_id = #{warningId}
  </select>
</mapper>