fix-core-新增日期格式化 (#29)

muyun-boot/src/test/java/net/ximatai/muyun/test/leo/TestCR.java

@@ -0,0 +1,82 @@
+package net.ximatai.muyun.test.leo;
+
+import io.quarkus.runtime.Startup;
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.vertx.core.json.JsonObject;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Path;
+import net.ximatai.muyun.ability.ITableCreateAbility;
+import net.ximatai.muyun.ability.curd.std.ICURDAbility;
+import net.ximatai.muyun.core.Scaffold;
+import net.ximatai.muyun.database.builder.Column;
+import net.ximatai.muyun.database.builder.TableWrapper;
+import net.ximatai.muyun.test.testcontainers.PostgresTestResource;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static io.restassured.RestAssured.given;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@QuarkusTest
+@QuarkusTestResource(value = PostgresTestResource.class, restrictToAnnotatedClass = true)
+class TestCR {
+
+    @Inject
+    TestCRController testController;
+
+    @Test
+    void testCreate() {
+        String id = testController.create(Map.of(
+            "d_test", "1988-01-01",
+            "t_test2", "2001-01-01"
+        ));
+
+        Map<String, ?> map = testController.view(id);
+
+        assertEquals("1988-01-01", map.get("d_test").toString());
+        assertEquals("2001-01-01 00:00:00.0", map.get("t_test2").toString());
+
+        String string = given()
+            .get("/TestCRController/view/" + id)
+            .then()
+            .extract()
+            .asString();
+
+        JsonObject entries = new JsonObject(string);
+        String dataInJson = entries.getString("d_test");
+        String dataInJson2 = entries.getString("t_test2");
+
+        assertEquals("1988-01-01", dataInJson);
+        assertEquals("2001-01-01 00:00:00", dataInJson2);
+
+    }
+
+
+}
+
+
+@Startup
+@Path("/TestCRController")
+class TestCRController extends Scaffold implements ICURDAbility, ITableCreateAbility {
+
+    @Override
+    public String getSchemaName() {
+        return "test";
+    }
+
+    @Override
+    public String getMainTable() {
+        return "test_table";
+    }
+
+    @Override
+    public void fitOut(TableWrapper wrapper) {
+        wrapper
+            .setPrimaryKey(Column.ID_POSTGRES)
+            .addColumn(Column.of("d_test"))
+            .addColumn(Column.of("t_test2"));
+
+    }
+}

muyun-core/src/main/java/net/ximatai/muyun/core/ObjectMapperConfig.java

@@ -33,6 +33,7 @@ public ObjectMapper objectMapper() {
 class CustomDateSerializer extends StdSerializer<Date> {
 
     private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    private static final SimpleDateFormat CALENDAR_FORMAT = new SimpleDateFormat("yyyy-MM-dd");
 
 //    static {
 //        DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("GMT+8")); // 设置时区
@@ -48,7 +49,12 @@ public CustomDateSerializer(Class<Date> t) {
 
     @Override
     public void serialize(Date value, JsonGenerator gen, SerializerProvider provider) throws IOException {
-        String formattedDate = DATE_FORMAT.format(value);
+        String formattedDate = "";
+        if(value instanceof java.sql.Date) {
+            formattedDate = CALENDAR_FORMAT.format(value);
+        } else {
+            formattedDate = DATE_FORMAT.format(value);
+        }
         gen.writeString(formattedDate);
     }
 }