Merge remote-tracking branch 'origin/master'

# Conflicts:
#	hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java

hzims-biz-common/src/main/java/com/hnac/hzims/common/utils/Condition.java

@@ -51,21 +51,29 @@ public class Condition extends org.springblade.core.mp.support.Condition {
         for(Field field:fieldList){
             field.setAccessible(true);
             QueryField queryField = field.getAnnotation(QueryField.class);
-            if(queryField==null)continue;
+            if(queryField==null) {
+				continue;
+			}
             Object value;
             try {
                 value = field.get(query);
             } catch (Exception e) {
                 throw new ServiceException("获取属性性出错");
             }
-            if(value==null)continue;
+            if(value==null) {
+				continue;
+			}
             List list = null;
             if(value instanceof List){
                list = (List)value;
-               if(list.size()==0)continue;
+               if(list.size()==0) {
+				   continue;
+			   }
             }
             String condition = queryField.condition();
-            if(Func.isBlank(condition))continue;
+            if(Func.isBlank(condition)) {
+				continue;
+			}
             String fileName = camel2under(field.getName());
             if(SqlCondition.EQUAL.equals(condition)) {
                 qw.eq(fileName, value);
@@ -77,11 +85,15 @@ public class Condition extends org.springblade.core.mp.support.Condition {
                 qw.likeRight(fileName,value);
             }else if(SqlCondition.NOT_IN.equals(condition)){
                 String columnName = queryField.columnName();
-                if(Func.isBlank(columnName))throw new ServiceException("查询不包含条件时需要指定列名");
+                if(Func.isBlank(columnName)) {
+					throw new ServiceException("查询不包含条件时需要指定列名");
+				}
                 qw.notIn(camel2under(columnName),list);
             }else if(SqlCondition.IN.equals(condition)){
                 String columnName = queryField.columnName();
-                if(Func.isBlank(columnName))throw new ServiceException("查询包含条件时需要指定列名");
+                if(Func.isBlank(columnName)) {
+					throw new ServiceException("查询包含条件时需要指定列名");
+				}
                 qw.in(camel2under(columnName),list);
             }
         }
@@ -100,7 +112,9 @@ public class Condition extends org.springblade.core.mp.support.Condition {
 		for(Field field:fieldList){
 			field.setAccessible(true);
 			QueryField queryField = field.getAnnotation(QueryField.class);
-			if(queryField==null) continue;
+			if(queryField==null) {
+				continue;
+			}
 			Object value;
 			try {
 				value = field.get(query);
@@ -114,10 +128,14 @@ public class Condition extends org.springblade.core.mp.support.Condition {
 			List list = null;
 			if(value instanceof List){
 				list = (List)value;
-				if(list.size()==0)continue;
+				if(list.size()==0) {
+					continue;
+				}
 			}
 			String condition = queryField.condition();
-			if(Func.isBlank(condition))continue;
+			if(Func.isBlank(condition)) {
+				continue;
+			}
 			String fileName = Optional.ofNullable(alias).map(aliasStr -> aliasStr + ".").orElse("") + camel2under(field.getName());
 			if(SqlCondition.EQUAL.equals(condition)) {
 				qw.eq(fileName, value);
@@ -129,11 +147,15 @@ public class Condition extends org.springblade.core.mp.support.Condition {
 				qw.likeRight(fileName,value);
 			}else if(SqlCondition.NOT_IN.equals(condition)){
 				String columnName = queryField.columnName();
-				if(Func.isBlank(columnName))throw new ServiceException("查询不包含条件时需要指定列名");
+				if(Func.isBlank(columnName)) {
+					throw new ServiceException("查询不包含条件时需要指定列名");
+				}
 				qw.notIn(fileName,list);
 			}else if(SqlCondition.IN.equals(condition)){
 				String columnName = queryField.columnName();
-				if(Func.isBlank(columnName))throw new ServiceException("查询包含条件时需要指定列名");
+				if(Func.isBlank(columnName)) {
+					throw new ServiceException("查询包含条件时需要指定列名");
+				}
 				qw.in(fileName,list);
 			}
 		}

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/monitor/entity/HisDataYc.java

@@ -7,7 +7,7 @@ public class HisDataYc {
 	private Date datatime;
 	private int q;
 	private int _msec;
-	
+
 	public double getVal() {
 		return val;
 	}
@@ -15,7 +15,7 @@ public class HisDataYc {
 	public void setVal(double val) {
 		this.val = val;
 	}
-	
+
 	public Date getDatatime() {
 		return datatime;
 	}
@@ -23,7 +23,7 @@ public class HisDataYc {
 	public void setDatatime(Date datatime) {
 		this.datatime = datatime;
 	}
-	
+
 	public int getQ() {
 		return q;
 	}
@@ -31,7 +31,7 @@ public class HisDataYc {
 	public void setQ(int q) {
 		this.q = q;
 	}
-	
+
 	public int get_Msec() {
 		return _msec;
 	}
@@ -50,18 +50,23 @@ public class HisDataYc {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj)
+		if (this == obj) {
 			return true;
-		if (obj == null)
+		}
+		if (obj == null) {
 			return false;
-		if (getClass() != obj.getClass())
+		}
+		if (getClass() != obj.getClass()) {
 			return false;
+		}
 		HisDataYc other = (HisDataYc) obj;
 		if (datatime == null) {
-			if (other.datatime != null)
+			if (other.datatime != null) {
 				return false;
-		} else if (!datatime.equals(other.datatime))
+			}
+		} else if (!datatime.equals(other.datatime)) {
 			return false;
+		}
 		return true;
 	}
 

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/monitor/utils/DateUtils.java

@@ -346,7 +346,7 @@ public class DateUtils {
 		end.set(endYear, endMonth - 1, endDay);
 		Long endTime = end.getTimeInMillis();
 
-		Long oneDay = 1000 * 60 * 60 * 24l;
+		Long oneDay = 1000 * 60 * 60 * 24L;
 
 		Long time = startTIme;
 		while (time <= endTime) {

hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpManagementServiceImpl.java

@@ -140,7 +140,7 @@ public class WtSpManagementServiceImpl extends BaseServiceImpl<WtSpManagementMap
     }
 
     public String subStr(String str, int start) {
-        if (str == null || str.equals("") || str.length() == 0) {
+        if (str == null || "".equals(str) || str.length() == 0) {
 			return "";
 		}
         if (start < str.length()) {

hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmAssociationDetailServiceImpl.java

@@ -49,7 +49,7 @@ public class EmAssociationDetailServiceImpl extends BaseServiceImpl<EmAssociatio
 	public Map getValue(EmAssociationDetailVo emAssociationDetailVo, String tenantId) {
 		Map<String, Object> maps = new HashMap();
 		Map<String, Object> map = new HashMap<>();
-		if (emAssociationDetailVo.getProType().equals("yc")) {
+		if ("yc".equals(emAssociationDetailVo.getProType())) {
 			List<YcRValue> ycValueList = new ArrayList<YcRValue>();
 			ReadDataTypes.EReadDataRet readDataRet = ReadData.Instance.ReadAnyDatasID(Arrays.asList(emAssociationDetailVo.getRealIds().split(",")), ycValueList, null, null,
 				tenantId);
@@ -72,7 +72,7 @@ public class EmAssociationDetailServiceImpl extends BaseServiceImpl<EmAssociatio
 				map.put("value", value);
 			}
 		}
-		if (emAssociationDetailVo.getProType().equals("soe") || emAssociationDetailVo.getProType().equals("yx")) {
+		if ("soe".equals(emAssociationDetailVo.getProType()) || "yx".equals(emAssociationDetailVo.getProType())) {
 			map.put("value", "");
 		}
 		map.put("state", emAssociationDetailVo.getProType() == "yc");

hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmParamServiceImpl.java

@@ -51,15 +51,15 @@ public class EmParamServiceImpl extends BaseServiceImpl<EmParamMapper, EmParamEn
 			int pt = 0;
 			double installedCapacity = 0;
 			Long aLong = collect.get(i);
-			List<EmParamEntity> pts = emParamEntities.stream().filter(o -> o.getParamName().equals("pt") && o.getInfoId().toString().equals(aLong.toString())).collect(Collectors.toList());
+			List<EmParamEntity> pts = emParamEntities.stream().filter(o -> "pt".equals(o.getParamName()) && o.getInfoId().toString().equals(aLong.toString())).collect(Collectors.toList());
 			if (CollectionUtil.isNotEmpty(pts)) {
 				pt = Integer.valueOf(pts.get(0).getParamValue());
 			}
-			List<EmParamEntity> cts = emParamEntities.stream().filter(o -> o.getParamName().equals("ct") && o.getInfoId().toString().equals(aLong.toString())).collect(Collectors.toList());
+			List<EmParamEntity> cts = emParamEntities.stream().filter(o -> "ct".equals(o.getParamName()) && o.getInfoId().toString().equals(aLong.toString())).collect(Collectors.toList());
 			if (CollectionUtil.isNotEmpty(cts)) {
 				ct = Integer.valueOf(cts.get(0).getParamValue());
 			}
-			List<EmParamEntity> installedCapacitys = emParamEntities.stream().filter(o -> o.getParamName().equals("installedCapacity") && o.getInfoId().toString().equals(aLong.toString())).collect(Collectors.toList());
+			List<EmParamEntity> installedCapacitys = emParamEntities.stream().filter(o -> "installedCapacity".equals(o.getParamName()) && o.getInfoId().toString().equals(aLong.toString())).collect(Collectors.toList());
 			if (CollectionUtil.isNotEmpty(installedCapacitys)) {
 				installedCapacity = Double.valueOf(installedCapacitys.get(0).getParamValue());
 			}

hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/PlanGenerationServiceImpl.java

@@ -203,8 +203,8 @@ public class PlanGenerationServiceImpl extends BaseServiceImpl<PlanGenerationMap
 						int ct = 0;
 						int pt = 0;
 						if (CollectionUtil.isNotEmpty(paramList)) {
-							List<EmParamEntity> pts = paramList.stream().filter(o -> o.getInfoId().toString().equals(emInfo.getId().toString()) && o.getParamName().equals("pt")).collect(Collectors.toList());
-							List<EmParamEntity> cts = paramList.stream().filter(o -> o.getInfoId().toString().equals(emInfo.getId().toString()) && o.getParamName().equals("ct")).collect(Collectors.toList());
+							List<EmParamEntity> pts = paramList.stream().filter(o -> o.getInfoId().toString().equals(emInfo.getId().toString()) && "pt".equals(o.getParamName())).collect(Collectors.toList());
+							List<EmParamEntity> cts = paramList.stream().filter(o -> o.getInfoId().toString().equals(emInfo.getId().toString()) && "ct".equals(o.getParamName())).collect(Collectors.toList());
 							if (CollectionUtil.isNotEmpty(pts)) {
 								EmParamEntity emParamEntity = pts.get(0);
 								pt = Integer.valueOf(emParamEntity.getParamValue());

hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/UpdateDeptIdServiceImpl.java

@@ -58,7 +58,7 @@ public class UpdateDeptIdServiceImpl extends BaseServiceImpl<UpdateDeptIdMapper,
 					boolean flag = false;
 					if(null != tableColumns && !tableColumns.isEmpty()) {
 						for(Map<String, Object> columnMap : tableColumns) {
-							if(columnMap.get("COLUMN_NAME").toString().toLowerCase().equals("create_dept")) {
+							if("create_dept".equals(columnMap.get("COLUMN_NAME").toString().toLowerCase())) {
 								flag = true;
 								break;
 							}
@@ -109,7 +109,7 @@ public class UpdateDeptIdServiceImpl extends BaseServiceImpl<UpdateDeptIdMapper,
 				boolean flag = false;
 				if(null != tableColumns && !tableColumns.isEmpty()) {
 					for(Map<String, Object> columnMap : tableColumns) {
-						if(columnMap.get("COLUMN_NAME").toString().toLowerCase().equals("tenant_id")) {
+						if("tenant_id".equals(columnMap.get("COLUMN_NAME").toString().toLowerCase())) {
 							flag = true;
 							break;
 						}
@@ -141,10 +141,10 @@ public class UpdateDeptIdServiceImpl extends BaseServiceImpl<UpdateDeptIdMapper,
 				int hasColumnCount = 0;
 				if(null != tableColumns && !tableColumns.isEmpty()) {
 					for(Map<String, Object> columnMap : tableColumns) {
-						if(columnMap.get("COLUMN_NAME").toString().toLowerCase().equals("tenant_id")) {
+						if("tenant_id".equals(columnMap.get("COLUMN_NAME").toString().toLowerCase())) {
 							hasColumnCount++;
 						}
-						if(columnMap.get("COLUMN_NAME").toString().toLowerCase().equals("create_dept")) {
+						if("create_dept".equals(columnMap.get("COLUMN_NAME").toString().toLowerCase())) {
 							hasColumnCount++;
 						}
 					}

hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/scheduled/FdpDeviceCreateTask.java

@@ -65,7 +65,7 @@ public class FdpDeviceCreateTask {
 	@Autowired
 	private RedisTemplate redisTemplate;
 
-	private static final Long USER_ID = 1377143375838359553l;
+	private static final Long USER_ID = 1377143375838359553L;
 
 
 	@Value("${url.getFaultAndMonitor}")

hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpFaultInfoServiceImpl.java

@@ -25,11 +25,13 @@ public class FdpFaultInfoServiceImpl extends BaseServiceImpl<FdpFaultInfoMapper,
 	@Override
 	public R fdpFaultSaveBatch(FdpFaultInfoVo fdpFaultInfoVo) {
 		List<FdpFaultInfoEntity> fdpFaultInfoEntityList = fdpFaultInfoVo.getFdpFaultInfoEntityList();
-		if(CollectionUtil.isEmpty(fdpFaultInfoEntityList))
+		if(CollectionUtil.isEmpty(fdpFaultInfoEntityList)) {
 			return R.fail("请选择诊断故障提交记录");
+		}
 		Long taskId = fdpFaultInfoVo.getTaskId();
-		if(null == taskId)
+		if(null == taskId) {
 			return R.fail("请对诊断故障记录和诊断任务关联");
+		}
 		fdpFaultInfoEntityList.forEach(o->o.setTaskId(fdpFaultInfoVo.getTaskId()));
 		boolean saveResult = super.saveOrUpdateBatch(fdpFaultInfoEntityList);
 		return R.status(saveResult);

hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java

@@ -241,13 +241,13 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 		List<FdpMonitorEntity> fdpMonitorEntityList = this.baseMapper.selectListPage(page, entity);
 		if (fdpMonitorEntityList.size() > 0) {
 			fdpMonitorEntityList.forEach(o -> {
-				if (o.getCallbackType().equals("bool")) {
+				if ("bool".equals(o.getCallbackType())) {
 					o.setCallbackType("单点遥信");
-				} else if (o.getCallbackType().equals("bool[]")) {
+				} else if ("bool[]".equals(o.getCallbackType())) {
 					o.setCallbackType("多点遥信");
-				} else if (o.getCallbackType().equals("float")) {
+				} else if ("float".equals(o.getCallbackType())) {
 					o.setCallbackType("单点遥测");
-				} else if (o.getCallbackType().equals("float[]")) {
+				} else if ("float[]".equals(o.getCallbackType())) {
 					o.setCallbackType("多点遥测");
 				}
 			});
@@ -585,11 +585,11 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 		FdpMonitorEntity entity = this.getOne(new LambdaQueryWrapper<FdpMonitorEntity>() {{
 			eq(FdpMonitorEntity::getFdpId, req.getFdpId()).last(" LIMIT 1");
 		}});
-		if (req.getImsRealIds().split(",").length > 1 && (entity.getCallbackType().equals("bool") || entity.getCallbackType().equals("float"))) {
+		if (req.getImsRealIds().split(",").length > 1 && ("bool".equals(entity.getCallbackType()) || "float".equals(entity.getCallbackType()))) {
 			String name = "";
-			if (entity.getCallbackType().equals("bool")) {
+			if ("bool".equals(entity.getCallbackType())) {
 				name = "单点遥信";
-			} else if (entity.getCallbackType().equals("float")) {
+			} else if ("float".equals(entity.getCallbackType())) {
 				name = "单点遥测";
 			}
 			return R.fail("该数据格式为：" + name + ",故该值最多绑定一个");
@@ -1199,7 +1199,7 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 	private void setRealTimeDataFormatBack(Map<String, Object> map, FdpMonitorEntity fdpMonitorEntity, List<FieldsData> data) {
 		Float flo[] = new Float[fdpMonitorEntity.getImsRealIds().split(",").length];
 		int count = 0;
-		if (fdpMonitorEntity.getCallbackType().equals("float[]")) {
+		if ("float[]".equals(fdpMonitorEntity.getCallbackType())) {
 			for (int i = 0; i < data.size(); i++) {
 				FieldsData datum = data.get(i);
 				if (StringUtil.isNotBlank(datum.getValue())) {
@@ -1214,7 +1214,7 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 			} else {
 				map.put("value_array", flo);
 			}
-		} else if (fdpMonitorEntity.getCallbackType().equals("float")) {
+		} else if ("float".equals(fdpMonitorEntity.getCallbackType())) {
 			Float floValue = null;
 			for (FieldsData datum : data) {
 				if (StringUtil.isNotBlank(datum.getValue())) {
@@ -1222,26 +1222,26 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 				}
 			}
 			map.put("value", floValue);
-		} else if (fdpMonitorEntity.getCallbackType().equals("bool")) {
+		} else if ("bool".equals(fdpMonitorEntity.getCallbackType())) {
 			Boolean bool = null;
 			for (FieldsData datum : data) {
 				if (StringUtil.isNotBlank(datum.getValue())) {
-					if (datum.getValue().equals("1")) {
+					if ("1".equals(datum.getValue())) {
 						bool = true;
-					} else if (datum.getValue().equals("0")) {
+					} else if ("0".equals(datum.getValue())) {
 						bool = false;
 					}
 				}
 			}
 			map.put("state", bool);
-		} else if (fdpMonitorEntity.getCallbackType().equals("bool[]")) {
+		} else if ("bool[]".equals(fdpMonitorEntity.getCallbackType())) {
 			Boolean booleans[] = new Boolean[fdpMonitorEntity.getImsRealIds().split(",").length];
 			for (int i = 0; i < data.size(); i++) {
 				FieldsData datum = data.get(i);
 				if (StringUtil.isNotBlank(datum.getValue())) {
-					if (datum.getValue().equals("1")) {
+					if ("1".equals(datum.getValue())) {
 						booleans[i] = true;
-					} else if (datum.getValue().equals("0")) {
+					} else if ("0".equals(datum.getValue())) {
 						booleans[i] = false;
 					}
 				} else {
@@ -1261,7 +1261,7 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 	private void setRealTimeDataFormat(Map<String, Object> map, FdpMonitorEntity fdpMonitorEntity, List<FieldsData> data) {
 		List<RealTimeDataFloVo> list = new ArrayList<>();
 		int count = 0;
-		if (fdpMonitorEntity.getCallbackType().equals("float[]")) {
+		if ("float[]".equals(fdpMonitorEntity.getCallbackType())) {
 			for (int i = 0; i < data.size(); i++) {
 				FieldsData datum = data.get(i);
 				RealTimeDataFloVo vo = new RealTimeDataFloVo();
@@ -1278,7 +1278,7 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 			} else {
 				map.put("value_array", list);
 			}
-		} else if (fdpMonitorEntity.getCallbackType().equals("float")) {
+		} else if ("float".equals(fdpMonitorEntity.getCallbackType())) {
 			RealTimeDataFloVo vo = new RealTimeDataFloVo();
 			for (FieldsData datum : data) {
 				if (StringUtil.isNotBlank(datum.getValue())) {
@@ -1289,13 +1289,13 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 			if (StringUtil.isNotBlank(vo.getTime())) {
 				map.put("value", vo);
 			}
-		} else if (fdpMonitorEntity.getCallbackType().equals("bool")) {
+		} else if ("bool".equals(fdpMonitorEntity.getCallbackType())) {
 			RealTimeDataBoolVo vo = new RealTimeDataBoolVo();
 			for (FieldsData datum : data) {
 				if (StringUtil.isNotBlank(datum.getValue())) {
-					if (datum.getValue().equals("1")) {
+					if ("1".equals(datum.getValue())) {
 						vo.setValue(true);
-					} else if (datum.getValue().equals("0")) {
+					} else if ("0".equals(datum.getValue())) {
 						vo.setValue(false);
 					}
 				}
@@ -1304,15 +1304,15 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 			if (StringUtil.isNotBlank(vo.getTime())) {
 				map.put("state", vo);
 			}
-		} else if (fdpMonitorEntity.getCallbackType().equals("bool[]")) {
+		} else if ("bool[]".equals(fdpMonitorEntity.getCallbackType())) {
 			List<RealTimeDataBoolVo> voList = new ArrayList<>();
 			for (int i = 0; i < data.size(); i++) {
 				FieldsData datum = data.get(i);
 				RealTimeDataBoolVo vo = new RealTimeDataBoolVo();
 				if (StringUtil.isNotBlank(datum.getValue())) {
-					if (datum.getValue().equals("1")) {
+					if ("1".equals(datum.getValue())) {
 						vo.setValue(true);
-					} else if (datum.getValue().equals("0")) {
+					} else if ("0".equals(datum.getValue())) {
 						vo.setValue(false);
 					}
 				} else {
@@ -1456,13 +1456,13 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 		List<Float[]> floList = new ArrayList<>();
 		List<Boolean[]> boolList = new ArrayList<>();
 		if (CollectionUtil.isNotEmpty(vo.getData())) {
-			if (vo.getType().equals("float[]")) {
+			if ("float[]".equals(vo.getType())) {
 				return floatValue(vo.getData(), floList, vo.getType());
-			} else if (vo.getType().equals("float[][]")) {
+			} else if ("float[][]".equals(vo.getType())) {
 				return floatValue(vo.getData(), floList, vo.getType());
-			} else if (vo.getType().equals("bool[]")) {
+			} else if ("bool[]".equals(vo.getType())) {
 				return bool(vo.getData(), boolList, vo.getType());
-			} else if (vo.getType().equals("bool[][]")) {
+			} else if ("bool[][]".equals(vo.getType())) {
 				return bool(vo.getData(), boolList, vo.getType());
 			}
 
@@ -1502,13 +1502,13 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 
 	private Object getResultValue(FdpCallbackHistoryTypeVo vo, List<AnalyzeDataConditionVO> analyzeDataConditionVOS, List<List<DataBackHisFloDataVo>> floList, List<List<DataBackHisBoolDataVo>> boolList) {
 		if (CollectionUtil.isNotEmpty(analyzeDataConditionVOS)) {
-			if (vo.getType().equals("float[]")) {
+			if ("float[]".equals(vo.getType())) {
 				return floatValueBack(analyzeDataConditionVOS, floList, vo.getType());
-			} else if (vo.getType().equals("float[][]")) {
+			} else if ("float[][]".equals(vo.getType())) {
 				return floatValueBack(analyzeDataConditionVOS, floList, vo.getType());
-			} else if (vo.getType().equals("bool[]")) {
+			} else if ("bool[]".equals(vo.getType())) {
 				return boolBack(analyzeDataConditionVOS, boolList, vo.getType());
-			} else if (vo.getType().equals("bool[][]")) {
+			} else if ("bool[][]".equals(vo.getType())) {
 				return boolBack(analyzeDataConditionVOS, boolList, vo.getType());
 			}
 
@@ -1536,13 +1536,13 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 			}
 			floList.add(floats);
 		}
-		if (type.equals("float[]")) {
+		if ("float[]".equals(type)) {
 			if (listCount == count) {
 				return new Float[0];
 			} else {
 				return floList.get(0);
 			}
-		} else if (type.equals("float[][]")) {
+		} else if ("float[][]".equals(type)) {
 			if (listCount == count) {
 				return new ArrayList<>();
 			} else {
@@ -1563,9 +1563,9 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 			for (int i = 0; i < list.size(); i++) {
 				AnalyseDataTaosVO analyseDataTaosVO = list.get(i);
 				if (StringUtil.isNotBlank(analyseDataTaosVO.getVal())) {
-					if (analyseDataTaosVO.getVal().equals("1")) {
+					if ("1".equals(analyseDataTaosVO.getVal())) {
 						booleans[i] = true;
-					} else if (analyseDataTaosVO.getVal().equals("0")) {
+					} else if ("0".equals(analyseDataTaosVO.getVal())) {
 						booleans[i] = false;
 					} else {
 						booleans[i] = null;
@@ -1578,13 +1578,13 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 			}
 			boolList.add(booleans);
 		}
-		if (type.equals("bool[]")) {
+		if ("bool[]".equals(type)) {
 			if (listCount == count) {
 				return new Boolean[0];
 			} else {
 				return boolList.get(0);
 			}
-		} else if (type.equals("bool[][]")) {
+		} else if ("bool[][]".equals(type)) {
 			if (listCount == count) {
 				return new ArrayList<>();
 			} else {
@@ -1616,7 +1616,7 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 			}
 			listList.add(list1);
 		}
-		if (type.equals("float[][]") || type.equals("float[]")) {
+		if ("float[][]".equals(type) || "float[]".equals(type)) {
 			if (listCount == count) {
 				return new ArrayList<>();
 			} else {
@@ -1638,10 +1638,10 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 				DataBackHisBoolDataVo vo = new DataBackHisBoolDataVo();
 				vo.setTime(analyseDataTaosVO.getTs());
 				if (StringUtil.isNotBlank(analyseDataTaosVO.getVal())) {
-					if (analyseDataTaosVO.getVal().equals("1")) {
+					if ("1".equals(analyseDataTaosVO.getVal())) {
 						vo.setBoolValue(true);
 						list1.add(vo);
-					} else if (analyseDataTaosVO.getVal().equals("0")) {
+					} else if ("0".equals(analyseDataTaosVO.getVal())) {
 						vo.setBoolValue(false);
 						list1.add(vo);
 					} else {
@@ -1655,7 +1655,7 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 			}
 			boolList.add(list1);
 		}
-		if (type.equals("bool[][]") || type.equals("bool[]")) {
+		if ("bool[][]".equals(type) || "bool[]".equals(type)) {
 			if (listCount == count) {
 				return new ArrayList<>();
 			} else {

hzims-service/equipment/src/main/java/com/hnac/hzims/util/HttpClientUtils.java

@@ -56,12 +56,15 @@ public abstract class HttpClientUtils {
 			try {
 				sc = SSLContext.getInstance("SSLv3");
 				sc.init((KeyManager[]) null, new TrustManager[]{new X509TrustManager() {
+					@Override
 					public void checkClientTrusted(X509Certificate[] paramArrayOfX509Certificate, String paramString) throws CertificateException {
 					}
 
+					@Override
 					public void checkServerTrusted(X509Certificate[] paramArrayOfX509Certificate, String paramString) throws CertificateException {
 					}
 
+					@Override
 					public X509Certificate[] getAcceptedIssuers() {
 						return null;
 					}
@@ -72,6 +75,7 @@ public abstract class HttpClientUtils {
 				var2.printStackTrace();
 			}
 			Registry socketFactoryRegistry = RegistryBuilder.create().register("http", PlainConnectionSocketFactory.INSTANCE).register("https", new SSLConnectionSocketFactory(sc, new HostnameVerifier() {
+				@Override
 				public boolean verify(String s, SSLSession sslSession) {
 					return true;
 				}
@@ -154,8 +158,9 @@ public abstract class HttpClientUtils {
 		HttpGet httpGet = new HttpGet(url);
 
 		for (int i = 0; i < headers.length; i += 2) {
-			if (headers[i] == null || headers[i + 1] == null)
+			if (headers[i] == null || headers[i + 1] == null) {
 				continue;
+			}
 			httpGet.addHeader(headers[i], headers[i + 1]);
 		}
 
@@ -189,8 +194,9 @@ public abstract class HttpClientUtils {
 
 		ArrayList<BasicNameValuePair> list = new ArrayList<BasicNameValuePair>();
 		for (int i = 0; i < params.length; i += 2) {
-			if (params[i] == null || params[i + 1] == null)
+			if (params[i] == null || params[i + 1] == null) {
 				continue;
+			}
 			list.add(new BasicNameValuePair(params[i], params[i + 1]));
 		}
 
@@ -239,8 +245,9 @@ public abstract class HttpClientUtils {
 		HttpPost httpPost = new HttpPost(url);
 
 		for (int i = 0; i < headers.length; i += 2) {
-			if (headers[i] == null || headers[i + 1] == null)
+			if (headers[i] == null || headers[i + 1] == null) {
 				continue;
+			}
 			httpPost.addHeader(headers[i], headers[i + 1]);
 		}
 
@@ -269,8 +276,9 @@ public abstract class HttpClientUtils {
 		HttpPost httpPost = new HttpPost(url);
 
 		for (int i = 0; i < headers.length; i += 2) {
-			if (headers[i] == null || headers[i + 1] == null)
+			if (headers[i] == null || headers[i + 1] == null) {
 				continue;
+			}
 			httpPost.addHeader(headers[i], headers[i + 1]);
 		}
 

hzims-service/inspect/pom.xml

@@ -148,7 +148,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-oss-minio</artifactId>
-            <version>2.7.3.RELEASE</version>
+            <version>${bladex.project.version}</version>
         </dependency>
 
 

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ContentServiceImpl.java

@@ -42,8 +42,8 @@ public class ContentServiceImpl extends BaseServiceImpl<ContentMapper, ContentEn
 					throw new ServiceException("检测类型不能为空!");
 				}
 				if(StringUtil.isNotBlank(contentEntity.getRecordType())){
-					if(!contentEntity.getRecordType().equals("0") && !contentEntity.getRecordType().equals("1") &&
-						!contentEntity.getRecordType().equals("2") && !contentEntity.getRecordType().equals("3")){
+					if(!"0".equals(contentEntity.getRecordType()) && !"1".equals(contentEntity.getRecordType()) &&
+						!"2".equals(contentEntity.getRecordType()) && !"3".equals(contentEntity.getRecordType())){
 						throw new ServiceException("记录类型只能填写数字：0不记录 1仅选择 2仅记值 3选择并记值!");
 					}
 				}

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/impl/ObjectServiceImpl.java

@@ -127,7 +127,7 @@ public class ObjectServiceImpl extends BaseServiceImpl<InspectObjectMapper, Obje
 				throw new ServiceException("巡检点象描述不能为空!");
 			}
 			if (StringUtil.isNotBlank(entity.getSupportAutoVideo())) {
-				if (entity.getSupportAutoVideo().equals("0") || entity.getSupportAutoVideo().equals("1") || entity.getSupportAutoVideo().equals("2")) {
+				if ("0".equals(entity.getSupportAutoVideo()) || "1".equals(entity.getSupportAutoVideo()) || "2".equals(entity.getSupportAutoVideo())) {
 				} else {
 					throw new ServiceException("巡检点类型只支持数字： 0普通巡检，1,视频自动巡检，2机器人巡检");
 				}

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectContentController.java

@@ -71,7 +71,9 @@ public class ProjectContentController {
     	for(int i=0,len=contentId.length;i<len;i++ ){
 			String cId= contentId[i];
 			maxValue = maxValue+1;
-    		if(Func.isBlank(cId))continue;
+    		if(Func.isBlank(cId)) {
+				continue;
+			}
 			ProjectContentEntity projectContentEntity = ProjectContentEntity.builder().projectId(projectId).contentId(Long.valueOf(cId)).sort(maxValue).build();
 			list.add(projectContentEntity);
 		}

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/TemplateProjectController.java

@@ -52,7 +52,9 @@ public class TemplateProjectController {
 		for(int i=0,len=projectId.length;i<len;i++ ){
 			String pId= projectId[i];
 			maxValue = maxValue+1;
-			if(Func.isBlank(pId))continue;
+			if(Func.isBlank(pId)) {
+				continue;
+			}
 			TemplateProjectEntity templateProjectEntity = TemplateProjectEntity.builder().projectId(Long.valueOf(pId)).templateId(templateId).sort(maxValue).build();
 			list.add(templateProjectEntity);
 		}

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/InspectOfflineServiceImpl.java

@@ -320,7 +320,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService {
 		if (StringUtil.isBlank(createTableSql)) {
 			return "";
 		}
-		if(table.equalsIgnoreCase("HZ_OFFLINE_TASK")){
+		if("HZ_OFFLINE_TASK".equalsIgnoreCase(table)){
 			return TableJsonUtils.createTableSqlProcess(createTableSql,true);
 		}
 		return TableJsonUtils.createTableSqlProcess(createTableSql,false);

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskJobService.java

@@ -193,7 +193,9 @@ public class TaskJobService {
     private String distributeTaskProjects(TaskEntity task, Long objectId, TemplateProjectEntity project) {
         String result = StringUtils.EMPTY;
         ProjectEntity ip = projectService.getById(project.getProjectId());
-        if(ip == null) return "巡检项目id="+project.getProjectId()+"找不到记录";
+        if(ip == null) {
+			return "巡检项目id="+project.getProjectId()+"找不到记录";
+		}
         TaskObjectProjectEntity itop = new TaskObjectProjectEntity();
         itop.setObjectId(objectId);
         itop.setProjectId(ip.getId());

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java

@@ -584,7 +584,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, TaskEntity> imp
 		List<TaskVo> re = this.baseMapper.getListPageOfPhone(page, task);
 		for (TaskVo vo : re) {
 			vo.setCanCancel(false);
-			if (vo.getMethod().equals("0")) {
+			if ("0".equals(vo.getMethod())) {
 				if (vo.getStatus().equals(1) || vo.getStatus().equals(2)) {
 					EventEntity entity = eventService.getOne(Wrappers.lambdaQuery(EventEntity.class).eq(EventEntity::getTaskId, vo.getId()).last("LIMIT 1"));
 					if (entity == null) {
@@ -961,7 +961,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, TaskEntity> imp
 				throw new ServiceException("任务领取异常，请稍后重试！");
 			}
 			// 任务开始列表中移除已进行领用任务
-			this.startTaskIds.remove(task.getId());
+			startTaskIds.remove(task.getId());
 		});
 		return true;
 	}

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/Base64ImgReplacedElementFactory.java

@@ -42,7 +42,7 @@ public class Base64ImgReplacedElementFactory implements ReplacedElementFactory {
 		}
 		String nodeName = e.getNodeName();
 		// 找到img标签
-		if (nodeName.equals("img")) {
+		if ("img".equals(nodeName)) {
 			String attribute = e.getAttribute("src");
 			FSImage fsImage;
 			try {

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/Condition.java

@@ -40,21 +40,29 @@ public class Condition extends org.springblade.core.mp.support.Condition {
         for(Field field:fields){
             field.setAccessible(true);
             QueryField queryField = field.getAnnotation(QueryField.class);
-            if(queryField==null)continue;
+            if(queryField==null) {
+				continue;
+			}
             Object value;
             try {
                 value = field.get(query);
             } catch (Exception e) {
                 throw new ServiceException("获取属性性出错");
             }
-            if(value==null)continue;
+            if(value==null) {
+				continue;
+			}
             List list = null;
             if(value instanceof List){
                list = (List)value;
-               if(list.size()==0)continue;
+               if(list.size()==0) {
+				   continue;
+			   }
             }
             String condition = queryField.condition();
-            if(Func.isBlank(condition))continue;
+            if(Func.isBlank(condition)) {
+				continue;
+			}
             String fileName = camel2under(field.getName());
             if(SqlCondition.EQUAL.equals(condition)) {
                 qw.eq(fileName, value);
@@ -66,14 +74,18 @@ public class Condition extends org.springblade.core.mp.support.Condition {
                 qw.likeRight(fileName,value);
             }else if(SqlCondition.NOT_IN.equals(condition)){
                 String columnName = queryField.columnName();
-                if(Func.isBlank(columnName))throw new ServiceException("查询不包含条件时需要指定列名");
+                if(Func.isBlank(columnName)) {
+					throw new ServiceException("查询不包含条件时需要指定列名");
+				}
                 qw.notIn(camel2under(columnName),list);
             }else if(SqlCondition.IN.equals(condition)){
                 String columnName = queryField.columnName();
-                if(Func.isBlank(columnName))throw new ServiceException("查询包含条件时需要指定列名");
+                if(Func.isBlank(columnName)) {
+					throw new ServiceException("查询包含条件时需要指定列名");
+				}
                 qw.in(camel2under(columnName),list);
             }
         }
         return qw.lambda();
     }
-}
+}

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HttpClientUtils.java

@@ -43,12 +43,15 @@ public abstract class HttpClientUtils {
 			try {
 				sc = SSLContext.getInstance("SSLv3");
 				sc.init((KeyManager[]) null, new TrustManager[]{new X509TrustManager() {
+					@Override
 					public void checkClientTrusted(X509Certificate[] paramArrayOfX509Certificate, String paramString) throws CertificateException {
 					}
 
+					@Override
 					public void checkServerTrusted(X509Certificate[] paramArrayOfX509Certificate, String paramString) throws CertificateException {
 					}
 
+					@Override
 					public X509Certificate[] getAcceptedIssuers() {
 						return null;
 					}
@@ -59,6 +62,7 @@ public abstract class HttpClientUtils {
 				var2.printStackTrace();
 			}
 			Registry socketFactoryRegistry = RegistryBuilder.create().register("http", PlainConnectionSocketFactory.INSTANCE).register("https", new SSLConnectionSocketFactory(sc, new HostnameVerifier() {
+				@Override
 				public boolean verify(String s, SSLSession sslSession) {
 					return true;
 				}

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/ZxingGenCode.java

@@ -82,8 +82,9 @@ public class ZxingGenCode {
 		resMatrix.clear();
 		for (int i = 0; i < resWidth; i++) {
 			for (int j = 0; j < resHeight; j++) {
-				if (matrix.get(i + rec[0], j + rec[1]))
+				if (matrix.get(i + rec[0], j + rec[1])) {
 					resMatrix.set(i, j);
+				}
 			}
 		}
 		return resMatrix;

hzims-service/message/src/main/java/com/hnac/hzims/message/schedule/MessagePushSchedule.java

@@ -74,7 +74,9 @@ public class MessagePushSchedule {
 			XxlJobLogger.log("开始推送短信，推送条数为："+pushMessageList.size());
 			// 获取推送消息内容体 根据用户拆分出多条短信推送
 			List<JSONObject> splitSmsList = this.transform(pushMessageList);
-			if(CollectionUtil.isEmpty(splitSmsList)) return;
+			if(CollectionUtil.isEmpty(splitSmsList)) {
+				return;
+			}
 			this.push(splitSmsList,smsConfigEntity);
 
 		});

hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java

@@ -30,6 +30,7 @@ import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
@@ -39,6 +40,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
+import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -62,6 +64,7 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl<HistoryAbno
 
 	/**
 	 * 查询单条历史告警
+	 *
 	 * @param station
 	 * @param soeType
 	 * @param ts
@@ -69,7 +72,7 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl<HistoryAbno
 	 */
 	@Override
 	public HistoryAbnormalAlarmEntity getAbnormalAlarm(String station, String soeType, Date ts) {
-		return this.baseMapper.getHistoryAbnormalAlarm(station,soeType,ts);
+		return this.baseMapper.getHistoryAbnormalAlarm(station, soeType, ts);
 	}
 
 	/**
@@ -80,11 +83,11 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl<HistoryAbno
 	 */
 	@Override
 	public IPage<HistoryAbnormalAlarmVo> list(IPage<HistoryAbnormalAlarmVo> page, String type) {
-		List<StationEntity> stations = stationService.getStationByType(HomePageConstant.HYDROPOWER,HomePageConstant.HYDROPOWER_SERVETYPE);
-		if(CollectionUtil.isEmpty(stations)){
+		List<StationEntity> stations = stationService.getStationByType(HomePageConstant.HYDROPOWER, HomePageConstant.HYDROPOWER_SERVETYPE);
+		if (CollectionUtil.isEmpty(stations)) {
 			return null;
 		}
-		List<HistoryAbnormalAlarmVo> result = this.baseMapper.selectPageList(page,type,stations.stream().map(StationEntity::getCode).collect(Collectors.toList()));
+		List<HistoryAbnormalAlarmVo> result = this.baseMapper.selectPageList(page, type, stations.stream().map(StationEntity::getCode).collect(Collectors.toList()));
 		page.setRecords(result);
 		return page;
 	}
@@ -97,14 +100,16 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl<HistoryAbno
 	 */
 	@Override
 	public IPage<HistoryAbnormalAlarmVo> getAlarmTime(Query query, HistoryAbnormalAlarmEntity entity) {
-		List<HistoryAbnormalAlarmVo> historyAbnormalAlarmVos= this.baseMapper.getAlarmEntity(entity.getType(),entity.getStationName(),entity.getStartTime(),entity.getEndTime());
-		if (historyAbnormalAlarmVos==null){
+		QueryWrapper<HistoryAbnormalAlarmEntity> alarmEntityQueryWrapper = getAlarmEntityQueryWrapper(entity);
+		List<HistoryAbnormalAlarmEntity> historyAbnormalAlarmEntity = this.baseMapper.selectList(alarmEntityQueryWrapper);
+		if (historyAbnormalAlarmEntity == null) {
 			return null;
 		}
+		List<HistoryAbnormalAlarmVo> historyAbnormalAlarmVos = BeanUtil.copy(historyAbnormalAlarmEntity, HistoryAbnormalAlarmVo.class);
 		//赋值空的endTime
-		if(ObjectUtils.isNotEmpty(entity.getEndTime())){
-			historyAbnormalAlarmVos.stream().filter(s->s.getEndTime()==null).forEach(s->s.setEndTime(entity.getEndTime()));
-		}else {
+		if (ObjectUtils.isNotEmpty(entity.getEndTime())) {
+			historyAbnormalAlarmVos.stream().filter(s -> s.getEndTime() == null).forEach(s -> s.setEndTime(entity.getEndTime()));
+		} else {
 			historyAbnormalAlarmVos.stream().filter(s -> s.getEndTime() == null).forEach(s -> s.setEndTime(new Date()));
 		}
 		List<HistoryAbnormalAlarmVo> voList = historyAbnormalAlarmVos.parallelStream().map(s -> {
@@ -117,8 +122,7 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl<HistoryAbno
 		//时间统计
 		Map<String, Long> durationList = voList.stream().collect(Collectors.groupingBy(HistoryAbnormalAlarmEntity::getStationName,
 			Collectors.summingLong(HistoryAbnormalAlarmVo::getTimes)));
-
-		List<HistoryAbnormalAlarmVo> res=new ArrayList<>();
+		List<HistoryAbnormalAlarmVo> res = new ArrayList<>();
 		for (Map.Entry<String, Long> entry : durationList.entrySet()) {
 			//累计时长
 			double v = BigDecimal.valueOf(entry.getValue() / (1000 * 60 * 60.00)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
@@ -127,23 +131,23 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl<HistoryAbno
 			String key = entry.getKey();
 			historyAbnormalAlarmVo.setStationName(key);
 			historyAbnormalAlarmVo.setTimes(timesList.get(key));
-			if(StringUtils.isNotEmpty(entity.getType())){
+			if (StringUtils.isNotEmpty(entity.getType())) {
 				historyAbnormalAlarmVo.setType(entity.getType());
 			}
 			res.add(historyAbnormalAlarmVo);
 		}
 		//根据电站名字排序
-		res=res.stream().
+		res = res.stream().
 			sorted(Comparator.comparing(HistoryAbnormalAlarmVo::getStationName))
 			.collect(Collectors.toList());
 		IPage<HistoryAbnormalAlarmVo> page = Condition.getPage(query);
 		page.setTotal(res.size());
-		if (query==null){
+		if (entityIsNull(query)) {
 			page.setRecords(res);
-		}else {
-			if (res.size()>query.getCurrent()* query.getSize()) {
+		} else {
+			if (res.size() > query.getCurrent() * query.getSize()) {
 				page.setRecords(res.subList((query.getCurrent() - 1) * query.getSize(), query.getCurrent() * query.getSize()));
-			}else {
+			} else {
 				page.setRecords(res.subList((query.getCurrent() - 1) * query.getSize(), res.size()));
 			}
 		}
@@ -153,23 +157,23 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl<HistoryAbno
 
 	private QueryWrapper<HistoryAbnormalAlarmEntity> getAlarmEntityQueryWrapper(HistoryAbnormalAlarmEntity entity) {
 		QueryWrapper<HistoryAbnormalAlarmEntity> queryWrapper = new QueryWrapper<>();
-		if (entity.getStationName()!=null) {
+		if (entity.getStationName() != null) {
 			queryWrapper.lambda().eq(HistoryAbnormalAlarmEntity::getStationName, entity.getStationName());
 		}
-		if (entity.getType()!=null) {
+		if (entity.getType() != null) {
 			queryWrapper.lambda().eq(HistoryAbnormalAlarmEntity::getType, entity.getType());
 		}
-		if (entity.getStartTime()!=null) {
+		if (entity.getStartTime() != null) {
 			queryWrapper.lambda().le(HistoryAbnormalAlarmEntity::getStartTime, entity.getStartTime());
 		}
-		if (entity.getEndTime()!=null) {
+		if (entity.getEndTime() != null) {
 			queryWrapper.lambda().ge(HistoryAbnormalAlarmEntity::getStartTime, entity.getEndTime());
 		}
 		return queryWrapper;
 	}
 
 	@Override
-	public IPage<HistoryAbnormalAlarmEntity> queryByEntity(HistoryAbnormalAlarmEntity entity,Query query) {
+	public IPage<HistoryAbnormalAlarmEntity> queryByEntity(HistoryAbnormalAlarmEntity entity, Query query) {
 		QueryWrapper<HistoryAbnormalAlarmEntity> alarmEntityQueryWrapper = getAlarmEntityQueryWrapper(entity);
 		IPage<HistoryAbnormalAlarmEntity> historyAbnormalAlarmEntityIPage = this.baseMapper.selectPage(Condition.getPage(query), alarmEntityQueryWrapper);
 		return historyAbnormalAlarmEntityIPage;
@@ -279,4 +283,20 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl<HistoryAbno
 	}
 
 
+	private Boolean entityIsNull(Object object) {
+		if (null == object) {
+			return true;
+		}
+		try {
+			for (Field f : object.getClass().getDeclaredFields()) {
+				f.setAccessible(true);
+				if (f.get(object) != null && StringUtils.isNotBlank(f.get(object).toString())) {
+					return false;
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return true;
+	}
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java

@@ -180,7 +180,7 @@ public class StAlamRecordServiceImpl extends BaseServiceImpl<StAlarmRecordMapper
 										dataSet.setTime(data.getTime());
 									}
 									dataSet.setValue(value);
-									if (!value.equals("-")) {
+									if (!"-".equals(value)) {
 										dataSet.setValue(value);
 									}
 									dataSet.setPropertyType(stFocusPropertiesEntity.getPropertyType());
@@ -220,7 +220,7 @@ public class StAlamRecordServiceImpl extends BaseServiceImpl<StAlarmRecordMapper
 										dataSet.setTime(data.getTime());
 									}
 									dataSet.setValue(value);
-									if (!value.equals("-")) {
+									if (!"-".equals(value)) {
 										dataSet.setValue(String.format("%.2f", Double.valueOf(value)));
 									}
 									dataSet.setPropertyType(stFocusPropertiesEntity.getPropertyType());
@@ -353,7 +353,7 @@ public class StAlamRecordServiceImpl extends BaseServiceImpl<StAlarmRecordMapper
 
 	private void setStatus(List<FdpFaultStatusVo> faultStatusVoList, DataSet dataSet, TimeDataVo dataVo, String value) {
 		//if (CollectionUtil.isNotEmpty(faultStatusVoList) && 0 == dataSet.getStatus() && !dataVo.getValue().equals("-")) {
-		if (CollectionUtil.isNotEmpty(faultStatusVoList) && !value.equals("-")) {
+		if (CollectionUtil.isNotEmpty(faultStatusVoList) && !"-".equals(value)) {
 			List<FdpFaultStatusVo> collect2 = faultStatusVoList.stream().filter(o -> o.getRealId().equals(dataSet.getRealId())).collect(Collectors.toList());
 			if (CollectionUtil.isNotEmpty(collect2)) {
 				FdpFaultStatusVo fdpFaultStatusVo = collect2.get(0);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java

@@ -821,7 +821,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 				String groupId = imsSchedulingVo.getDutyOrderIds().get(classId)[tempSub];
 				//人员IDS
 				String personIds = "";
-				if (classId.equals("0")) {
+				if ("0".equals(classId)) {
 					String[] split = groupId.split(",");
 					if (ObjectUtil.isNotEmpty(split)) {
 						for (String dutyGroupId : split) {

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java

@@ -239,7 +239,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
 				updateMain(recEntity.getDutyId());
 				recEntity.setStatus(DutyRecStatus.ACCEPT.getVal());
 				recEntity.setAcceptTime(new Date());
-				recEntity.setQrCodeContent(new Date().getTime() + "");
+				recEntity.setQrCodeContent(System.currentTimeMillis() + "");
 				this.updateById(recEntity);
 			}
 		} else {
@@ -651,7 +651,7 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
 			} else {
 				recEntity1.setDelayStatus(DutyContants.DutyRecDelayStatusEnum.CARRY_DELAY_STATUS.getStatus());//赋值延时状态 为2  接班延时
 			}
-			recEntity1.setQrCodeContent(new Date().getTime() + "");
+			recEntity1.setQrCodeContent(System.currentTimeMillis() + "");
 			this.baseMapper.updateById(recEntity1);
 		}
 	}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/RunMonthReportController.java

@@ -115,9 +115,9 @@ public class RunMonthReportController extends BladeController {
 					runMonthReportService.fillMonthReportSoeData(soeDataList, excelMap);
 
 					String fileExcelName = "";
-					if (stationType.equals("0")) {
+					if ("0".equals(stationType)) {
 						fileExcelName = "powerStationRunMonthReport";
-					} else if (stationType.equals("2")) {
+					} else if ("2".equals(stationType)) {
 						fileExcelName = "pumpStationRunMonthReport";
 					}
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IMainWorkBenchService.java

@@ -15,6 +15,7 @@ public interface IMainWorkBenchService extends BaseService<MainWorkBenchEntity>
 
 	IPage<MainWorkBenchVO> list(MainWorkBenchEntity req, Query query);
 
+	@Override
 	boolean updateById(MainWorkBenchEntity req);
 
 	List<MainWorkBenchEntity> getInRefDeptStationCount(List<Long> list, String refDomain);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AppHomeServiceImpl.java

@@ -218,7 +218,7 @@ public class AppHomeServiceImpl implements IAppHomeService {
 			if(StringUtil.isBlank(value)){
 				continue;
 			}
-			if (value.contains("1") || value.equals("1.0")) {
+			if (value.contains("1") || "1.0".equals(value)) {
 				em.setOnOff(true);
 			}
 		}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomePageServiceImpl.java

@@ -536,7 +536,9 @@ public class HomePageServiceImpl implements IHomePageService {
 			vo.setStrMonth(mon);
 			if(CollectionUtil.isEmpty(planPowerList)){
 				vo.setPlanPower(0f);
-			}else vo.setPlanPower((float) planPowerList.stream().filter(o->mon.equals(o.getDateTime()+"-01")).mapToDouble(PlanGenerationEntity::getPlanGeneration).sum());
+			}else {
+				vo.setPlanPower((float) planPowerList.stream().filter(o->mon.equals(o.getDateTime()+"-01")).mapToDouble(PlanGenerationEntity::getPlanGeneration).sum());
+			}
 			if(MapUtils.isEmpty(floatMap)){
 				vo.setPower(0f);
 			}else{
@@ -1136,7 +1138,7 @@ public class HomePageServiceImpl implements IHomePageService {
 
 		List<AreaGenerationMakeUpVo> areaGenerationMakeUpVos = new ArrayList<>();
 		deptList.forEach(iter -> {
-			List<Dept> list = userDeptList.stream().filter(s -> s.getDeptCategory().toString().equals("4") && s.getParentId().toString().equals(iter.getId().toString())).collect(Collectors.toList());
+			List<Dept> list = userDeptList.stream().filter(s -> "4".equals(s.getDeptCategory().toString()) && s.getParentId().toString().equals(iter.getId().toString())).collect(Collectors.toList());
 			List<Dept> deptList1 = new ArrayList<>();
 			list.forEach(f -> {
 				if (stationByType.contains(f.getStationId())) {
@@ -1242,7 +1244,7 @@ public class HomePageServiceImpl implements IHomePageService {
 			Dept dept = min.get();
 			switch (dept.getDeptCategory()) {
 				case 1: //集团
-					List<String> stationIdList = deptByCurrentUser.getData().stream().filter(s -> s.getDeptCategory().toString().equals("4")).map(Dept::getStationId).collect(Collectors.toList());
+					List<String> stationIdList = deptByCurrentUser.getData().stream().filter(s -> "4".equals(s.getDeptCategory().toString())).map(Dept::getStationId).collect(Collectors.toList());
 					List<String> stationList = new ArrayList<>();
 					stationIdList.forEach(iter -> {
 						if (stationByType.contains(iter)) {
@@ -1254,7 +1256,7 @@ public class HomePageServiceImpl implements IHomePageService {
 					}
 					break;
 				case 2: //省子公司
-					List<String> szgsStationIdList = deptByCurrentUser.getData().stream().filter(s -> s.getParentId().toString().equals(dept.getId().toString()) && s.getDeptCategory().toString().equals("4")).map(Dept::getStationId).collect(Collectors.toList());
+					List<String> szgsStationIdList = deptByCurrentUser.getData().stream().filter(s -> s.getParentId().toString().equals(dept.getId().toString()) && "4".equals(s.getDeptCategory().toString())).map(Dept::getStationId).collect(Collectors.toList());
 					List<String> szgsStationList = new ArrayList<>();
 					szgsStationIdList.forEach(iter -> {
 						if (stationByType.contains(iter)) {
@@ -1266,9 +1268,9 @@ public class HomePageServiceImpl implements IHomePageService {
 					}
 					break;
 				case 3: //区域
-					List<Dept> aeraDeptList = deptByCurrentUser.getData().stream().filter(s -> s.getDeptCategory().toString().equals("3")).collect(Collectors.toList());
+					List<Dept> aeraDeptList = deptByCurrentUser.getData().stream().filter(s -> "3".equals(s.getDeptCategory().toString())).collect(Collectors.toList());
 					aeraDeptList.forEach(iter -> {
-						List<String> areaStationIdList = deptByCurrentUser.getData().stream().filter(s -> s.getParentId().toString().equals(iter.getId().toString()) && s.getDeptCategory().toString().equals("4")).map(Dept::getStationId).collect(Collectors.toList());
+						List<String> areaStationIdList = deptByCurrentUser.getData().stream().filter(s -> s.getParentId().toString().equals(iter.getId().toString()) && "4".equals(s.getDeptCategory().toString())).map(Dept::getStationId).collect(Collectors.toList());
 						List<String> areaStationList = new ArrayList<>();
 						areaStationIdList.forEach(f -> {
 							if (stationByType.contains(f)) {
@@ -1300,7 +1302,7 @@ public class HomePageServiceImpl implements IHomePageService {
 		R<List<Dept>> deptByCurrentUser = sysClient.getDeptByCurrentUser();
 
 
-		List<String> areaStationIdList = deptByCurrentUser.getData().stream().filter(s -> s.getDeptCategory().toString().equals("4") &&
+		List<String> areaStationIdList = deptByCurrentUser.getData().stream().filter(s -> "4".equals(s.getDeptCategory().toString()) &&
 			s.getParentId().toString().equals(deptId.toString())).map(Dept::getStationId).collect(Collectors.toList());
 		if (CollectionUtil.isEmpty(stationByType)) {
 			map.put(deptId, planGenerationTrendByDepts(areaStationIdList));
@@ -1346,7 +1348,7 @@ public class HomePageServiceImpl implements IHomePageService {
 		Map<String, List<YearGenerationVo>> finalYearGenerationMap = yearGenerationMap;
 		switch (dept.getDeptCategory()) {
 			case 1: //集团
-				List<Dept> jtDeptList = deptByCurrentUser.getData().stream().filter(s -> s.getDeptCategory().toString().equals("3")).collect(Collectors.toList());
+				List<Dept> jtDeptList = deptByCurrentUser.getData().stream().filter(s -> "3".equals(s.getDeptCategory().toString())).collect(Collectors.toList());
 				List<AreaGenerationMakeUpVo> list = areaGenerationMakeUpByDepts(jtDeptList, finalYearGenerationMap, deptByCurrentUser.getData(), stationByType);
 				if (CollectionUtil.isNotEmpty(list)) {
 					List<AreaGenerationMakeUpVo> collect = list.stream().sorted(Comparator.comparing(AreaGenerationMakeUpVo::getGeneration).reversed()).collect(Collectors.toList());
@@ -1354,7 +1356,7 @@ public class HomePageServiceImpl implements IHomePageService {
 				}
 				break;
 			case 2: //省子公司
-				List<Dept> deptList = deptByCurrentUser.getData().stream().filter(s -> s.getId().toString().contains(dept.getId().toString()) && s.getDeptCategory().toString().equals("3")).collect(Collectors.toList());
+				List<Dept> deptList = deptByCurrentUser.getData().stream().filter(s -> s.getId().toString().contains(dept.getId().toString()) && "3".equals(s.getDeptCategory().toString())).collect(Collectors.toList());
 				List<AreaGenerationMakeUpVo> list1 = areaGenerationMakeUpByDepts(deptList, finalYearGenerationMap, deptByCurrentUser.getData(), stationByType);
 				if (CollectionUtil.isNotEmpty(list1)) {
 					List<AreaGenerationMakeUpVo> collect1 = list1.stream().sorted(Comparator.comparing(AreaGenerationMakeUpVo::getGeneration).reversed()).collect(Collectors.toList());
@@ -1362,9 +1364,9 @@ public class HomePageServiceImpl implements IHomePageService {
 				}
 				break;
 			case 3: //区域
-				List<Dept> aeraDeptList = deptByCurrentUser.getData().stream().filter(s -> s.getDeptCategory().toString().equals("3")).collect(Collectors.toList());
+				List<Dept> aeraDeptList = deptByCurrentUser.getData().stream().filter(s -> "3".equals(s.getDeptCategory().toString())).collect(Collectors.toList());
 				aeraDeptList.forEach(iter -> {
-					List<Dept> stationDeptList = deptByCurrentUser.getData().stream().filter(s -> s.getParentId().toString().equals(iter.getId().toString()) && s.getDeptCategory().toString().equals("4")).collect(Collectors.toList());
+					List<Dept> stationDeptList = deptByCurrentUser.getData().stream().filter(s -> s.getParentId().toString().equals(iter.getId().toString()) && "4".equals(s.getDeptCategory().toString())).collect(Collectors.toList());
 					List<Dept> depts = new ArrayList<>();
 					stationDeptList.forEach(f -> {
 						if (stationByType.contains(f.getStationId())) {
@@ -1397,7 +1399,7 @@ public class HomePageServiceImpl implements IHomePageService {
 		Map<Long, List<AreaGenerationMakeUpVo>> map = new HashMap<>();
 		//根据用户权限获取机构数据
 		R<List<Dept>> deptByCurrentUser = sysClient.getDeptByCurrentUser();
-		List<Dept> deptList = deptByCurrentUser.getData().stream().filter(s -> s.getDeptCategory().toString().equals("4") &&
+		List<Dept> deptList = deptByCurrentUser.getData().stream().filter(s -> "4".equals(s.getDeptCategory().toString()) &&
 			s.getParentId().toString().equals(deptId.toString())).collect(Collectors.toList());
 
 		List<Dept> depts = new ArrayList<>();
@@ -1466,7 +1468,8 @@ public class HomePageServiceImpl implements IHomePageService {
 	 * @param year
 	 * @return
 	 */
-	public List<String> getMonthList(int year, int endMoth,boolean nextMon) {
+	@Override
+	public List<String> getMonthList(int year, int endMoth, boolean nextMon) {
 		SimpleDateFormat sdf = new SimpleDateFormat(DateUtil.PATTERN_DATE);
 		List<String> list = new ArrayList<>();
 		// 开始日期
@@ -1598,7 +1601,7 @@ public class HomePageServiceImpl implements IHomePageService {
 		if (null == deptId) {
 			return R.data(this.areaCountParamIsNull(deptByCurrentUser.getData(), jointRelayMap, activePowerMap, installedCapacityMap, finalYearGenerationMap, stationByType));
 		}
-		List<Dept> deptList = deptByCurrentUser.getData().stream().filter(s -> s.getParentId().toString().equals(deptId.toString()) && s.getDeptCategory().toString().equals("4")).collect(Collectors.toList());
+		List<Dept> deptList = deptByCurrentUser.getData().stream().filter(s -> s.getParentId().toString().equals(deptId.toString()) && "4".equals(s.getDeptCategory().toString())).collect(Collectors.toList());
 		Map<Long, List<HomePageCountVo>> map = new HashMap<>();
 		Map<Long, List<StationEntity>> stationMap = getStationMap(true);
 		List<HomePageCountVo> list = this.areaCountParamIsNotNull(stationMap, jointRelayMap, activePowerMap, deptList, installedCapacityMap, finalYearGenerationMap, stationByType);
@@ -1628,7 +1631,7 @@ public class HomePageServiceImpl implements IHomePageService {
 				Map<Long, List<StationEntity>> stationMap = getStationMap(true);
 
 				areaDeptList.forEach(iter -> {
-					List<Dept> deptList = userDeptList.stream().filter(s -> s.getParentId().toString().equals(iter.getId().toString()) && s.getDeptCategory().toString().equals("4")).collect(Collectors.toList());
+					List<Dept> deptList = userDeptList.stream().filter(s -> s.getParentId().toString().equals(iter.getId().toString()) && "4".equals(s.getDeptCategory().toString())).collect(Collectors.toList());
 					List<HomePageCountVo> list = this.areaCountParamIsNotNull(stationMap, jointRelayMap, activePowerMap, deptList, installedCapacityMap, finalYearGenerationMap, stationByType);
 					if (CollectionUtil.isNotEmpty(list)) {
 						map.put(iter.getId(), list);
@@ -1646,7 +1649,7 @@ public class HomePageServiceImpl implements IHomePageService {
 		List<HomePageCountVo> list = new ArrayList<>();
 
 		Map<Long, List<StationEntity>> stationMap = getStationMap(false);
-		List<Dept> jtDeptList = userDeptList.stream().filter(s -> s.getDeptCategory().toString().equals("3")).collect(Collectors.toList());
+		List<Dept> jtDeptList = userDeptList.stream().filter(s -> "3".equals(s.getDeptCategory().toString())).collect(Collectors.toList());
 		jtDeptList.forEach(iter -> {
 			HomePageCountVo homePageCountVo = getHomePageCountVo(iter, userDeptList, jointRelayMap, activePowerMap, installedCapacityMap, finalYearGenerationMap, stationByType);
 			if (null != homePageCountVo) {
@@ -1690,7 +1693,7 @@ public class HomePageServiceImpl implements IHomePageService {
 											   Map<String, List<YearGenerationVo>> finalYearGenerationMap, List<String> stationByType) {
 		HomePageCountVo vo = new HomePageCountVo();
 
-		List<Dept> collect = userDeptList.stream().filter(s -> s.getParentId().toString().equals(dept.getId().toString()) && s.getDeptCategory().toString().equals("4")).collect(Collectors.toList());
+		List<Dept> collect = userDeptList.stream().filter(s -> s.getParentId().toString().equals(dept.getId().toString()) && "4".equals(s.getDeptCategory().toString())).collect(Collectors.toList());
 
 		vo.setDeptId(dept.getId());
 		vo.setStationName(dept.getDeptName());
@@ -2139,7 +2142,7 @@ public class HomePageServiceImpl implements IHomePageService {
 			List<Dept> collect = deptByCurrentUser.getData().stream().filter(s -> s.getId().toString().equals(depeId.toString())).collect(Collectors.toList());
 			return R.data(getAreaVoList(collect));
 		}
-		List<Dept> collect = deptByCurrentUser.getData().stream().filter(s -> s.getDeptCategory().toString().equals("3")).collect(Collectors.toList());
+		List<Dept> collect = deptByCurrentUser.getData().stream().filter(s -> "3".equals(s.getDeptCategory().toString())).collect(Collectors.toList());
 		return R.data(getAreaVoList(collect));
 	}
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainSystemMonitoringServiceImpl.java

@@ -1185,9 +1185,9 @@ public class MainSystemMonitoringServiceImpl implements IMainSystemMonitoringSer
 		if (StringUtil.isNotBlank(realIdJointRelay)) {
 			if (null != realIdKeyMap.get(realIdJointRelay)) {
 				String value = realIdKeyMap.get(realIdJointRelay).toString();
-				if (value.equals("0") || value.equals("0.0")) {
+				if ("0".equals(value) || "0.0".equals(value)) {
 					vo.setOnOff(false);
-				} else if (value.contains("1") || value.equals("1.0")) {
+				} else if (value.contains("1") || "1.0".equals(value)) {
 					vo.setOnOff(true);
 				}
 			}
@@ -1772,7 +1772,7 @@ public class MainSystemMonitoringServiceImpl implements IMainSystemMonitoringSer
 	@Override
 	public List<StationEntity> doListByAuth(StationEntity entity) {
 		BladeUser user = AuthUtil.getUser();
-		if (user.getAccount().equals("admin")) {
+		if ("admin".equals(user.getAccount())) {
 			return stationService.getAll();
 		}
 		return getStationList(true);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/PlatformServiceImpl.java

@@ -127,8 +127,9 @@ public class PlatformServiceImpl implements IPlatformService {
 			stationCountVo.setCount(0);
 			Integer type = Integer.valueOf(o.getDictKey());
 			List<StationEntity> stationEntityList = map.get(type);
-			if(CollectionUtil.isNotEmpty(stationEntityList))
+			if(CollectionUtil.isNotEmpty(stationEntityList)) {
 				stationCountVo.setCount(stationEntityList.size());
+			}
 			voList.add(stationCountVo);
 		});
 		return voList;
@@ -258,11 +259,11 @@ public class PlatformServiceImpl implements IPlatformService {
 			return null;
 		}
 		String date = "";
-		if (type.equals("day")) {
+		if ("day".equals(type)) {
 			date = DateUtil.format(new Date(), "yyyy-MM-dd 00:00:00");
-		} else if (type.equals("month")) {
+		} else if ("month".equals(type)) {
 			date = DateUtil.format(new Date(), "yyyy-MM-01 00:00:00");
-		} else if (type.equals("year")) {
+		} else if ("year".equals(type)) {
 			date = DateUtil.format(new Date(), "yyyy-01-01 00:00:00");
 		}
 
@@ -567,8 +568,8 @@ public class PlatformServiceImpl implements IPlatformService {
 		int ct = 0;
 		int pt = 0;
 		if (CollectionUtil.isNotEmpty(paramList)) {
-			List<EmParamEntity> cts = paramList.stream().filter(o -> o.getInfoId().toString().equals(entity.getId().toString()) && o.getParamName().equals("ct")).collect(Collectors.toList());
-			List<EmParamEntity> pts = paramList.stream().filter(o -> o.getInfoId().toString().equals(entity.getId().toString()) && o.getParamName().equals("pt")).collect(Collectors.toList());
+			List<EmParamEntity> cts = paramList.stream().filter(o -> o.getInfoId().toString().equals(entity.getId().toString()) && "ct".equals(o.getParamName())).collect(Collectors.toList());
+			List<EmParamEntity> pts = paramList.stream().filter(o -> o.getInfoId().toString().equals(entity.getId().toString()) && "pt".equals(o.getParamName())).collect(Collectors.toList());
 			if (CollectionUtil.isNotEmpty(cts)) {
 				EmParamEntity emParamEntity = cts.get(0);
 				ct = Integer.valueOf(emParamEntity.getParamValue());
@@ -712,7 +713,7 @@ public class PlatformServiceImpl implements IPlatformService {
 			R<List<AnalyzeCodeBySignagesVO>> analyzeCodeBySignages = analyseDataSearchClient.getAnalyzeCodeBySignages(entity.getNumber());
 			if (analyzeCodeBySignages.isSuccess() && CollectionUtil.isNotEmpty(analyzeCodeBySignages.getData())) {
 				List<AnalyzeCodeBySignagesVO> data = analyzeCodeBySignages.getData();
-				List<AnalyzeCodeBySignagesVO> jointRelayList = data.stream().filter(o -> o.getSignage().equals("joint_relay")).collect(Collectors.toList());
+				List<AnalyzeCodeBySignagesVO> jointRelayList = data.stream().filter(o -> "joint_relay".equals(o.getSignage())).collect(Collectors.toList());
 				if (CollectionUtil.isNotEmpty(jointRelayList)) {
 					AnalyzeCodeBySignagesVO analyzeCodeBySignagesVO = jointRelayList.get(0);
 					if (StringUtil.isNotBlank(analyzeCodeBySignagesVO.getRealId())) {
@@ -750,9 +751,9 @@ public class PlatformServiceImpl implements IPlatformService {
 						if ((record.getQ() > 0 && record.getQ() < 9)) {//异常
 							lastType = 1;
 						} else if (record.getQ() == 0 || record.getQ() == 9) {//非异常
-							if (Func.isNotBlank(record.getValue()) && record.getValue().equals("1")) {//开机
+							if (Func.isNotBlank(record.getValue()) && "1".equals(record.getValue())) {//开机
 								lastType = 2;
-							} else if (Func.isNotBlank(record.getValue()) && record.getValue().equals("0")) {//关机
+							} else if (Func.isNotBlank(record.getValue()) && "0".equals(record.getValue())) {//关机
 								lastType = 3;
 							}
 						}
@@ -765,13 +766,13 @@ public class PlatformServiceImpl implements IPlatformService {
 								lastType = 1;
 							}
 						} else if (record.getQ() == 0 || record.getQ() == 9) {//非异常
-							if (Func.isNotBlank(record.getValue()) && record.getValue().equals("1")) {//开机
+							if (Func.isNotBlank(record.getValue()) && "1".equals(record.getValue())) {//开机
 								if (lastType == 1) {//如果上次类型为异常
 									lastType = 2;
 								} else if (lastType == 3) {//如果上次类型为关机
 									lastType = 2;
 								}
-							} else if (Func.isNotBlank(record.getValue()) && record.getValue().equals("0")) {//关机
+							} else if (Func.isNotBlank(record.getValue()) && "0".equals(record.getValue())) {//关机
 								if (lastType == 1) {//如果上次类型为异常
 									lastType = 3;
 								} else if (lastType == 2) {//如果上次类型为开机

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/RunMonthReportServiceImpl.java

@@ -219,7 +219,7 @@ public class RunMonthReportServiceImpl extends ServiceImpl<RunMonthReportMapper,
 				List<String> signageAll = dataAll.stream().map(iter -> iter.getSignage()).collect(Collectors.toList());
 				if (CollectionUtil.isNotEmpty(dataAll)) {
 					for (AnalyzeCodeBySignagesVO codeBySignagesVO : dataAll) {
-						if (codeBySignagesVO.getSignage().equals("joint_relay")) {
+						if ("joint_relay".equals(codeBySignagesVO.getSignage())) {
 							realId = codeBySignagesVO.getRealId();
 						}
 						signKeyMap.put(codeBySignagesVO.getSignage(), codeBySignagesVO.getInstancefName());
@@ -265,7 +265,7 @@ public class RunMonthReportServiceImpl extends ServiceImpl<RunMonthReportMapper,
 					//定子标识
 					List<String> statorSignages = signageAll.stream().filter(iter -> iter.contains("stator_")).collect(Collectors.toList());
 					//包含负荷、定子、轴承
-					List<String> joinSignages = signageAll.stream().filter(iter -> iter.equals("active_power") || iter.contains("bearing_") || iter.contains("stator_")).collect(Collectors.toList());
+					List<String> joinSignages = signageAll.stream().filter(iter -> "active_power".equals(iter) || iter.contains("bearing_") || iter.contains("stator_")).collect(Collectors.toList());
 
 					//运行数据汇报--负荷
 					RunMonthReportUnitVo runMonthReportUnitVoFH = new RunMonthReportUnitVo();
@@ -500,9 +500,9 @@ public class RunMonthReportServiceImpl extends ServiceImpl<RunMonthReportMapper,
 			if (pointData.getQ() > 0 && pointData.getQ() < 9) {
 				oneLastType = 1;
 			} else if (pointData.getQ() == 0 || pointData.getQ() == 9) {
-				if (Func.isNotBlank(pointData.getValue()) && pointData.getValue().equals("1")) {//开机
+				if (Func.isNotBlank(pointData.getValue()) && "1".equals(pointData.getValue())) {//开机
 					oneLastType = 2;
-				} else if (Func.isNotBlank(pointData.getValue()) && pointData.getValue().equals("0")) {//关机
+				} else if (Func.isNotBlank(pointData.getValue()) && "0".equals(pointData.getValue())) {//关机
 					oneLastType = 3;
 				}
 			}
@@ -548,7 +548,7 @@ public class RunMonthReportServiceImpl extends ServiceImpl<RunMonthReportMapper,
 							}
 							lastType = 1;
 						} else if (record.getQ() == 0 || record.getQ() == 9) {//非异常
-							if (Func.isNotBlank(record.getValue()) && record.getValue().equals("1")) {//开机
+							if (Func.isNotBlank(record.getValue()) && "1".equals(record.getValue())) {//开机
 								if (ObjectUtil.isNotEmpty(pointData)) {
 									//setTypeTime(oneLastType, lastTime, dateTime, type_1_time, type_2_time, type_3_time, bool);
 									if (bool) {
@@ -562,7 +562,7 @@ public class RunMonthReportServiceImpl extends ServiceImpl<RunMonthReportMapper,
 									}
 								}
 								lastType = 2;
-							} else if (Func.isNotBlank(record.getValue()) && record.getValue().equals("0")) {//关机
+							} else if (Func.isNotBlank(record.getValue()) && "0".equals(record.getValue())) {//关机
 								if (ObjectUtil.isNotEmpty(pointData)) {
 									//setTypeTime(oneLastType, lastTime, dateTime, type_1_time, type_2_time, type_3_time, bool);
 									if (bool) {
@@ -592,7 +592,7 @@ public class RunMonthReportServiceImpl extends ServiceImpl<RunMonthReportMapper,
 								lastTime = record.getTime();
 							}
 						} else if (record.getQ() == 0 || record.getQ() == 9) {//非异常
-							if (Func.isNotBlank(record.getValue()) && record.getValue().equals("1")) {//开机
+							if (Func.isNotBlank(record.getValue()) && "1".equals(record.getValue())) {//开机
 								if (lastType == 1) {//如果上次类型为异常
 									type_1_time += DateUtils.getSecondOfTwoDate(DateUtil.parse(lastTime, DateUtil.PATTERN_DATETIME), DateUtil.parse(dateTime, DateUtil.PATTERN_DATETIME));
 									lastType = 2;
@@ -602,7 +602,7 @@ public class RunMonthReportServiceImpl extends ServiceImpl<RunMonthReportMapper,
 									lastType = 2;
 									lastTime = record.getTime();
 								}
-							} else if (Func.isNotBlank(record.getValue()) && record.getValue().equals("0")) {//关机
+							} else if (Func.isNotBlank(record.getValue()) && "0".equals(record.getValue())) {//关机
 								if (lastType == 1) {//如果上次类型为异常
 									type_1_time += DateUtils.getSecondOfTwoDate(DateUtil.parse(lastTime, DateUtil.PATTERN_DATETIME), DateUtil.parse(dateTime, DateUtil.PATTERN_DATETIME));
 									lastType = 3;

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/SideHustleServiceImpl.java

@@ -357,7 +357,7 @@ public class SideHustleServiceImpl implements ISideHustleService {
 			if(StringUtil.isBlank(value)){
 				return  "";
 			}
-			if (value.contains("1") || value.equals("1.0")) {
+			if (value.contains("1") || "1.0".equals(value)) {
 				return o.getEmCode();
 			}
 			return "";
@@ -1220,7 +1220,7 @@ public class SideHustleServiceImpl implements ISideHustleService {
 			// 备用
 			List<String> backupList = equipmentCodeList.stream().filter(o-> !surplusDevices.contains(o)).collect(Collectors.toList());
 			if(CollectionUtil.isEmpty(backupList)){
-				equipmentCountVo.setBackupCount(0l);
+				equipmentCountVo.setBackupCount(0L);
 			}else{
 				List<DeviceVo> backup = backupList.stream().map(o->{
 					DeviceVo deviceVo = new DeviceVo();

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/UnitRunningTimeServiceImpl.java

@@ -170,9 +170,9 @@ public class UnitRunningTimeServiceImpl extends BaseServiceImpl<UnitRunningTimeM
 			if (pointData.getQ() > 0 && pointData.getQ() < 9) {
 				oneLastType = 1;
 			} else if (pointData.getQ() == 0 || pointData.getQ() == 9) {
-				if (Func.isNotBlank(pointData.getValue()) && pointData.getValue().equals("0")) {//关机
+				if (Func.isNotBlank(pointData.getValue()) && "0".equals(pointData.getValue())) {//关机
 					oneLastType = 3;
-				} else if (Func.isNotBlank(pointData.getValue()) && pointData.getValue().equals("1")) {//开机
+				} else if (Func.isNotBlank(pointData.getValue()) && "1".equals(pointData.getValue())) {//开机
 					oneLastType = 2;
 				}
 			}
@@ -213,7 +213,7 @@ public class UnitRunningTimeServiceImpl extends BaseServiceImpl<UnitRunningTimeM
 							}
 							lastType = 1;
 						} else if (record.getQ() == 0 || record.getQ() == 9) {//非异常
-							if (Func.isNotBlank(record.getValue()) && record.getValue().equals("1")) {//开机
+							if (Func.isNotBlank(record.getValue()) && "1".equals(record.getValue())) {//开机
 								if (ObjectUtil.isNotEmpty(pointData)) {
 									if (bool) {
 										if (oneLastType == 1) {
@@ -226,7 +226,7 @@ public class UnitRunningTimeServiceImpl extends BaseServiceImpl<UnitRunningTimeM
 									}
 								}
 								lastType = 2;
-							} else if (Func.isNotBlank(record.getValue()) && record.getValue().equals("0")) {//关机
+							} else if (Func.isNotBlank(record.getValue()) && "0".equals(record.getValue())) {//关机
 								if (ObjectUtil.isNotEmpty(pointData)) {
 									//setTypeTime(oneLastType, lastTime, dateTime, type_1_time, type_2_time, type_3_time, bool);
 									if (bool) {
@@ -256,7 +256,7 @@ public class UnitRunningTimeServiceImpl extends BaseServiceImpl<UnitRunningTimeM
 								lastTime = record.getTime();
 							}
 						} else if (record.getQ() == 0 || record.getQ() == 9) {//非异常
-							if (Func.isNotBlank(record.getValue()) && record.getValue().equals("1")) {//开机
+							if (Func.isNotBlank(record.getValue()) && "1".equals(record.getValue())) {//开机
 								if (lastType == 1) {//如果上次类型为异常
 									type_1_time += DateUtils.getSecondOfTwoDate(DateUtil.parse(lastTime, DateUtil.PATTERN_DATETIME), DateUtil.parse(dateTime, DateUtil.PATTERN_DATETIME));
 									lastType = 2;
@@ -266,7 +266,7 @@ public class UnitRunningTimeServiceImpl extends BaseServiceImpl<UnitRunningTimeM
 									lastType = 2;
 									lastTime = record.getTime();
 								}
-							} else if (Func.isNotBlank(record.getValue()) && record.getValue().equals("0")) {//关机
+							} else if (Func.isNotBlank(record.getValue()) && "0".equals(record.getValue())) {//关机
 								if (lastType == 1) {//如果上次类型为异常
 									type_1_time += DateUtils.getSecondOfTwoDate(DateUtil.parse(lastTime, DateUtil.PATTERN_DATETIME), DateUtil.parse(dateTime, DateUtil.PATTERN_DATETIME));
 									lastType = 3;

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java

@@ -281,7 +281,7 @@ public class WaterServiceImpl implements IWaterService {
 		}
 		try{
 			Date date = sdf.parse(time);
-			if(System.currentTimeMillis() - date.getTime() > 30 * 60 * 1000l){
+			if(System.currentTimeMillis() - date.getTime() > 30 * 60 * 1000L){
 				return 0.0;
 			}
 		}catch (ParseException e){
@@ -531,7 +531,9 @@ public class WaterServiceImpl implements IWaterService {
 			if(i == result.size() - 1){
 				endTime = endDate;
 			}
-			else endTime = DateUtil.parse(result.get(i+1).getTime(), DateUtil.PATTERN_DATETIME);
+			else {
+				endTime = DateUtil.parse(result.get(i+1).getTime(), DateUtil.PATTERN_DATETIME);
+			}
 			time += endTime.getTime() - startTime.getTime();
 		}
 		return time;
@@ -736,7 +738,9 @@ public class WaterServiceImpl implements IWaterService {
 				vo.setHour(dateTime.getHours());
 				if (StringUtil.isBlank(item.getVal())) {
 					vo.setActivePower("0");
-				}else vo.setActivePower(item.getVal());
+				}else {
+					vo.setActivePower(item.getVal());
+				}
 				list.add(vo);
 			}
 		}
@@ -1139,7 +1143,8 @@ public class WaterServiceImpl implements IWaterService {
 	 * @param deptId
 	 * @return
 	 */
-	public Dept getTitleDetp(List<Dept> authList,Long deptId) {
+	@Override
+	public Dept getTitleDetp(List<Dept> authList, Long deptId) {
 		if(null == deptId){
 			// 最小类型机构
 			Dept dept = authList.stream().min(Comparator.comparing(Dept::getDeptCategory)).orElse(null);
@@ -1393,7 +1398,9 @@ public class WaterServiceImpl implements IWaterService {
 		Map<Integer,String> map;
 		if(flag == 0){
 			map = list.get(0).getFrontCurveMap();
-		} else map = list.get(0).getRearCurveMap();
+		} else {
+			map = list.get(0).getRearCurveMap();
+		}
 		if(MapUtils.isEmpty(map)){
 			return null;
 		}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WeatherServiceImpl.java

@@ -29,6 +29,7 @@ public class WeatherServiceImpl implements IWeatherService {
 	 * @param codes
 	 * @return
 	 */
+	@Override
 	public Map<String, HeWeatherWeatherNowResponse> getNowWeather(List<String> codes) {
 		if(CollectionUtil.isEmpty(codes)){
 			return null;
@@ -46,6 +47,7 @@ public class WeatherServiceImpl implements IWeatherService {
 	 * @param codes
 	 * @return
 	 */
+	@Override
 	public Map<String, HeWeatherWeatherDailyResponse> getWeekWeather(List<String> codes) {
 		if(CollectionUtil.isEmpty(codes)){
 			return null;

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceLibraryServiceImpl.java

@@ -63,16 +63,21 @@ public class OperMaintenanceLibraryServiceImpl extends BaseServiceImpl<OperMaint
 	public R<IPage<OperMaintenanceLibraryVO>> list(OperMaintenanceLibraryDTO req, Query query) {
 		Wrapper<OperMaintenanceLibraryEntity> queryWrapper = new LambdaQueryWrapper<OperMaintenanceLibraryEntity>() {{
 			orderByDesc(OperMaintenanceLibraryEntity::getCreateTime);
-			if (StringUtils.isNotBlank(req.getLibraryCode()))
+			if (StringUtils.isNotBlank(req.getLibraryCode())) {
 				like(OperMaintenanceLibraryEntity::getLibraryCode, req.getLibraryCode());
-			if (StringUtils.isNotBlank(req.getEmCode()))
+			}
+			if (StringUtils.isNotBlank(req.getEmCode())) {
 				like(OperMaintenanceLibraryEntity::getEmCode, req.getEmCode());
-			if (StringUtils.isNotBlank(req.getTypeCode()))
+			}
+			if (StringUtils.isNotBlank(req.getTypeCode())) {
 				eq(OperMaintenanceLibraryEntity::getTypeCode, req.getTypeCode());
-			if (StringUtils.isNotBlank(req.getProcDefId()))
+			}
+			if (StringUtils.isNotBlank(req.getProcDefId())) {
 				eq(OperMaintenanceLibraryEntity::getProcDefId, req.getProcDefId());
-			if (StringUtils.isNotBlank(req.getDisposers()))
+			}
+			if (StringUtils.isNotBlank(req.getDisposers())) {
 				like(OperMaintenanceLibraryEntity::getDisposers, "," + req.getDisposers() + ",");
+			}
 		}};
 		IPage pages = super.page(Condition.getPage(query), queryWrapper);
 		pages.setRecords(OperMaintenanceLibraryWrapper.build().listVO(pages.getRecords()));

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceParameterServiceImpl.java

@@ -35,14 +35,18 @@ public class OperMaintenanceParameterServiceImpl extends BaseServiceImpl<OperMai
 	public R<IPage<OperMaintenanceParameterVO>> list(OperMaintenanceParameterDTO req, Query query) {
 		Wrapper<OperMaintenanceParameterEntity> queryWrapper = new LambdaQueryWrapper<OperMaintenanceParameterEntity>() {{
 			orderByDesc(OperMaintenanceParameterEntity::getCreateTime);
-			if (StringUtils.isNotBlank(req.getEmCode()))
+			if (StringUtils.isNotBlank(req.getEmCode())) {
 				like(OperMaintenanceParameterEntity::getEmCode, req.getEmCode());
-			if (StringUtils.isNotBlank(req.getTypeCode()))
+			}
+			if (StringUtils.isNotBlank(req.getTypeCode())) {
 				eq(OperMaintenanceParameterEntity::getTypeCode, req.getTypeCode());
-			if (req.getRefLibraryId() != null)
+			}
+			if (req.getRefLibraryId() != null) {
 				eq(OperMaintenanceParameterEntity::getRefLibraryId, req.getRefLibraryId());
-			if (req.getDisposer() != null)
+			}
+			if (req.getDisposer() != null) {
 				eq(OperMaintenanceParameterEntity::getDisposer, req.getDisposer());
+			}
 		}};
 
 		IPage pages = super.page(Condition.getPage(query), queryWrapper);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/ImsDeptServiceImpl.java

@@ -143,7 +143,7 @@ public class ImsDeptServiceImpl extends ServiceImpl<ImsDeptMapper, ImsDeptEntity
 		if (deptTree.isSuccess() && CollectionUtil.isNotEmpty(deptTree.getData()) && deptByCurrentUser.isSuccess() && CollectionUtil.isNotEmpty(deptByCurrentUser.getData())) {
 			List<Long> deptIdList = deptByCurrentUser.getData().stream().map(Dept::getId).collect(Collectors.toList());
 			List<Dept> deptData = deptTree.getData();
-			List<Dept> collect = deptData.stream().filter(s -> s.getParentId().toString().equals("0")).collect(Collectors.toList());
+			List<Dept> collect = deptData.stream().filter(s -> "0".equals(s.getParentId().toString())).collect(Collectors.toList());
 			List<DeptTreeVo> deptTreeData = transition(collect, "0", deptIdList);
 			return R.data(createGroupAndStationTree(deptData, deptIdList, deptTreeData));
 		}

hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/RealMonitorServiceImpl.java

@@ -234,7 +234,7 @@ public class RealMonitorServiceImpl implements IRealMonitorService {
 			SimpleDateFormat simpleDateFormat = new SimpleDateFormat(DateUtil.PATTERN_DATETIME);
 			Date date = simpleDateFormat.parse(time);
 			// 实时数据超出10分钟未刷新，值置为 0 显示
-			if(System.currentTimeMillis() - date.getTime() > 10 * 60 * 1000l){
+			if(System.currentTimeMillis() - date.getTime() > 10 * 60 * 1000L){
 				value.put("value","0");
 			}
 		}catch (ParseException e){
@@ -839,6 +839,7 @@ public class RealMonitorServiceImpl implements IRealMonitorService {
 	 * @param message
 	 * @return
 	 */
+	@Override
 	public TextMessage getSendMessage(MessageParamVo message) {
 		Long beginTime = System.currentTimeMillis();
 		Thread thread = Thread.currentThread();

hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/utils/ArtemisPostUtils.java

@@ -122,7 +122,7 @@ public class ArtemisPostUtils {
         String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType, null);
         if (null != result || !"".equals(result)) {
             JSONObject json = JSONObject.parseObject(result);
-            if (time != -1 && json.getString("msg").equals("success")) {
+            if (time != -1 && "success".equals(json.getString("msg"))) {
                 Runnable myRunnable = new Runnable(){
                     @Override
                     public void run(){

hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/CommonUtils.java

@@ -70,10 +70,10 @@ public class CommonUtils {
 		//创建第2个sheet用于放数据
 		wb.createSheet("数据");
 		//模板上设置的合并单元格失效，所以手动设置
-		if(stationType.equals("0")){
+		if("0".equals(stationType)){
 			fillText(wb, wb.getSheetAt(0), startRow - 1, "3、机组负荷、温度曲线", 14);
 			fillAvgValueMap(wb, sheet2NowRow, avgList);
-		}else if(stationType.equals("")){
+		}else if("".equals(stationType)){
 			fillText(wb, wb.getSheetAt(0), startRow - 1, "3、内河水位、外河水位、负荷、温度曲线", 14);
 		}
 		//循环机组遥测数据

hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/HttpClientUtils.java

@@ -52,12 +52,15 @@ public abstract class HttpClientUtils {
 			try {
 				sc = SSLContext.getInstance("SSLv3");
 				sc.init((KeyManager[]) null, new TrustManager[]{new X509TrustManager() {
+					@Override
 					public void checkClientTrusted(X509Certificate[] paramArrayOfX509Certificate, String paramString) throws CertificateException {
 					}
 
+					@Override
 					public void checkServerTrusted(X509Certificate[] paramArrayOfX509Certificate, String paramString) throws CertificateException {
 					}
 
+					@Override
 					public X509Certificate[] getAcceptedIssuers() {
 						return null;
 					}
@@ -68,6 +71,7 @@ public abstract class HttpClientUtils {
 				var2.printStackTrace();
 			}
 			Registry socketFactoryRegistry = RegistryBuilder.create().register("http", PlainConnectionSocketFactory.INSTANCE).register("https", new SSLConnectionSocketFactory(sc, new HostnameVerifier() {
+				@Override
 				public boolean verify(String s, SSLSession sslSession) {
 					return true;
 				}
@@ -187,8 +191,9 @@ public abstract class HttpClientUtils {
 		HttpGet httpGet = new HttpGet(url);
 
 		for (int i = 0; i < headers.length; i += 2) {
-			if (headers[i] == null || headers[i + 1] == null)
+			if (headers[i] == null || headers[i + 1] == null) {
 				continue;
+			}
 			httpGet.addHeader(headers[i], headers[i + 1]);
 		}
 
@@ -222,8 +227,9 @@ public abstract class HttpClientUtils {
 
 		ArrayList<BasicNameValuePair> list = new ArrayList<BasicNameValuePair>();
 		for (int i = 0; i < params.length; i += 2) {
-			if (params[i] == null || params[i + 1] == null)
+			if (params[i] == null || params[i + 1] == null) {
 				continue;
+			}
 			list.add(new BasicNameValuePair(params[i], params[i + 1]));
 		}
 
@@ -270,8 +276,9 @@ public abstract class HttpClientUtils {
 		HttpPost httpPost = new HttpPost(url);
 
 		for (int i = 0; i < headers.length; i += 2) {
-			if (headers[i] == null || headers[i + 1] == null)
+			if (headers[i] == null || headers[i + 1] == null) {
 				continue;
+			}
 			httpPost.addHeader(headers[i], headers[i + 1]);
 		}
 
@@ -300,8 +307,9 @@ public abstract class HttpClientUtils {
 		HttpPost httpPost = new HttpPost(url);
 
 		for (int i = 0; i < headers.length; i += 2) {
-			if (headers[i] == null || headers[i + 1] == null)
+			if (headers[i] == null || headers[i + 1] == null) {
 				continue;
+			}
 			httpPost.addHeader(headers[i], headers[i + 1]);
 		}
 

hzims-service/operational/src/main/resources/log/logback-dev.xml

@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds">
-    <!-- 自定义参数监听 -->
-    <contextListener class="org.springblade.core.log.listener.LoggerStartupListener"/>
-
-    <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-    <conversionRule conversionWord="wex"
-                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-    <conversionRule conversionWord="wEx"
-                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
-    <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-    <!-- 控制台输出 -->
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-            <charset>utf8</charset>
-        </encoder>
-    </appender>
-
-    <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
-    <property name="log.pattern"
-              value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] [%X{traceId}] %-5level %logger{50} - %msg%n"/>
-
-    <!-- 生成日志文件 -->
-    <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>log/info.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- 日志文件输出的文件名 -->
-            <fileNamePattern>log/info/info-%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
-            <!--设置保存10天 一天24个文件，一小时生成一个-->
-            <MaxHistory>240</MaxHistory>
-            <!--给定日志文件大小，超过指定的大小就新建一个日志文件-->
-            <maxFileSize>20MB</maxFileSize>
-            <totalSizeCap>10GB</totalSizeCap>  <!-- 总日志大小 -->
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <!-- 打印日志级别 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>INFO</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 生成日志文件 -->
-    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>log/error.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- 日志文件输出的文件名 -->
-            <fileNamePattern>log/error/error-%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
-            <!--设置保存15天 一天24个文件，一小时生成一个-->
-            <MaxHistory>360</MaxHistory>
-            <!--给定日志文件大小，超过指定的大小就新建一个日志文件-->
-            <maxFileSize>20MB</maxFileSize>
-            <totalSizeCap>10GB</totalSizeCap>  <!-- 总日志大小 -->
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <!-- 打印日志级别 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 日志输出级别 -->
-    <root level="ERROR">
-        <appender-ref ref="STDOUT"/>
-        <!--<appender-ref ref="INFO"/>-->
-        <appender-ref ref="ERROR"/>
-    </root>
-
-    <logger name="net.sf.ehcache" level="ERROR"/>
-    <logger name="druid.sql" level="ERROR"/>
-
-
-    <!-- MyBatis log configure -->
-    <logger name="com.apache.ibatis" level="ERROR"/>
-    <logger name="org.mybatis.spring" level="ERROR"/>
-    <logger name="java.sql.Connection" level="ERROR"/>
-    <logger name="java.sql.Statement" level="ERROR"/>
-    <logger name="java.sql.PreparedStatement" level="ERROR"/>
-
-    <!-- 减少部分debug日志 -->
-    <logger name="druid.sql" level="ERROR"/>
-    <logger name="org.apache.shiro" level="ERROR"/>
-    <logger name="org.mybatis.spring" level="ERROR"/>
-    <logger name="org.springframework" level="ERROR"/>
-    <logger name="org.springframework.context" level="ERROR"/>
-    <logger name="org.springframework.beans" level="ERROR"/>
-    <logger name="com.baomidou.mybatisplus" level="ERROR"/>
-    <logger name="org.apache.ibatis.io" level="ERROR"/>
-    <logger name="org.apache.velocity" level="ERROR"/>
-    <logger name="org.eclipse.jetty" level="ERROR"/>
-    <logger name="io.undertow" level="ERROR"/>
-    <logger name="org.xnio.nio" level="ERROR"/>
-    <logger name="org.thymeleaf" level="ERROR"/>
-    <logger name="springfox.documentation" level="ERROR"/>
-    <logger name="org.hibernate.validator" level="ERROR"/>
-    <logger name="com.netflix.loadbalancer" level="ERROR"/>
-    <logger name="com.netflix.hystrix" level="ERROR"/>
-    <logger name="com.netflix.zuul" level="ERROR"/>
-    <logger name="de.codecentric" level="ERROR"/>
-    <!-- cache ERROR -->
-    <logger name="net.sf.ehcache" level="ERROR"/>
-    <logger name="org.springframework.cache" level="ERROR"/>
-    <!-- cloud -->
-    <logger name="org.apache.http" level="ERROR"/>
-    <logger name="com.netflix.discovery" level="ERROR"/>
-    <logger name="com.netflix.eureka" level="ERROR"/>
-    <!-- 业务日志 -->
-    <Logger name="org.springblade" level="ERROR"/>
-    <Logger name="org.springblade.core.version" level="ERROR"/>
-
-    <!-- 减少nacos日志 -->
-    <logger name="com.alibaba.nacos" level="ERROR"/>
-
-</configuration>

hzims-service/operational/src/main/resources/log/logback-prod.xml

@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds">
-    <!-- 自定义参数监听 -->
-    <contextListener class="org.springblade.core.log.listener.LoggerStartupListener"/>
-
-    <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-    <conversionRule conversionWord="wex"
-                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-    <conversionRule conversionWord="wEx"
-                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
-    <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-    <!-- 控制台输出 -->
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-            <charset>utf8</charset>
-        </encoder>
-    </appender>
-
-    <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
-    <property name="log.pattern"
-              value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] [%X{traceId}] %-5level %logger{50} - %msg%n"/>
-
-    <!-- 生成日志文件 -->
-    <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>log/info.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- 日志文件输出的文件名 -->
-            <fileNamePattern>log/info/info-%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
-            <!--设置保存10天 一天24个文件，一小时生成一个-->
-            <MaxHistory>240</MaxHistory>
-            <!--给定日志文件大小，超过指定的大小就新建一个日志文件-->
-            <maxFileSize>20MB</maxFileSize>
-            <totalSizeCap>10GB</totalSizeCap>  <!-- 总日志大小 -->
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <!-- 打印日志级别 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>INFO</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 生成日志文件 -->
-    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>log/error.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- 日志文件输出的文件名 -->
-            <fileNamePattern>log/error/error-%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
-            <!--设置保存15天 一天24个文件，一小时生成一个-->
-            <MaxHistory>360</MaxHistory>
-            <!--给定日志文件大小，超过指定的大小就新建一个日志文件-->
-            <maxFileSize>20MB</maxFileSize>
-            <totalSizeCap>10GB</totalSizeCap>  <!-- 总日志大小 -->
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <!-- 打印日志级别 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 日志输出级别 -->
-    <root level="ERROR">
-        <appender-ref ref="STDOUT"/>
-        <!--<appender-ref ref="INFO"/>-->
-        <appender-ref ref="ERROR"/>
-    </root>
-
-    <logger name="net.sf.ehcache" level="ERROR"/>
-    <logger name="druid.sql" level="ERROR"/>
-
-
-    <!-- MyBatis log configure -->
-    <logger name="com.apache.ibatis" level="ERROR"/>
-    <logger name="org.mybatis.spring" level="ERROR"/>
-    <logger name="java.sql.Connection" level="ERROR"/>
-    <logger name="java.sql.Statement" level="ERROR"/>
-    <logger name="java.sql.PreparedStatement" level="ERROR"/>
-
-    <!-- 减少部分debug日志 -->
-    <logger name="druid.sql" level="ERROR"/>
-    <logger name="org.apache.shiro" level="ERROR"/>
-    <logger name="org.mybatis.spring" level="ERROR"/>
-    <logger name="org.springframework" level="ERROR"/>
-    <logger name="org.springframework.context" level="ERROR"/>
-    <logger name="org.springframework.beans" level="ERROR"/>
-    <logger name="com.baomidou.mybatisplus" level="ERROR"/>
-    <logger name="org.apache.ibatis.io" level="ERROR"/>
-    <logger name="org.apache.velocity" level="ERROR"/>
-    <logger name="org.eclipse.jetty" level="ERROR"/>
-    <logger name="io.undertow" level="ERROR"/>
-    <logger name="org.xnio.nio" level="ERROR"/>
-    <logger name="org.thymeleaf" level="ERROR"/>
-    <logger name="springfox.documentation" level="ERROR"/>
-    <logger name="org.hibernate.validator" level="ERROR"/>
-    <logger name="com.netflix.loadbalancer" level="ERROR"/>
-    <logger name="com.netflix.hystrix" level="ERROR"/>
-    <logger name="com.netflix.zuul" level="ERROR"/>
-    <logger name="de.codecentric" level="ERROR"/>
-    <!-- cache INFO -->
-    <logger name="net.sf.ehcache" level="ERROR"/>
-    <logger name="org.springframework.cache" level="ERROR"/>
-    <!-- cloud -->
-    <logger name="org.apache.http" level="ERROR"/>
-    <logger name="com.netflix.discovery" level="ERROR"/>
-    <logger name="com.netflix.eureka" level="ERROR"/>
-    <!-- 业务日志 -->
-    <Logger name="org.springblade" level="ERROR"/>
-    <Logger name="org.springblade.core.version" level="ERROR"/>
-
-    <!-- 减少nacos日志 -->
-    <logger name="com.alibaba.nacos" level="ERROR"/>
-
-</configuration>

hzims-service/operational/src/main/resources/log/logback-test.xml

@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds">
-    <!-- 自定义参数监听 -->
-    <contextListener class="org.springblade.core.log.listener.LoggerStartupListener"/>
-
-    <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-    <conversionRule conversionWord="wex"
-                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-    <conversionRule conversionWord="wEx"
-                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
-    <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-    <!-- 控制台输出 -->
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-            <charset>utf8</charset>
-        </encoder>
-    </appender>
-
-    <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
-    <property name="log.pattern"
-              value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] [%X{traceId}] %-5level %logger{50} - %msg%n"/>
-
-    <!-- 生成日志文件
-    <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>log/info.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            &lt;!&ndash; 日志文件输出的文件名 &ndash;&gt;
-            <fileNamePattern>log/info/info-%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
-            &lt;!&ndash;设置保存10天 一天24个文件，一小时生成一个&ndash;&gt;
-            <MaxHistory>240</MaxHistory>
-            &lt;!&ndash;给定日志文件大小，超过指定的大小就新建一个日志文件&ndash;&gt;
-            <maxFileSize>20MB</maxFileSize>
-            <totalSizeCap>10GB</totalSizeCap>  &lt;!&ndash; 总日志大小 &ndash;&gt;
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        &lt;!&ndash; 打印日志级别 &ndash;&gt;
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>INFO</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>-->
-
-    <!-- 生成日志文件 -->
-    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>log/error.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- 日志文件输出的文件名 -->
-            <fileNamePattern>log/error/error-%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
-            <!--设置保存15天 一天24个文件，一小时生成一个-->
-            <MaxHistory>360</MaxHistory>
-            <!--给定日志文件大小，超过指定的大小就新建一个日志文件-->
-            <maxFileSize>20MB</maxFileSize>
-            <totalSizeCap>10GB</totalSizeCap>  <!-- 总日志大小 -->
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <!-- 打印日志级别 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 日志输出级别 -->
-    <root level="ERROR">
-        <appender-ref ref="STDOUT"/>
-        <!--<appender-ref ref="INFO"/>-->
-        <appender-ref ref="ERROR"/>
-    </root>
-
-    <logger name="net.sf.ehcache" level="ERROR"/>
-    <logger name="druid.sql" level="ERROR"/>
-
-
-    <!-- MyBatis log configure -->
-    <logger name="com.apache.ibatis" level="ERROR"/>
-    <logger name="org.mybatis.spring" level="ERROR"/>
-    <logger name="java.sql.Connection" level="ERROR"/>
-    <logger name="java.sql.Statement" level="ERROR"/>
-    <logger name="java.sql.PreparedStatement" level="ERROR"/>
-
-    <!-- 减少部分debug日志 -->
-    <logger name="druid.sql" level="ERROR"/>
-    <logger name="org.apache.shiro" level="ERROR"/>
-    <logger name="org.mybatis.spring" level="ERROR"/>
-    <logger name="org.springframework" level="ERROR"/>
-    <logger name="org.springframework.context" level="ERROR"/>
-    <logger name="org.springframework.beans" level="ERROR"/>
-    <logger name="com.baomidou.mybatisplus" level="ERROR"/>
-    <logger name="org.apache.ibatis.io" level="ERROR"/>
-    <logger name="org.apache.velocity" level="ERROR"/>
-    <logger name="org.eclipse.jetty" level="ERROR"/>
-    <logger name="io.undertow" level="ERROR"/>
-    <logger name="org.xnio.nio" level="ERROR"/>
-    <logger name="org.thymeleaf" level="ERROR"/>
-    <logger name="springfox.documentation" level="ERROR"/>
-    <logger name="org.hibernate.validator" level="ERROR"/>
-    <logger name="com.netflix.loadbalancer" level="ERROR"/>
-    <logger name="com.netflix.hystrix" level="ERROR"/>
-    <logger name="com.netflix.zuul" level="ERROR"/>
-    <logger name="de.codecentric" level="ERROR"/>
-    <!-- cache INFO -->
-    <logger name="net.sf.ehcache" level="ERROR"/>
-    <logger name="org.springframework.cache" level="ERROR"/>
-    <!-- cloud -->
-    <logger name="org.apache.http" level="ERROR"/>
-    <logger name="com.netflix.discovery" level="ERROR"/>
-    <logger name="com.netflix.eureka" level="ERROR"/>
-    <!-- 业务日志 -->
-    <Logger name="org.springblade" level="ERROR"/>
-    <Logger name="org.springblade.core.version" level="ERROR"/>
-
-    <!-- 减少nacos日志 -->
-    <logger name="com.alibaba.nacos" level="ERROR"/>
-
-</configuration>

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CheckItemServiceImpl.java

@@ -100,7 +100,9 @@ public class CheckItemServiceImpl extends BaseServiceImpl<CheckItemMapper, Check
 			throw new ServiceException("检查项名称或序号已存在");
 		}
 		boolean result = save(req);
-		if (result) updateParentScore(req, false);
+		if (result) {
+			updateParentScore(req, false);
+		}
 		return result;
 	}
 
@@ -114,7 +116,9 @@ public class CheckItemServiceImpl extends BaseServiceImpl<CheckItemMapper, Check
 			throw new ServiceException("检查项名称或序号已存在");
 		}
 		boolean result = updateById(req);
-		if (result) updateParentScore(req, false);
+		if (result) {
+			updateParentScore(req, false);
+		}
 		return result;
 	}
 
@@ -148,7 +152,9 @@ public class CheckItemServiceImpl extends BaseServiceImpl<CheckItemMapper, Check
 			entityQueryWrapper.eq("PARENT_ITEM", parentId);
 			entityQueryWrapper.ne("ID", entity.getId());
 			List<CheckItemEntity> children = list(entityQueryWrapper);
-			if (!isDelete) children.add(entity);
+			if (!isDelete) {
+				children.add(entity);
+			}
 			double parentTotal = children.stream().map(CheckItemEntity::getTotalScore).mapToDouble(Double::doubleValue).sum();
 			CheckItemEntity parentItem = getById(parentId);
 			parentItem.setTotalScore(parentTotal);
@@ -506,13 +512,13 @@ public class CheckItemServiceImpl extends BaseServiceImpl<CheckItemMapper, Check
 		for (Field field : obj.getClass().getDeclaredFields()) {
 			field.setAccessible(true);
 			if (field.get(obj) == null) {
-				if (field.getGenericType().toString().equals("class java.lang.String")) {
+				if ("class java.lang.String".equals(field.getGenericType().toString())) {
 					field.set(obj, "");
-				} else if (field.getGenericType().toString().equals("class java.lang.Integer")) {
+				} else if ("class java.lang.Integer".equals(field.getGenericType().toString())) {
 					field.set(obj, 0);
-				} else if (field.getGenericType().toString().equals("class java.lang.Double")) {
+				} else if ("class java.lang.Double".equals(field.getGenericType().toString())) {
 					field.set(obj, 0.0);
-				} else if (field.getGenericType().toString().equals("class java.lang.Long")) {
+				} else if ("class java.lang.Long".equals(field.getGenericType().toString())) {
 					field.set(obj, 0L);
 				}
 			}

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafeEquipmentTrialServiceImpl.java

@@ -70,7 +70,9 @@ public class SafeEquipmentTrialServiceImpl extends BaseServiceImpl<SafeEquipment
 				if(Optional.ofNullable(param.getCreateDept()).isPresent()){
 					eq("create_dept",param.getCreateDept());
 				}
-			} else in("create_dept",param.getDeptList());
+			} else {
+				in("create_dept",param.getDeptList());
+			}
 			if(Optional.ofNullable(param.getStartTime()).isPresent()){
 				gt("create_time", param.getStartTime());
 			}
@@ -93,7 +95,9 @@ public class SafeEquipmentTrialServiceImpl extends BaseServiceImpl<SafeEquipment
 				if(Optional.ofNullable(entity.getCreateDept()).isPresent()){
 					eq("create_dept",entity.getCreateDept());
 				}
-			} else in("create_dept",entity.getDeptList());
+			} else {
+				in("create_dept",entity.getDeptList());
+			}
 			if(Optional.ofNullable(entity.getTime()).isPresent()){
 				gt("create_time", entity.getTime());
 				lt("create_time", entity.getTime());

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafetyToolTypeServiceImpl.java

@@ -113,14 +113,18 @@ public class SafetyToolTypeServiceImpl extends BaseServiceImpl<SafetyToolTypeMap
 	@Override
 	public IPage pageCondition(SafetyToolTypeListDTO req, Query query) {
 		QueryWrapper<SafetyToolTypeEntity> queryWrapper = new QueryWrapper<SafetyToolTypeEntity>() {{
-			if (null != req.getSendType())
+			if (null != req.getSendType()) {
 				eq("send_type", req.getSendType());
-			if (StringUtil.isNotBlank(req.getTypeName()))
+			}
+			if (StringUtil.isNotBlank(req.getTypeName())) {
 				like("type_name", StringUtil.trimWhitespace(req.getTypeName()));
-			if (StringUtil.isNotBlank(req.getStartSendTime()))
+			}
+			if (StringUtil.isNotBlank(req.getStartSendTime())) {
 				ge("send_time", req.getStartSendTime());
-			if (StringUtil.isNotBlank(req.getEndSendTime()))
+			}
+			if (StringUtil.isNotBlank(req.getEndSendTime())) {
 				le("send_time", req.getEndSendTime());
+			}
 		}};
 		IPage pages = super.page(Condition.getPage(query), queryWrapper);
 		pages.setRecords(SafetyToolTypeWrapper.build().listVO(pages.getRecords()));

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/Base64ImgReplacedElementFactory.java

@@ -42,7 +42,7 @@ public class Base64ImgReplacedElementFactory implements ReplacedElementFactory {
 		}
 		String nodeName = e.getNodeName();
 		// 找到img标签
-		if (nodeName.equals("img")) {
+		if ("img".equals(nodeName)) {
 			String attribute = e.getAttribute("src");
 			FSImage fsImage;
 			try {

hzims-service/spare/spare.iml

@@ -1,358 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-core-boot:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-core-db:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" />
-    <orderEntry type="library" name="Maven: com.oracle:ojdbc7:12.2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.postgresql:postgresql:42.2.6" level="project" />
-    <orderEntry type="library" name="Maven: com.microsoft.sqlserver:mssql-jdbc:6.4.0.jre8" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-core-secure:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-auth:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-core-cloud:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-stream:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.37" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-core:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-jmx:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tuple:1.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-tuple:1.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-function-context:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-function-core:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-okhttp:10.4.0" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-hystrix:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.18" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.13.0" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.18" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.18" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.1.16" level="project" />
-    <orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.3.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.3.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.platform:junit-platform-engine:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:2.23.4" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-cache:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-redis:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-jwt:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.19.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.19.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.19.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.redisson:redisson:3.11.6" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.51.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.51.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.cache:cache-api:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.19.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex.rxjava2:rxjava:2.2.19" level="project" />
-    <orderEntry type="library" name="Maven: de.ruedigermoeller:fst:2.57" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.0" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.16" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.0.13" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-core:5.0.13" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-log:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.1" level="project" />
-    <orderEntry type="library" name="Maven: net.logstash.logback:logstash-logback-encoder:6.2" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.janino:janino:3.0.15" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.janino:commons-compiler:3.0.16" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-mybatis:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-typehandlers-jsr310:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-swagger:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-core-tool:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.12.1" level="project" />
-    <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.6.0" level="project" />
-    <orderEntry type="library" name="Maven: io.protostuff:protostuff-api:1.6.0" level="project" />
-    <orderEntry type="library" name="Maven: io.protostuff:protostuff-runtime:1.6.0" level="project" />
-    <orderEntry type="library" name="Maven: io.protostuff:protostuff-collectionschema:1.6.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-oss-all:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-oss-aliyun:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-core-oss:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
-    <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-json:1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.2" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.3-1" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.8.3" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-xc:1.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.9" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:3.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20170516" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ram:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-sts:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ecs:4.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-oss-minio:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.minio:minio:6.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-xml:1.20.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.20.0" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.3" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.6" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:3.0.1" level="project" />
-    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-oss-qiniu:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.qiniu:qiniu-java-sdk:7.2.23" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-oss-tencent:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.qcloud:cos_api:5.6.8" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.59" level="project" />
-    <orderEntry type="module" module-name="spare-api" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.59" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.4.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.4.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.4.0" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.21" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:2.5.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springblade:blade-core-test:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-core-launch:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.20.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.undertow:undertow-core:2.0.30.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.3.8.Final" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.xnio:xnio-nio:3.3.8.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.undertow:undertow-servlet:2.0.30.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.undertow:undertow-websockets-jsr:2.0.30.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.spec.javax.websocket:jboss-websocket-api_1.1_spec:1.1.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish:javax.el:3.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.16" level="project" />
-    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.4" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springblade:blade-core-auto:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.hnac.hzinfo:common-asm-api:0.0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: com.hnac.hzinfo:hzinfo-commons:2.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:javase:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.2" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
-    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.hnac.hzinfo:hzinfo-datasource:2.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.11" level="project" />
-    <orderEntry type="library" name="Maven: com.hnac.hzinfo:hzinfo-core:2.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: com.hnac.hzinfo:hzinfo-web:2.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: com.hnac.hzinfo:hzinfo-paginator:2.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.atomikos:transactions:4.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.atomikos:transactions-api:4.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.atomikos:atomikos-util:4.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.atomikos:transactions-jta:4.0.6" level="project" />
-    <orderEntry type="library" name="Maven: com.atomikos:transactions-jdbc:4.0.6" level="project" />
-    <orderEntry type="library" name="Maven: javax.transaction:jta:1.1" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.27" level="project" />
-    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.0" level="project" />
-    <orderEntry type="library" name="Maven: com.hnac.hzinfo:ice:0.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.0" level="project" />
-    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: ognl:ognl:3.1.12" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:3.0.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.ckfinder:apache-ant-zip:2.3" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.9" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
-    <orderEntry type="library" name="Maven: com.drewnoakes:metadata-extractor:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: com.adobe.xmp:xmpcore:5.1.2" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.1" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.20" level="project" />
-    <orderEntry type="library" name="Maven: com.google.zxing:core:2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.ckfinder:ckfinder:2.3" level="project" />
-    <orderEntry type="library" name="Maven: com.ckfinder:ckfinderplugin-fileeditor:2.3" level="project" />
-    <orderEntry type="library" name="Maven: com.ckfinder:ckfinderplugin-imageresize:2.3" level="project" />
-    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.11.1" level="project" />
-    <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
-    <orderEntry type="module" module-name="hzims-biz-common" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.73" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-dict-api:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-user-api:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-system-api:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-tenant:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-api-crypto:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-datascope:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
-  </component>
-</module>

hzims-service/topvision/topvision.iml

@@ -1,319 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-core-boot:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-core-db:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.27" level="project" />
-    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.oracle:ojdbc7:12.2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.postgresql:postgresql:42.2.6" level="project" />
-    <orderEntry type="library" name="Maven: com.microsoft.sqlserver:mssql-jdbc:6.4.0.jre8" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-core-secure:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-auth:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-core-cloud:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-stream:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.37" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-core:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-jmx:5.1.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tuple:1.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.esotericsoftware:kryo-shaded:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-tuple:1.0.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-function-context:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-function-core:2.0.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-okhttp:10.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-hystrix:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
-    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.18" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.13.0" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.18" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.18" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.1.16" level="project" />
-    <orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.3.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.3.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.platform:junit-platform-engine:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:2.23.4" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-cache:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-redis:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-jwt:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.19.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.19.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.19.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.redisson:redisson:3.11.6" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.51.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.51.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.cache:cache-api:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.19.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex.rxjava2:rxjava:2.2.19" level="project" />
-    <orderEntry type="library" name="Maven: de.ruedigermoeller:fst:2.57" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.0" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.16" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.0.13" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-core:5.0.13" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-log:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.1" level="project" />
-    <orderEntry type="library" name="Maven: net.logstash.logback:logstash-logback-encoder:6.2" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.janino:janino:3.0.15" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.janino:commons-compiler:3.0.16" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-mybatis:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-typehandlers-jsr310:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-swagger:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-core-tool:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
-    <orderEntry type="library" name="Maven: io.protostuff:protostuff-core:1.6.0" level="project" />
-    <orderEntry type="library" name="Maven: io.protostuff:protostuff-api:1.6.0" level="project" />
-    <orderEntry type="library" name="Maven: io.protostuff:protostuff-runtime:1.6.0" level="project" />
-    <orderEntry type="library" name="Maven: io.protostuff:protostuff-collectionschema:1.6.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.4" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-oss-all:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-oss-aliyun:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-core-oss:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
-    <orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-json:1.9" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.2" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.3-1" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.8.3" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-xc:1.8.3" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.9" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:3.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20170516" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ram:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-sts:3.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ecs:4.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-oss-minio:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.minio:minio:6.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.http-client:google-http-client-xml:1.20.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.20.0" level="project" />
-    <orderEntry type="library" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.6" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:3.0.1" level="project" />
-    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-oss-qiniu:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.qiniu:qiniu-java-sdk:7.2.23" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-oss-tencent:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.qcloud:cos_api:5.6.8" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.59" level="project" />
-    <orderEntry type="module" module-name="topvision-api" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.59" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.4.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.4.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.4.0" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.21" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.0" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:2.5.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springblade:blade-core-test:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-core-launch:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.20.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.undertow:undertow-core:2.0.30.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.3.8.Final" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.jboss.xnio:xnio-nio:3.3.8.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.undertow:undertow-servlet:2.0.30.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.undertow:undertow-websockets-jsr:2.0.30.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.spec.javax.websocket:jboss-websocket-api_1.1_spec:1.1.4.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish:javax.el:3.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.16" level="project" />
-    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.17.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.4" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springblade:blade-core-auto:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-http:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.5" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:3.14.5" level="project" />
-    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.12.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.generator:mybatis-generator-core:1.3.2" level="project" />
-    <orderEntry type="module" module-name="hzims-biz-common" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.73" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-dict-api:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-user-api:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.16.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-system-api:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-tenant:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-api-crypto:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.1.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springblade:blade-starter-datascope:4.5.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
-  </component>
-</module>