merge dev 修改预案水资源初始化接口

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

@@ -100,7 +100,7 @@ public class FireEquimtPointController extends BaseController {
                                @ApiParam(value = "监测点编号或者监测点名称模糊匹配") @RequestParam(required = false) String searchValue,
                                @ApiParam(value = "类型（模拟量：ANALOGUE；开关量：SWITCH）") @RequestParam(required = false) String type) {
         Map<String, Object> queryMap = Maps.newHashMap();
-        queryMap.put("pageNumber", pageNumber);
+        queryMap.put("offset", pageNumber*pageSize);
         queryMap.put("pageSize", pageSize);
         if (isBindDevice != null && isBindDevice == 0) {
             queryMap.put("fireEquipmentId", 0);

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

@@ -4,13 +4,21 @@ package com.yeejoin.amos.fas.business.service.impl;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+<<<<<<< HEAD
+=======
+import java.util.Arrays;
+import java.util.Collections;
+>>>>>>> dev
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+<<<<<<< HEAD
 import java.util.Optional;
+=======
+>>>>>>> dev
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.BlockingQueue;
@@ -22,7 +30,10 @@ import java.util.stream.Collectors;
 
 import javax.annotation.PostConstruct;
 
+<<<<<<< HEAD
 import org.apache.commons.lang.StringUtils;
+=======
+>>>>>>> dev
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -59,7 +70,10 @@ import com.yeejoin.amos.fas.business.dao.mapper.FmeaPointInputitemMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.ImpAndFireEquipMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.RiskSourceMapper;
 import com.yeejoin.amos.fas.business.dao.mongo.EquipCommunicationDao;
+<<<<<<< HEAD
 import com.yeejoin.amos.fas.business.dao.repository.IAlarmDao;
+=======
+>>>>>>> dev
 import com.yeejoin.amos.fas.business.dao.repository.IContingencyOriginalDataDao;
 import com.yeejoin.amos.fas.business.dao.repository.IDictDao;
 import com.yeejoin.amos.fas.business.dao.repository.IEvaluationModelDao;
@@ -69,10 +83,17 @@ import com.yeejoin.amos.fas.business.dao.repository.IFireEquipmentPointDao;
 import com.yeejoin.amos.fas.business.dao.repository.IFmeaDao;
 import com.yeejoin.amos.fas.business.dao.repository.IPPointDao;
 import com.yeejoin.amos.fas.business.dao.repository.IPreplanPictureDao;
+<<<<<<< HEAD
 import com.yeejoin.amos.fas.business.dao.repository.IRiskFactorDao;
 import com.yeejoin.amos.fas.business.dao.repository.IRiskLevelDao;
 import com.yeejoin.amos.fas.business.dao.repository.IRiskSourceDao;
 import com.yeejoin.amos.fas.business.dao.repository.IRpnChangeLogDao;
+=======
+import com.yeejoin.amos.fas.business.dao.repository.IRiskLevelDao;
+import com.yeejoin.amos.fas.business.dao.repository.IRiskSourceDao;
+import com.yeejoin.amos.fas.business.dao.repository.IRpnChangeLogDao;
+import com.yeejoin.amos.fas.business.dao.repository.IUserDao;
+>>>>>>> dev
 import com.yeejoin.amos.fas.business.feign.RemoteRuleServer;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.feign.RemoteWebSocketServer;
@@ -86,11 +107,19 @@ import com.yeejoin.amos.fas.business.service.intfc.IContingencyInstance;
 import com.yeejoin.amos.fas.business.service.intfc.IDataRefreshService;
 import com.yeejoin.amos.fas.business.service.intfc.IEquipmentService;
 import com.yeejoin.amos.fas.business.service.intfc.IRiskSourceService;
+<<<<<<< HEAD
+=======
+import com.yeejoin.amos.fas.business.service.intfc.Node3dVoService;
+>>>>>>> dev
 import com.yeejoin.amos.fas.business.service.model.CheckInputItemRo;
 import com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus;
 import com.yeejoin.amos.fas.business.service.model.ContingencyRo;
 import com.yeejoin.amos.fas.business.service.model.FireEquimentDataRo;
 import com.yeejoin.amos.fas.business.service.model.ProtalDataRo;
+<<<<<<< HEAD
+=======
+import com.yeejoin.amos.fas.business.service.model.RiskSourceRo;
+>>>>>>> dev
 import com.yeejoin.amos.fas.business.service.model.RiskSourceRuleRo;
 import com.yeejoin.amos.fas.business.util.DateUtils;
 import com.yeejoin.amos.fas.business.util.JexlUtil;
@@ -101,7 +130,11 @@ import com.yeejoin.amos.fas.common.enums.DataRefreshTypeEum;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.response.RegionTreeResponse;
 import com.yeejoin.amos.fas.core.common.response.RiskSourceTreeResponse;
+<<<<<<< HEAD
 import com.yeejoin.amos.fas.dao.entity.Alarm;
+=======
+import com.yeejoin.amos.fas.core.util.StringUtil;
+>>>>>>> dev
 import com.yeejoin.amos.fas.dao.entity.ContingencyOriginalData;
 import com.yeejoin.amos.fas.dao.entity.Dict;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
@@ -112,6 +145,7 @@ import com.yeejoin.amos.fas.dao.entity.FireEquipmentPoint;
 import com.yeejoin.amos.fas.dao.entity.Fmea;
 import com.yeejoin.amos.fas.dao.entity.FmeaEquipmentPoint;
 import com.yeejoin.amos.fas.dao.entity.FmeaPointInputitem;
+<<<<<<< HEAD
 import com.yeejoin.amos.fas.dao.entity.PreplanPicture;
 import com.yeejoin.amos.fas.dao.entity.RiskFactor;
 import com.yeejoin.amos.fas.dao.entity.RiskLevel;
@@ -120,6 +154,15 @@ import com.yeejoin.amos.fas.dao.entity.RpnChangeLog;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
+=======
+import com.yeejoin.amos.fas.dao.entity.PPoint;
+import com.yeejoin.amos.fas.dao.entity.PreplanPicture;
+import com.yeejoin.amos.fas.dao.entity.RiskLevel;
+import com.yeejoin.amos.fas.dao.entity.RiskSource;
+import com.yeejoin.amos.fas.dao.entity.RpnChangeLog;
+import com.yeejoin.amos.fas.dao.entity.SUser;
+import com.yeejoin.amos.fas.exception.YeeException;
+>>>>>>> dev
 
 
 @Service("riskSourceService")
@@ -1090,26 +1133,26 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         List<Map> list = riskSourceMapper.queryContingencyWater();
         HashOperations hashOperations = redisTemplate.opsForHash();
         for (Map map : list) {
+        	  double area = 0;
+              if (!ObjectUtils.isEmpty(map.get("area"))) {
+                  area = Double.valueOf(map.get("area").toString());
+              }
+            String maxlevel = map.get("max_level") !=null?map.get("max_level").toString():"0.0";
+        	String level = map.get("value") !=null&& StringUtil.isNumeric(map.get("value").toString())?String.format("%.2f", (Double.valueOf(map.get("value").toString()))):maxlevel;
+        	
+        	String volume = String.format("%.2f", Double.valueOf(level) * area);
             if (hashOperations.size("Analogue") > 0) {
                 if (ObjectUtils.isEmpty(map.get("CODE")) || !hashOperations.hasKey("Analogue", map.get("CODE"))) {
-                    map.put("level", 0);
-                    map.put("volume", 0);
+                    map.put("level", level);
+                    map.put("volume", volume);
                     continue;
                 }
                 EquipCommunicationData data = (EquipCommunicationData) hashOperations.get("Analogue", map.get("CODE"));
-                map.put("level", String.format("%.2f", StringUtils.isNumeric(data.getState())?Double.valueOf(data.getState()):0));
-                if (!ObjectUtils.isEmpty(map.get("level"))) {
-                    double area = 0;
-                    if (!ObjectUtils.isEmpty(map.get("area"))) {
-                        area = Double.valueOf(map.get("area").toString());
-                    }
-                    map.put("volume", String.format("%.2f", Double.valueOf(map.get("level").toString()) * area));
-                } else {
-                    map.put("volume", 0);
-                }
+                map.put("level",  StringUtil.isNumeric(data.getState())?data.getState():level);
+                map.put("volume", String.format("%.2f", (Double.valueOf(map.get("level").toString())* area)));
             } else {
-                map.put("level", 0);
-                map.put("volume", 0);
+                map.put("level", level);
+                map.put("volume", volume);
             }
         }
         return list;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/core/util/StringUtil.java

@@ -61,20 +61,21 @@ public class StringUtil {
 	 * @return 是否数字的标志
 	 */
 	public static boolean isNumeric(String str) {
-		// 该正则表达式可以匹配所有的数字 包括负数
-		String bigStr;
-		try {
-			bigStr = new BigDecimal(str).toString();
-		} catch (Exception e) {
-			return false;// 异常 说明包含非数字。
-		}
+        // 该正则表达式可以匹配所有的数字 包括负数
+        Pattern pattern = Pattern.compile("-?[0-9]+(\\.[0-9]+)?");
+        String bigStr;
+        try {
+            bigStr = new BigDecimal(str).toString();
+        } catch (Exception e) {
+            return false;//异常 说明包含非数字。
+        }
 
-		Matcher isNum = numericPattern.matcher(bigStr); // matcher是全匹配
-		if (!isNum.matches()) {
-			return false;
-		}
-		return true;
-	}
+        Matcher isNum = pattern.matcher(bigStr); // matcher是全匹配
+        if (!isNum.matches()) {
+            return false;
+        }
+        return true;
+    }
 
 	public static int toInt(String s) {
 		if (s != null && !"".equals(s.trim())) {

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

@@ -152,8 +152,8 @@
 			</if>
 		</where>
 		order by a.create_date desc
-		<if test="pageSize!=null and pageSize!=-1 and pageNumber!=null">
-			limit #{pageNumber},#{pageSize}
+		<if test="pageSize!=null and pageSize!=-1 and offset!=null">
+			limit #{offset},#{pageSize}
 		</if>
 	</select>
 

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

@@ -609,7 +609,8 @@
 			wr.max_level,
 			wr.area,
 			ep.CODE,
-			wr.`name`
+			wr.`name`,
+			ep.value
 		FROM
 			f_fire_equipment_point ep
 		INNER JOIN f_water_resource_equipment wre ON wre.fire_equipment_id = ep.fire_equipment_id AND ep.type = 'ANALOGUE'