大屏 去掉 侨城汇的数据请求 & json deserializer fix

pom.xml

@@ -12,7 +12,7 @@
     </parent>
 
     <groupId>cn.superdesk.uniorder</groupId>
-    <artifactId>superdesk-operation-center</artifactId>
+    <artifactId>superdesk-operation-center-dubbo</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 

superdesk-uniorder-common-json/pom.xml

@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>cn.superdesk.uniorder</groupId>
-        <artifactId>superdesk-operation-center</artifactId>
+        <artifactId>superdesk-operation-center-dubbo</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 

superdesk-uniorder-common-json/src/main/java/cn/superdesk/uniorder/common/json/deserializer/BigDecimalScale2ConvertDeserializer.java

@@ -3,6 +3,7 @@ package cn.superdesk.uniorder.common.json.deserializer;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -18,6 +19,7 @@ import java.util.Objects;
  * @UpdateRemark: 修改内容
  * @Version: 1.0
  */
+@Slf4j
 public class BigDecimalScale2ConvertDeserializer extends JsonDeserializer<BigDecimal> {
 
 	/**
@@ -30,14 +32,19 @@ public class BigDecimalScale2ConvertDeserializer extends JsonDeserializer<BigDec
 	 */
 	@Override
 	public BigDecimal deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
-
-		if (Objects.isNull(jsonParser.getDecimalValue())) {
+		String text = jsonParser.getText();
+		if (Objects.isNull(text) || text.trim().isEmpty()) {
 //			return null;
 			return BigDecimal.ZERO;
 		} else {
 			// 这里取floor
-			return jsonParser.getDecimalValue().setScale(2, RoundingMode.FLOOR);
-		}
+            try {
+				return new BigDecimal(text).setScale(2, RoundingMode.FLOOR);
+            } catch (Exception e) {
+				log.info("decimal数据格式转换异常，text: {}", text);
+				throw new RuntimeException("decimal数据格式转换异常");
+            }
+        }
 	}
 
 }

superdesk-uniorder-common-mq-kafka/pom.xml

@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>cn.superdesk.uniorder</groupId>
-        <artifactId>superdesk-operation-center</artifactId>
+        <artifactId>superdesk-operation-center-dubbo</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 

superdesk-uniorder-common-mq-redis/pom.xml

@@ -5,7 +5,7 @@
 
     <parent>
         <groupId>cn.superdesk.uniorder</groupId>
-        <artifactId>superdesk-operation-center</artifactId>
+        <artifactId>superdesk-operation-center-dubbo</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 

superdesk-uniorder-common-queue/pom.xml

@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>cn.superdesk.uniorder</groupId>
-        <artifactId>superdesk-operation-center</artifactId>
+        <artifactId>superdesk-operation-center-dubbo</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 

superdesk-uniorder-common-xml/pom.xml

@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>cn.superdesk.uniorder</groupId>
-        <artifactId>superdesk-operation-center</artifactId>
+        <artifactId>superdesk-operation-center-dubbo</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 

superdesk-uniorder-common/pom.xml

@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>cn.superdesk.uniorder</groupId>
-        <artifactId>superdesk-operation-center</artifactId>
+        <artifactId>superdesk-operation-center-dubbo</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 

superdesk-uniorder-dao/pom.xml

@@ -6,7 +6,7 @@
 
 	<parent>
 		<groupId>cn.superdesk.uniorder</groupId>
-		<artifactId>superdesk-operation-center</artifactId>
+		<artifactId>superdesk-operation-center-dubbo</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 

superdesk-uniorder-dto/pom.xml

@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>cn.superdesk.uniorder</groupId>
-        <artifactId>superdesk-operation-center</artifactId>
+        <artifactId>superdesk-operation-center-dubbo</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 

superdesk-uniorder-dubbo-consumer/pom.xml

@@ -5,7 +5,7 @@
 
     <parent>
         <groupId>cn.superdesk.uniorder</groupId>
-        <artifactId>superdesk-operation-center</artifactId>
+        <artifactId>superdesk-operation-center-dubbo</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 

superdesk-uniorder-dubbo-facade/pom.xml

@@ -5,7 +5,7 @@
 
     <parent>
         <groupId>cn.superdesk.uniorder</groupId>
-        <artifactId>superdesk-operation-center</artifactId>
+        <artifactId>superdesk-operation-center-dubbo</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 

superdesk-uniorder-dubbo-provider/pom.xml

@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>cn.superdesk.uniorder</groupId>
-        <artifactId>superdesk-operation-center</artifactId>
+        <artifactId>superdesk-operation-center-dubbo</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 

superdesk-uniorder-executor/pom.xml

@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>cn.superdesk.uniorder</groupId>
-        <artifactId>superdesk-operation-center</artifactId>
+        <artifactId>superdesk-operation-center-dubbo</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 

superdesk-uniorder-openapi/pom.xml

@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>cn.superdesk.uniorder</groupId>
-        <artifactId>superdesk-operation-center</artifactId>
+        <artifactId>superdesk-operation-center-dubbo</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 

superdesk-uniorder-openapicall-thirdpart-szhtxx-electronicInvoice-dto/pom.xml

@@ -5,7 +5,7 @@
 
     <parent>
         <groupId>cn.superdesk.uniorder</groupId>
-        <artifactId>superdesk-operation-center</artifactId>
+        <artifactId>superdesk-operation-center-dubbo</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 

superdesk-uniorder-openapicall-thirdpart-szhtxx-paperInvoice-dto/pom.xml

@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>cn.superdesk.uniorder</groupId>
-        <artifactId>superdesk-operation-center</artifactId>
+        <artifactId>superdesk-operation-center-dubbo</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 

superdesk-uniorder-openapicall/pom.xml

@@ -5,7 +5,7 @@
 
     <parent>
         <groupId>cn.superdesk.uniorder</groupId>
-        <artifactId>superdesk-operation-center</artifactId>
+        <artifactId>superdesk-operation-center-dubbo</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 

superdesk-uniorder-service/pom.xml

@@ -5,7 +5,7 @@
 
     <parent>
         <groupId>cn.superdesk.uniorder</groupId>
-        <artifactId>superdesk-operation-center</artifactId>
+        <artifactId>superdesk-operation-center-dubbo</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/_dashboard/impl/TvDashboardServiceImpl.java

@@ -97,19 +97,19 @@ public class TvDashboardServiceImpl implements TvDashboardService {
 
 		if (ObjectUtil.isNotNull(queryCriteria.getSpecialHandleCallOct()) && queryCriteria.getSpecialHandleCallOct().compareTo(SPECIAL_HANDLE_CALL_OCT) == 0) {
 
-			R<TvHeadDataVo> octResponse = octlifeUniOrderCallApiService.dashboardTvGetHeadDataOct("", queryCriteria);
-
-			if (ObjectUtil.isNotNull(octResponse)) {
-
-				octDate = octResponse.getData();
-
-				log.info("octDate response date \n{}", AnJsonUtils.toJson(octDate));
-
-				if (ObjectUtil.isNotNull(octDate)) {
-					countDateList.add(octDate);
-					responseDate.setOctTvHeadDataVo(octDate);
-				}
-			}
+			// R<TvHeadDataVo> octResponse = octlifeUniOrderCallApiService.dashboardTvGetHeadDataOct("", queryCriteria);
+			//
+			// if (ObjectUtil.isNotNull(octResponse)) {
+			//
+			// 	octDate = octResponse.getData();
+			//
+			// 	log.info("octDate response date \n{}", AnJsonUtils.toJson(octDate));
+			//
+			// 	if (ObjectUtil.isNotNull(octDate)) {
+			// 		countDateList.add(octDate);
+					responseDate.setOctTvHeadDataVo(new TvHeadDataVo());
+				// }
+			// }
 
 		}
 

superdesk-uniorder-web/pom.xml

@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>cn.superdesk.uniorder</groupId>
-        <artifactId>superdesk-operation-center</artifactId>
+        <artifactId>superdesk-operation-center-dubbo</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 

superdesk-uniorder-xxl-job-admin/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>cn.superdesk.uniorder</groupId>
-        <artifactId>superdesk-operation-center</artifactId>
+        <artifactId>superdesk-operation-center-dubbo</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>