From 0d60af04375f52624e33e09b5a0d677346fc8266 Mon Sep 17 00:00:00 2001 From: Ivanyany <754339948@qq.com> Date: Tue, 28 Jul 2020 16:17:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=81=E4=B8=9A=E4=BF=A1?= =?UTF-8?q?=E6=81=AF--=E6=B5=8B=E8=AF=95=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EnterpriseBaseInfoController.java | 12 +++++++----- .../server/pzhdata/entity/hnbase/OrgNonPublic.java | 4 ++++ .../pzhdata/mapper/EnterpriseBaseInfoMapper.java | 5 +++-- .../pzhdata/service/EnterpriseBaseInfoService.java | 4 ++-- .../service/impl/EnterpriseBaseInfoServiceImpl.java | 6 +++--- src/main/resources/application.yml | 2 +- .../resources/mapper/EnterpriseBaseInfoMapper.xml | 4 ++-- 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/controller/EnterpriseBaseInfoController.java b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/EnterpriseBaseInfoController.java index 2f24b64..3d29a96 100644 --- a/src/main/java/com/hncy/datatrans/server/pzhdata/controller/EnterpriseBaseInfoController.java +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/EnterpriseBaseInfoController.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -16,6 +17,7 @@ import java.util.List; * @Date 2020/7/27 15:59 */ @RestController +@RequestMapping("/enterpriseInfo") public class EnterpriseBaseInfoController { @Autowired @@ -28,11 +30,11 @@ public class EnterpriseBaseInfoController { * @Param * @return */ - @ApiOperation(value = "查询所有企业基本信息", response = OrgNonPublic.class) - @RequestMapping(value = "/getAll", method = RequestMethod.POST, produces = "application/json;charset=UTF-8") - public List getAllEnterpriseBaseInfo(){ - //查询中转数据库中所有企业基本信息 - List enterpriseInfos = enterpriseBaseInfoService.getAllEnterpriseBaseInfo(); + @ApiOperation(value = "根据本地最新更新时间拉取中间库的企业信息", response = OrgNonPublic.class) + @RequestMapping(value = "/getNewEnterpriseInfoByLatestDate", method = RequestMethod.POST, produces = "application/json;charset=UTF-8") + public List getNewEnterpriseInfoByLatestDate(@RequestParam("dateStr") String dateStr){ + //根据之前的最新日期查询中转数据库中所有企业基本信息 + List enterpriseInfos = enterpriseBaseInfoService.getAllEnterpriseBaseInfo(dateStr); return enterpriseInfos; } diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgNonPublic.java b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgNonPublic.java index 49cfcc6..ea10374 100644 --- a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgNonPublic.java +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgNonPublic.java @@ -114,9 +114,13 @@ public class OrgNonPublic { private Integer deleted; @ApiModelProperty(value = "创建时间") + @DateTimeFormat(pattern = "yyy-MM-dd") + @JsonFormat(pattern = "yyy-MM-dd") private Date createDate; @ApiModelProperty(value = "修改时间") + @DateTimeFormat(pattern = "yyy-MM-dd") + @JsonFormat(pattern = "yyy-MM-dd") private Date updateDate; @ApiModelProperty(value = "创建者") diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/EnterpriseBaseInfoMapper.java b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/EnterpriseBaseInfoMapper.java index 9d6ed09..e9cc4de 100644 --- a/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/EnterpriseBaseInfoMapper.java +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/EnterpriseBaseInfoMapper.java @@ -2,6 +2,7 @@ package com.hncy.datatrans.server.pzhdata.mapper; import com.hncy.datatrans.server.pzhdata.entity.EnterpriseBaseInfo; import com.hncy.datatrans.server.pzhdata.entity.hnbase.OrgNonPublic; +import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; import java.util.List; @@ -16,10 +17,10 @@ import java.util.List; public interface EnterpriseBaseInfoMapper extends Mapper { /** * @Author Ivan - * @Description 查询所有企业基本信息 + * @Description 根据之前的最新日期查询中转数据库中所有企业基本信息 * @Date 2020/7/27 16:01 * @Param * @return */ - List getAllEnterpriseBaseInfo(); + List getAllEnterpriseBaseInfo(@Param("dateStr") String dateStr); } \ No newline at end of file diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/EnterpriseBaseInfoService.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/EnterpriseBaseInfoService.java index d1cbbcc..e413dd2 100644 --- a/src/main/java/com/hncy/datatrans/server/pzhdata/service/EnterpriseBaseInfoService.java +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/EnterpriseBaseInfoService.java @@ -13,10 +13,10 @@ public interface EnterpriseBaseInfoService { /** * @Author Ivan - * @Description 查询所有企业基本信息 + * @Description 根据之前的最新日期查询中转数据库中所有企业基本信息 * @Date 2020/7/27 16:01 * @Param * @return */ - List getAllEnterpriseBaseInfo(); + List getAllEnterpriseBaseInfo(String dateStr); } diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/EnterpriseBaseInfoServiceImpl.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/EnterpriseBaseInfoServiceImpl.java index 96f784c..2259c3e 100644 --- a/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/EnterpriseBaseInfoServiceImpl.java +++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/EnterpriseBaseInfoServiceImpl.java @@ -20,13 +20,13 @@ public class EnterpriseBaseInfoServiceImpl implements EnterpriseBaseInfoService EnterpriseBaseInfoMapper enterpriseBaseInfoMapper; /** * @Author Ivan - * @Description 查询所有企业基本信息 + * @Description 根据之前的最新日期查询中转数据库中所有企业基本信息 * @Date 2020/7/27 16:01 * @Param * @return */ @Override - public List getAllEnterpriseBaseInfo() { - return enterpriseBaseInfoMapper.getAllEnterpriseBaseInfo(); + public List getAllEnterpriseBaseInfo(String dateStr) { + return enterpriseBaseInfoMapper.getAllEnterpriseBaseInfo(dateStr); } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e3c4b0b..a0245a9 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: application: - name: cloud-pzhdata-service + name: pzhdata-resource-yxf # 数据库 datasource: diff --git a/src/main/resources/mapper/EnterpriseBaseInfoMapper.xml b/src/main/resources/mapper/EnterpriseBaseInfoMapper.xml index bd2c3f7..f77d076 100644 --- a/src/main/resources/mapper/EnterpriseBaseInfoMapper.xml +++ b/src/main/resources/mapper/EnterpriseBaseInfoMapper.xml @@ -39,7 +39,7 @@ - + \ No newline at end of file -- GitLab