调试接口

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

@@ -171,7 +171,8 @@ public class View3dController extends BaseController {
 		ReginParams reginParams =getSelectedOrgInfo();
 		String orgCode = this.getOrgCode(reginParams);
 		orgCode = "1*2";
-		return view3dService.getStatisticsDuty(getAppKey(),getProduct(),orgCode);
+		CommonResponse statisticsDuty = view3dService.getStatisticsDuty(getAppKey(),getProduct(),orgCode);
+		return statisticsDuty;
 	}
 
 	@ApiOperation(value = "异常区域信息查询",notes = "异常区域信息查询")

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/View3dServiceImpl.java

@@ -462,7 +462,7 @@ public class View3dServiceImpl implements IView3dService {
 			return view3dMapper.getRiskErrorTop5(orgCode);
 		case "check"://巡检异常
 			return view3dMapper.getCheckErrorTop5(orgCode);
-		case "equip":
+		case "fire":
 			return JSON.parseArray(" [\r\n" + 
 					"        {\r\n" + 
 					"            \"id\": 35781,\r\n" + 

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

@@ -390,7 +390,7 @@
 	
 	<select id="getSafetyIndexWeek" resultType="java.util.HashMap">
 		<![CDATA[
-			SELECT temp1.*,IFNULL(S.safety_index,0) as value
+			SELECT distinct temp1.*,IFNULL(S.safety_index,0) as value
 			FROM (
 				SELECT @s :=@s + 1 as `index`, DATE(DATE_SUB(CURRENT_DATE, INTERVAL @s DAY)) AS date
 				FROM mysql.help_topic,(SELECT @s := 0) temp
@@ -491,7 +491,9 @@
 	</select>
 	
 	<select id="getCheckErrorTop5" resultType="com.yeejoin.amos.fas.business.bo.SafetyExecuteBo">
-		SELECT p.id,I.point_no as code,I.name as label,p.point_id,'check' as type,p.check_time as changeDate
+		SELECT p.id,I.point_no as code,
+			IF(p.is_ok = '2', CONCAT(I.name,' 不合格') ,CONCAT(I.name,' 漏检') ) as label,
+			p.point_id,'check' as type,p.check_time as changeDate
 		FROM p_check p
 		left join p_point I ON I.id = p.point_id
 		where p.is_ok IN ('2', '3')