Merge branch 'developer' into 'master'

观云台小程序

See merge request !23

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/GoDownComponent.java

@@ -215,18 +215,4 @@ public class GoDownComponent {
         }
         return page;
     }
-
-    public static void main(String[] args){
-        List<ClerkDTO> list = new ArrayList<>();
-        ClerkDTO clerkDTO = new ClerkDTO();
-        clerkDTO.setClerkId(1);
-        ClerkDTO clerkDTO1 = new ClerkDTO();
-        clerkDTO1.setClerkId(2);
-        list.add(clerkDTO);
-        list.add(clerkDTO1);
-        List<Integer> collect = list.stream().map(clerkDTO2 -> {
-            return clerkDTO2.getClerkId();
-        }).collect(Collectors.toList());
-        System.out.println(JSON.toJSONString(collect));
-    }
 }

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/utils/BigDecimalConvertUtils.java

@@ -3,6 +3,7 @@ package com.gic.cloud.web.utils;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.stereotype.Component;
@@ -23,6 +24,8 @@ public class BigDecimalConvertUtils {
         SimpleModule simpleModule = new SimpleModule();
         simpleModule.addSerializer(BigDecimal.class, new BigDecimalJsonSeralizer());
         simpleModule.addSerializer(String.class, new StringJsonSeralizer());
+        simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
+        simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
         //simpleModule.addSerializer(String.class, new StringJsonSeralizer());
         objectMapper.registerModule(simpleModule);
         jackson2HttpMessageConverter.setObjectMapper(objectMapper);