Merge branch 'CSFAS_V3.0.1.3' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into CSFAS_V3.0.1.3

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java

@@ -188,8 +188,8 @@ public class ContingencyAction implements CustomerAction {
      * @param nextStepName 下一步名称
      * @param paramObj     预案对象
      */
-    @RuleMethod(methodLabel = "步骤更新(新)", project = "换流站消防专项预案")
-    public void stepInfoNew(@MethodParam(paramLabel = "当前步骤编号") String stepCode,
+    @RuleMethod(methodLabel = "步骤更新", project = "换流站消防专项预案")
+    public void stepInfo(@MethodParam(paramLabel = "当前步骤编号") String stepCode,
                             @MethodParam(paramLabel = "当前步骤名称") String stepName,
     		                @MethodParam(paramLabel = "下一步编号") String nextStepCode,
                             @MethodParam(paramLabel = "下一步名称") String nextStepName,
@@ -222,8 +222,8 @@ public class ContingencyAction implements CustomerAction {
      * @param stepCode     当前步骤编号
      * @param paramObj     预案对象
      */
-    @RuleMethod(methodLabel = "步骤更新", project = "换流站消防专项预案")
-    public void stepInfo(@MethodParam(paramLabel = "当前编号") String stepCode,
+    @RuleMethod(methodLabel = "步骤更新(旧)", project = "换流站消防专项预案")
+    public void stepInfoOld(@MethodParam(paramLabel = "当前编号") String stepCode,
     		@MethodParam(paramLabel = "对象") Object paramObj) {
         ContingencyRo contingencyRo = (ContingencyRo) paramObj;
         stopSnapshop(contingencyRo);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/TimeLineController.java

@@ -116,7 +116,7 @@ public class TimeLineController extends BaseController{
     }
 
     @Permission
-    @ApiOperation(httpMethod = "get",value = "预案回放", notes = "预案回放")
+    @ApiOperation(httpMethod = "GET",value = "预案回放", notes = "预案回放")
     @RequestMapping(value = "/fire/replay", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse replay(@RequestParam("batchNo") String  batchNo,
                                      @RequestParam("randomNumber") String randomNumber) throws Exception{
@@ -125,7 +125,7 @@ public class TimeLineController extends BaseController{
     }
 
     @Permission
-    @ApiOperation(httpMethod = "get",value = "预案回放退出", notes = "预案回放退出")
+    @ApiOperation(httpMethod = "GET",value = "预案回放退出", notes = "预案回放退出")
     @RequestMapping(value = "/fire/replay/exit", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse replayExit(@RequestParam("batchNo") String  batchNo,
                                      @RequestParam("randomNumber") String randomNumber) throws Exception{

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

@@ -488,40 +488,33 @@
 				ala.id,
 				ala.equipment_specific_id AS pointId,
 				'monitorEquipment' AS type,
-			spe. CODE,
+				spe.CODE,
 				ala.equipment_specific_index_name,
 				CONCAT(
 					ala.equipment_specific_index_name,
 					'(',
 					ala.equipment_specific_name,
 					')',
-
-			IF (
+				IF
 					(
-					ISNULL(ws.full_name)
-					AND ISNULL(sd.description)
-				),
+						( ISNULL( ws.full_name ) AND ISNULL( sd.description ) ),
 						'',
-				CONCAT(
-					'【',
-					IFNULL(ws.full_name, ''),
-					' ',
-					IFNULL(sd.description, ''),
-					'】'
-				)
+						CONCAT( '【', IFNULL( ws.full_name, '' ), ' ', IFNULL( sd.description, '' ), '】' )
 					)
 				) AS label,
 				ala.create_date AS changeDate
 			FROM
-			wl_equipment_specific_alarm AS ala
+				wl_equipment_specific_alarm_log AS ala
 				LEFT JOIN wl_equipment_specific AS spe ON ala.equipment_specific_id = spe.id
 				LEFT JOIN wl_stock_detail sd ON sd.equipment_specific_id = spe.id
 				LEFT JOIN wl_warehouse_structure ws ON ws.id = sd.warehouse_structure_id
-		WHERE  ala.status = true
-		AND	   (ala.org_code = #{orgCode} OR ala.org_code like CONCAT(#{orgCode},'-%'))
+			WHERE
+				ala.equipment_specific_index_value = 'true'
+				AND ala.org_code = 10
 				AND ala.type = 'FIREALARM'
-		ORDER BY ala.create_date DESC
-		limit 0,5
+			ORDER BY
+				ala.create_date DESC
+				LIMIT 0,5
 	</select>
 
     <select id="getEquipStatusTop5" resultType="com.yeejoin.amos.fas.business.bo.SafetyExecuteBo">