查询检查项接口增加

AmosBankService/src/main/java/com/yeejoin/amos/bank/controller/EquipmentController.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.bank.controller;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -14,9 +15,12 @@ import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.bank.dao.entity.Alarm;
 import com.yeejoin.amos.bank.entity.DeviceRecord;
 import com.yeejoin.amos.bank.entity.EquipmentVo;
+import com.yeejoin.amos.bank.param.PointParam;
+import com.yeejoin.amos.bank.remote.client.RiskModelRemoteClient;
 import com.yeejoin.amos.bank.service.IAlarmService;
 import com.yeejoin.amos.bank.service.IEquipmentService;
 import com.yeejoin.amos.bank.service.WarnService;
+import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.op.core.common.query.DaoCriteria;
 import com.yeejoin.amos.op.core.common.response.CommonResponse;
 import com.yeejoin.amos.op.core.util.CommonResponseUtil;
@@ -44,6 +48,9 @@ public class EquipmentController extends BaseController{
 	
 	@Autowired
     private IAlarmService iAlarmService;
+	
+	@Autowired
+    RiskModelRemoteClient riskModelRemoteClient;
 
 	
 	@GetMapping(value = "/detail", produces = "application/json;charset=UTF-8")
@@ -103,4 +110,28 @@ public class EquipmentController extends BaseController{
     	  Page selfDevice = equipmentService.queryEquimentRelation(commonPageable,fname);
 	      return CommonResponseUtil.success(selfDevice);
     }
+    
+    @GetMapping(value = "/pointItemEquipment", produces = "application/json;charset=UTF-8")
+    @ApiOperation(value = "装备指标列表查询", notes = "装备指标列表查询")
+    public CommonResponse getPointItemEquipment(@RequestParam(value = "factorId", required = false) Long factorId
+           ) throws InnerInvokException {
+    	  List<PointParam> handleEquipmentsPointData = equipmentService.handleEquipmentsPointData(factorId);
+	      return CommonResponseUtil.success(handleEquipmentsPointData);
+    }
+    
+    @GetMapping(value = "/pointItemPatrol", produces = "application/json;charset=UTF-8")
+    @ApiOperation(value = "装备指标列表查询", notes = "装备指标列表查询")
+    public CommonResponse getPointItemPatrol(@RequestParam(value = "factorId", required = false) Long factorId
+           ) throws InnerInvokException {
+    	  List<PointParam> handlePatrolPointData = equipmentService.handlePatrolPointData(factorId);
+	      return CommonResponseUtil.success(handlePatrolPointData);
+    }
+    
+    @GetMapping(value = "/getPointItemDatas", produces = "application/json;charset=UTF-8")
+    @ApiOperation(value = "指标列表查询", notes = "指标列表查询")
+    public CommonResponse getPointItemDatas(@RequestParam(value = "factorId", required = false) Long factorId
+           ) throws InnerInvokException {
+    	  Map<String, List> handlePointDatas = equipmentService.handlePointDatas(factorId);
+	      return CommonResponseUtil.success(handlePointDatas);
+    }
 }

AmosBankService/src/main/java/com/yeejoin/amos/bank/param/PointParam.java

+package com.yeejoin.amos.bank.param;
+
+import java.io.Serializable;
+
+/**
+ * 巡检点、设备指标项情况
+ * @author DELL
+ *
+ */
+public class PointParam implements Serializable {
+
+	/**
+	 * serialVersionUID
+	 */
+	private static final long serialVersionUID = 1L;
+
+	//告警类型 patrol巡检    device设备
+	private String type;
+	
+	//巡检点名称或者设备名称
+	private String name;
+	
+	//检查项名称
+	private String value;
+	
+	//qualified合格         unqualified不合格
+	private String identification;
+	
+	private Long factorId;
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public String getIdentification() {
+		return identification;
+	}
+
+	public void setIdentification(String identification) {
+		this.identification = identification;
+	}
+
+	public Long getFactorId() {
+		return factorId;
+	}
+
+	public void setFactorId(Long factorId) {
+		this.factorId = factorId;
+	}
+	
+	
+	
+	
+	
+}

AmosBankService/src/main/java/com/yeejoin/amos/bank/remote/client/RiskModelRemoteClient.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.bank.remote.client;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.op.core.common.response.CommonResponse;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -21,4 +20,18 @@ public interface RiskModelRemoteClient {
      */
     @RequestMapping(value = "api/risksource/update/fireqeuiment/sod", method = RequestMethod.GET, consumes="application/json" )
     CommonResponse updateEquipmentAlarmData(@RequestParam(value = "riskFactorID") Long riskFactorID) throws InnerInvokException;
+    
+    
+    /**
+     * 根据风险因素id查询巡检点和指标项目列表
+     */
+    @RequestMapping(value = "/api/risksource/getEquiments/points", method = RequestMethod.GET, consumes="application/json" )
+    CommonResponse listPointInputitemByFactorId(@RequestParam(value = "factorId") Long factorId) throws InnerInvokException;
+    
+    
+    /**
+     * 根据风险因素id查询设备和指标项列表
+     */
+    @RequestMapping(value = "/api/risksource/getFactorBindPoints", method = RequestMethod.GET, consumes="application/json" )
+    CommonResponse queryBoundByFactroId(@RequestParam(value = "factorId") Long factorId) throws InnerInvokException;
 }

AmosBankService/src/main/java/com/yeejoin/amos/bank/service/IEquipmentService.java

@@ -2,11 +2,14 @@ package com.yeejoin.amos.bank.service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.data.domain.Page;
 
 import com.alibaba.fastjson.JSONArray;
 import com.yeejoin.amos.bank.entity.DeviceRecord;
+import com.yeejoin.amos.bank.param.PointParam;
+import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.spc.core.common.request.CommonPageable;
 import com.yeejoin.amos.spc.core.common.response.Node3DVoResponse;
 
@@ -31,5 +34,11 @@ public interface IEquipmentService {
 	List<DeviceRecord> selfDevice();
 	
 	Page queryEquimentRelation(CommonPageable commonPageable, String fname);
+	
+	List<PointParam> handleEquipmentsPointData (Long factorId) throws InnerInvokException;
+	
+	List<PointParam> handlePatrolPointData(Long factorId) throws InnerInvokException;
+	
+	Map<String, List> handlePointDatas(Long factorId) throws InnerInvokException;
 
 }

AmosBankService/src/main/java/com/yeejoin/amos/bank/service/impl/EquipmentServuceImpl2.java

@@ -10,7 +10,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Maps;
@@ -19,8 +18,10 @@ import com.yeejoin.amos.bank.dao.IDeviceRecord;
 import com.yeejoin.amos.bank.entity.DeviceRecord;
 import com.yeejoin.amos.bank.entity.EquipmentQualityVo;
 import com.yeejoin.amos.bank.entity.EquipmentVo;
+import com.yeejoin.amos.bank.param.PointParam;
 import com.yeejoin.amos.bank.remote.RemoteDeviceService;
 import com.yeejoin.amos.bank.remote.client.DeviceRemoteClient;
+import com.yeejoin.amos.bank.remote.client.RiskModelRemoteClient;
 import com.yeejoin.amos.bank.service.IEquipmentService;
 import com.yeejoin.amos.bank.utils.JsonUtil;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
@@ -31,6 +32,8 @@ import com.yeejoin.amos.spc.core.common.response.CoordDTO;
 import com.yeejoin.amos.spc.core.common.response.Node3DVoResponse;
 import com.yeejoin.amos.spc.exception.YeeException;
 
+import fr.opensagres.xdocreport.template.velocity.internal.Foreach;
+
 @Service
 public class EquipmentServuceImpl2 implements IEquipmentService {
 
@@ -46,6 +49,9 @@ public class EquipmentServuceImpl2 implements IEquipmentService {
     @Autowired
     IDeviceRecord iDeviceRecord;
     
+	@Autowired
+    RiskModelRemoteClient riskModelRemoteClient;
+    
 
     @Override
     public JSONArray queryEquipmentById(Long id, String type, String token) {
@@ -285,4 +291,76 @@ public class EquipmentServuceImpl2 implements IEquipmentService {
 		return new PageImpl<>(list, commonPageable, total);
 	}
 
+	@Override
+	public List<PointParam> handleEquipmentsPointData(Long factorId) throws InnerInvokException {
+		 List<PointParam> list = new ArrayList<PointParam>();
+		 CommonResponse queryBoundByFactroId = riskModelRemoteClient.listPointInputitemByFactorId(factorId);
+		 List<Map> dataList = (List<Map>) queryBoundByFactroId.getDataList();
+		 if(null !=dataList && dataList.size() > 0) {
+			 for (Map map : dataList) {
+				 //指标项
+				 String equipmentPointNames = (String) map.get("equipmentPointNames");
+				 String eqName = (String) map.get("equipmentName");
+				 String[] split = equipmentPointNames.split("\n|\r");
+				 for (int i = 0; i < split.length; i++) {
+					PointParam param = new PointParam();
+					String inputItemName = split[i];
+					//检查项目是否合格
+				    String identification = inputItemName.endsWith("##0")?"qualified":"unqualified";
+				 	param.setFactorId(factorId);
+					param.setIdentification(identification);
+					param.setName(eqName);
+					param.setType("device");
+					param.setValue(inputItemName.substring(0, inputItemName.length()-3));
+					list.add(param);
+				 }
+			 }
+		 }
+		 return list;
+		
+	}
+
+	@Override
+	public List<PointParam> handlePatrolPointData(Long factorId) throws InnerInvokException {
+		 List<PointParam> list = new ArrayList<PointParam>();
+		 CommonResponse queryBoundByFactroId = riskModelRemoteClient.queryBoundByFactroId(factorId);
+		 List<Map> dataList = (List<Map>) queryBoundByFactroId.getDataList();
+		 if(null !=dataList && dataList.size() > 0) {
+			 for (Map map : dataList) {
+				 //指标项
+				 
+				 String inputItems = (String) map.get("inputItems");
+				 String patrolName = (String) map.get("pointName");
+				 String[] split = inputItems.split("\n|\r");
+				 for (int i = 0; i < split.length; i++) {
+					//检查项名称
+					PointParam param = new PointParam();
+					String inputItemName = split[i];
+					//检查项目是否合格
+					String identification = inputItemName.endsWith("##0")?"qualified":"unqualified";
+					param.setFactorId(factorId);
+					param.setIdentification(identification);
+					param.setName(patrolName);
+					param.setType("patrol");
+					param.setValue(inputItemName.substring(0, inputItemName.length()-3));
+					list.add(param);
+				 }
+					
+			}
+		 }
+		 return list;
+		
+	}
+
+	@Override
+	public Map<String, List> handlePointDatas(Long factorId) throws InnerInvokException {
+		Map<String, List> map = new HashMap<>();
+		List<PointParam> handlePatrolPointData = handlePatrolPointData(factorId);
+		List<PointParam> handleEquipmentsPointData = handleEquipmentsPointData(factorId);
+		map.put("patrol", handlePatrolPointData);
+		map.put("device", handleEquipmentsPointData);
+		return map;
+	
+    }
+
 }