修改脚本文件

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fire_equip.xml

@@ -115,7 +115,7 @@
 
 
     <select id="queryForFireEquipmentHistoryCount" resultType="long">
-       <!--  SELECT
+       SELECT
         count(1)
         FROM
         (
@@ -159,12 +159,12 @@
         </if>
         <if test="startTime!=null">
             AND d.create_date BETWEEN '${startTime}' AND '${endTime}'
-        </if> -->
+        </if>
     </select>
 
 
     <select id="queryForFireEquipmentHistory" resultType="map">
-        <!-- SELECT
+        SELECT
         d.*
         FROM
         (
@@ -220,7 +220,6 @@
         </if>
         ORDER BY d.create_date desc
         LIMIT ${start},${length}
- -->
 
     </select>
 
@@ -326,7 +325,7 @@
     </select>
 
     <select id="findAllEquipPointInfo" resultType="com.yeejoin.amos.fas.business.vo.EquipCommunicationData">
-	   <!-- SELECT
+	   SELECT
 			p.`code` pointCode,
 			p.`name` pointName,
 			f.`name` equimentName,
@@ -342,11 +341,11 @@
 		LEFT JOIN f_fire_equipment e ON e.id = p.fire_equipment_id
 		LEFT JOIN f_equipment_fire_equipment fe ON fe.fire_equipment_id = e.id
 		LEFT JOIN f_equipment f ON f.id = fe.equipment_id
-		LEFT JOIN f_dict d on d.id = p.alarm_type -->
+		LEFT JOIN f_dict d on d.id = p.alarm_type
 	</select>
 
     <select id="findOneByPointCode" resultType="com.yeejoin.amos.fas.business.vo.EquipCommunicationData">
-	   <!-- SELECT
+	   SELECT
 			p.`code` pointCode,
 			p.`name` pointName,
 			e.id fireEquipmentId,
@@ -359,7 +358,7 @@
 			f_fire_equipment_point p
 		LEFT JOIN f_fire_equipment e ON e.id = p.fire_equipment_id
 		LEFT JOIN f_dict d on d.id = p.alarm_type
-		where p.`code` = #{code} -->
+		where p.`code` = #{code} 
 	</select>
 
     <select id="listByCodes" resultType="com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentEntity">
@@ -393,7 +392,7 @@
     <insert id="saveBatch" keyColumn="id" keyProperty="id"
             parameterType="com.yeejoin.amos.fas.business.param.FireEquipmentParam"
             useGeneratedKeys="true">
-       <!--  insert into f_fire_equipment
+        insert into f_fire_equipment
         (
             org_code,
             code,
@@ -432,7 +431,7 @@
             #{item.weight},
             #{item.riskSourceId}
         )
-        </foreach> -->
+        </foreach> 
     </insert>
 
     <update id="updateBatch">