'提交'

src/main/java/com/steerinfo/config/fastJsonConfig.java

@@ -0,0 +1,48 @@
+package com.steerinfo.config;
+
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+
+@Configuration
+public class fastJsonConfig extends WebMvcConfigurationSupport {
+
+    /**
+     * 使用阿里 fastjson 作为JSON MessageConverter
+     * @param converters
+     */
+    @Override
+    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+        FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
+        FastJsonConfig config = new FastJsonConfig();
+        config.setSerializerFeatures(
+                // 保留map空的字段
+                SerializerFeature.WriteMapNullValue,
+                // 将String类型的null转成""
+                SerializerFeature.WriteNullStringAsEmpty,
+                // 将Number类型的null转成0
+                SerializerFeature.WriteNullNumberAsZero,
+                // 将List类型的null转成[]
+                SerializerFeature.WriteNullListAsEmpty,
+                // 将Boolean类型的null转成false
+                SerializerFeature.WriteNullBooleanAsFalse,
+                // 避免循环引用
+                SerializerFeature.DisableCircularReferenceDetect);
+
+        converter.setFastJsonConfig(config);
+        converter.setDefaultCharset(Charset.forName("UTF-8"));
+        List<MediaType> mediaTypeList = new ArrayList<>();
+        // 解决中文乱码问题，相当于在Controller上的@RequestMapping中加了个属性produces = "application/json"
+        mediaTypeList.add(MediaType.APPLICATION_JSON);
+        converter.setSupportedMediaTypes(mediaTypeList);
+        converters.add(converter);
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkdatacount/service/impl/MeterWorkDataCountServiceImpl.java

@@ -962,6 +962,12 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
         List<HashMap> mapList = new ArrayList<>();
         if(spotModels.size() >= 1) {
             for(MeterBaseSpotInfo spotModel: spotModels) {
+                if(!("1#公路汽车衡北秤".equals(spotModel.getBaseSpotName())
+                        ||"1#公路汽车衡南秤".equals(spotModel.getBaseSpotName())
+                        ||"200万料场汽车衡".equals(spotModel.getBaseSpotName())
+                        ||"废钢汽车衡".equals(spotModel.getBaseSpotName()))){//限制
+                    continue;
+                }
                 long countFirst = 0L;
                 long countIdentifyYes = 0L;
                 double countIdentifyRate = 0.0;
@@ -1274,4 +1280,4 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
         PageList pageInfo = new PageList(rows);
         return pageInfo;
     }
-}
+}

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -9129,6 +9129,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(new Date());
                         actualRow.setNetMode(DbConstants.TYPE);
                         actualRow.setNote("标识皮匹配委托结净更新");
+                        actualRow.setMemo("标识皮结净");
                         actualRow.setNetMode("2");
                         actualRow.setUploadFlag("1");
                         actualRow.setIsPreSacale("1");
@@ -9201,6 +9202,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(new Date());
                         actualRow.setNetMode(DbConstants.TYPE);
                         actualRow.setNote("标识皮无委托结净更新");
+                        actualRow.setMemo("标识皮结净");
                         actualRow.setNetMode("2");
                         actualRow.setUploadFlag("1");
                         actualRow.setIsPreSacale("0");