查询企业信息--测试成功

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<OrgNonPublic> getAllEnterpriseBaseInfo(){
-        //查询中转数据库中所有企业基本信息
-        List<OrgNonPublic> enterpriseInfos = enterpriseBaseInfoService.getAllEnterpriseBaseInfo();
+    @ApiOperation(value = "根据本地最新更新时间拉取中间库的企业信息", response = OrgNonPublic.class)
+    @RequestMapping(value = "/getNewEnterpriseInfoByLatestDate", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
+    public List<OrgNonPublic> getNewEnterpriseInfoByLatestDate(@RequestParam("dateStr") String dateStr){
+        //根据之前的最新日期查询中转数据库中所有企业基本信息
+        List<OrgNonPublic> enterpriseInfos = enterpriseBaseInfoService.getAllEnterpriseBaseInfo(dateStr);
 
         return enterpriseInfos;
     }

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 = "创建者")

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<EnterpriseBaseInfo> {
     /**
      * @Author Ivan
-     * @Description 查询所有企业基本信息
+     * @Description 根据之前的最新日期查询中转数据库中所有企业基本信息
      * @Date 2020/7/27 16:01
      * @Param 
      * @return 
      */
-    List<OrgNonPublic> getAllEnterpriseBaseInfo();
+    List<OrgNonPublic> getAllEnterpriseBaseInfo(@Param("dateStr") String dateStr);
 }
\ No newline at end of file

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<OrgNonPublic> getAllEnterpriseBaseInfo();
+    List<OrgNonPublic> getAllEnterpriseBaseInfo(String dateStr);
 }

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<OrgNonPublic> getAllEnterpriseBaseInfo() {
-        return enterpriseBaseInfoMapper.getAllEnterpriseBaseInfo();
+    public List<OrgNonPublic> getAllEnterpriseBaseInfo(String dateStr) {
+        return enterpriseBaseInfoMapper.getAllEnterpriseBaseInfo(dateStr);
     }
 }

src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
 
 spring:
   application:
-    name: cloud-pzhdata-service
+    name: pzhdata-resource-yxf
 
   # 数据库
   datasource:

src/main/resources/mapper/EnterpriseBaseInfoMapper.xml

@@ -39,7 +39,7 @@
     <result column="UNISCID" jdbcType="VARCHAR" property="uniscid" />
   </resultMap>
 
-<!--  查询所有企业基本信息-->
+<!--  根据之前的最新日期查询中转数据库中所有企业基本信息-->
   <select id="getAllEnterpriseBaseInfo"
           resultType="com.hncy.datatrans.server.pzhdata.entity.hnbase.OrgNonPublic">
     select  PRIPID id,
@@ -87,6 +87,6 @@
 --             unitCode,
 --             roomCode,
             REPORTTYPE orgType
-            from `scjdglj_e_baseinfo`
+            from `scjdglj_e_baseinfo` where S_EXT_TIMESTAMP &gt;= #{dateStr}
   </select>
 </mapper>
\ No newline at end of file