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 2f24b64a77b2c8762a2dc4f3dcf78ef555afee19..3d29a966916b9a3efbec4d7165472bec2188b95b 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 49cfcc64839c828996a36026e15ff30130c83172..ea1037496ceb8203f066fe1b1783858360974bc2 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 9d6ed09f2c6b249d960f633d3100a648e4e91016..e9cc4de7402bfdccb3cd19e24a8afe2092fcc9ab 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 d1cbbccb20c4f8846c7ea01ede5c0b92f7de47b4..e413dd27c5133f2e04b4345d2106028e2441de68 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 96f784c113e5f2540ad24720805660ab4809b21c..2259c3e1e0a249bdfe32d528d45aa54312766354 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 e3c4b0b607ffdff5882fe64c353a0add629af7f3..a0245a9507b30165bfc3da5c4e0ad829d1425a65 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 bd2c3f7224470fc7473a5bbb468d84cf6b560086..f77d076b316681f026f75979551592b311b622d7 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