From e6711705297625d7712a42e702cd75e347c52bf2 Mon Sep 17 00:00:00 2001
From: Ivanyany <754339948@qq.com>
Date: Tue, 25 Aug 2020 10:52:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E5=9B=A2=E4=BD=93=E3=80=81?=
=?UTF-8?q?=E9=82=AE=E6=94=BF=E5=AF=84=E9=80=92=E6=95=B0=E6=8D=AE=E5=AF=BC?=
=?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../EnterpriseBaseInfoController.java | 2 +-
.../controller/HomeStayController.java | 2 +-
.../controller/OrgShorgController.java | 40 ++++++++++
.../PublicSecurityLogisticsController.java | 5 +-
.../pzhdata/entity/{hnbase => }/HomeStay.java | 2 +-
.../entity/{hnbase => }/OrgNonPublic.java | 7 +-
.../pzhdata/entity/{hnbase => }/OrgShorg.java | 10 ++-
.../{hnbase => }/PublicSecurityLogistics.java | 2 +-
.../mapper/EnterpriseBaseInfoMapper.java | 2 +-
.../server/pzhdata/mapper/HomeStayMapper.java | 2 +-
.../server/pzhdata/mapper/OrgShorgMapper.java | 20 +++++
.../mapper/PublicSecurityLogisticsMapper.java | 5 +-
.../service/EnterpriseBaseInfoService.java | 2 +-
.../pzhdata/service/HomeStayService.java | 2 +-
.../pzhdata/service/OrgShorgService.java | 15 ++++
.../PublicSecurityLogisticsService.java | 2 +-
.../impl/EnterpriseBaseInfoServiceImpl.java | 2 +-
.../service/impl/HomeStayServiceImpl.java | 2 +-
.../service/impl/OrgShorgServiceImpl.java | 42 +++++++++++
.../PublicSecurityLogisticsServiceImpl.java | 2 +-
.../mapper/EnterpriseBaseInfoMapper.xml | 2 +-
src/main/resources/mapper/HomeStayMapper.xml | 4 +-
src/main/resources/mapper/OrgShorgMapper.xml | 73 +++++++++++++++++++
.../mapper/PublicSecurityLogisticsMapper.xml | 14 ++--
24 files changed, 225 insertions(+), 36 deletions(-)
create mode 100644 src/main/java/com/hncy/datatrans/server/pzhdata/controller/OrgShorgController.java
rename src/main/java/com/hncy/datatrans/server/pzhdata/entity/{hnbase => }/HomeStay.java (98%)
rename src/main/java/com/hncy/datatrans/server/pzhdata/entity/{hnbase => }/OrgNonPublic.java (94%)
rename src/main/java/com/hncy/datatrans/server/pzhdata/entity/{hnbase => }/OrgShorg.java (94%)
rename src/main/java/com/hncy/datatrans/server/pzhdata/entity/{hnbase => }/PublicSecurityLogistics.java (98%)
create mode 100644 src/main/java/com/hncy/datatrans/server/pzhdata/mapper/OrgShorgMapper.java
create mode 100644 src/main/java/com/hncy/datatrans/server/pzhdata/service/OrgShorgService.java
create mode 100644 src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/OrgShorgServiceImpl.java
create mode 100644 src/main/resources/mapper/OrgShorgMapper.xml
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 b178ed7..f3d1b34 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
@@ -1,6 +1,6 @@
package com.hncy.datatrans.server.pzhdata.controller;
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.OrgNonPublic;
+import com.hncy.datatrans.server.pzhdata.entity.OrgNonPublic;
import com.hncy.datatrans.server.pzhdata.service.EnterpriseBaseInfoService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/controller/HomeStayController.java b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/HomeStayController.java
index 14d9f80..908b672 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/controller/HomeStayController.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/HomeStayController.java
@@ -1,6 +1,6 @@
package com.hncy.datatrans.server.pzhdata.controller;
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.HomeStay;
+import com.hncy.datatrans.server.pzhdata.entity.HomeStay;
import com.hncy.datatrans.server.pzhdata.service.HomeStayService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/controller/OrgShorgController.java b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/OrgShorgController.java
new file mode 100644
index 0000000..12595aa
--- /dev/null
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/OrgShorgController.java
@@ -0,0 +1,40 @@
+package com.hncy.datatrans.server.pzhdata.controller;
+
+import com.hncy.datatrans.server.pzhdata.entity.OrgShorg;
+import com.hncy.datatrans.server.pzhdata.service.OrgShorgService;
+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;
+
+/**
+ * @Author Ivan
+ * @Description controller
+ * @Date 2020/8/19 15:46
+ */
+@RestController
+@RequestMapping("/middleBaseData")
+public class OrgShorgController {
+
+ @Autowired
+ OrgShorgService orgShorgService;
+
+ /**
+ * @Author Ivan
+ * @Description 根据本地最新更新时间拉取中间库的社会组织信息
+ * @Date 2020/8/19 15:48
+ * @Param
+ * @return
+ */
+ @ApiOperation(value = "根据本地最新更新时间拉取中间库的社会组织信息", response = OrgShorg.class)
+ @RequestMapping(value = "/getNewOrgShorgByLatestDate", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
+ public List<OrgShorg> getNewOrgShorgByLatestDate(@RequestParam(value = "dateStr",required = false) String dateStr){
+ //根据本地最新更新时间拉取中间库的社会组织信息
+ List<OrgShorg> newOrgShorgByLatestDate = orgShorgService.getNewOrgShorgByLatestDate(dateStr);
+ return newOrgShorgByLatestDate;
+ }
+}
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/controller/PublicSecurityLogisticsController.java b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/PublicSecurityLogisticsController.java
index ec0bdb7..d72b2b3 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/controller/PublicSecurityLogisticsController.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/PublicSecurityLogisticsController.java
@@ -1,7 +1,6 @@
package com.hncy.datatrans.server.pzhdata.controller;
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.HomeStay;
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.PublicSecurityLogistics;
+import com.hncy.datatrans.server.pzhdata.entity.PublicSecurityLogistics;
import com.hncy.datatrans.server.pzhdata.service.PublicSecurityLogisticsService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +30,7 @@ public class PublicSecurityLogisticsController {
* @Param
* @return
*/
- @ApiOperation(value = "根据本地最新更新时间拉取中间库的邮政的寄递物流信息信息", response = HomeStay.class)
+ @ApiOperation(value = "根据本地最新更新时间拉取中间库的邮政的寄递物流信息信息", response = PublicSecurityLogistics.class)
@RequestMapping(value = "/getNewPublicSecurityLogisticsByLatestDate", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
public List<PublicSecurityLogistics> getNewPublicSecurityLogisticsByLatestDate(@RequestParam(value = "dateStr",required = false) String dateStr){
//根据本地最新更新时间拉取中间库的养老机构及公寓信息
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/HomeStay.java b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/HomeStay.java
similarity index 98%
rename from src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/HomeStay.java
rename to src/main/java/com/hncy/datatrans/server/pzhdata/entity/HomeStay.java
index 18da01f..d6ef432 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/HomeStay.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/HomeStay.java
@@ -1,4 +1,4 @@
-package com.hncy.datatrans.server.pzhdata.entity.hnbase;
+package com.hncy.datatrans.server.pzhdata.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
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/OrgNonPublic.java
similarity index 94%
rename from src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgNonPublic.java
rename to src/main/java/com/hncy/datatrans/server/pzhdata/entity/OrgNonPublic.java
index ea10374..a0e6661 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgNonPublic.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/OrgNonPublic.java
@@ -1,9 +1,8 @@
-package com.hncy.datatrans.server.pzhdata.entity.hnbase;
+package com.hncy.datatrans.server.pzhdata.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -34,7 +33,6 @@ public class OrgNonPublic {
private String frName;
@ApiModelProperty(value = "批准日期")
- @DateTimeFormat(pattern = "yyy-MM-dd")
@JsonFormat(pattern = "yyy-MM-dd")
private Date pzDate;
@@ -114,12 +112,11 @@ 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")
+// @DateTimeFormat(pattern = "yyy-MM-dd")
@JsonFormat(pattern = "yyy-MM-dd")
private Date updateDate;
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgShorg.java b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/OrgShorg.java
similarity index 94%
rename from src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgShorg.java
rename to src/main/java/com/hncy/datatrans/server/pzhdata/entity/OrgShorg.java
index 0aa2d54..54a36dc 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgShorg.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/OrgShorg.java
@@ -1,9 +1,8 @@
-package com.hncy.datatrans.server.pzhdata.entity.hnbase;
+package com.hncy.datatrans.server.pzhdata.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -37,9 +36,8 @@ public class OrgShorg {
private String frAddress;
@ApiModelProperty(value = "批准日期")
- @DateTimeFormat(pattern = "yyy-MM-dd")
- @JsonFormat(pattern = "yyy-MM-dd")
private Date pzDate;
+ private String pzDateStr;
@ApiModelProperty(value = "社会组织类型")
private String shorgType;
@@ -114,9 +112,13 @@ public class OrgShorg {
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/entity/hnbase/PublicSecurityLogistics.java b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/PublicSecurityLogistics.java
similarity index 98%
rename from src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/PublicSecurityLogistics.java
rename to src/main/java/com/hncy/datatrans/server/pzhdata/entity/PublicSecurityLogistics.java
index b5250e0..8c2db45 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/PublicSecurityLogistics.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/PublicSecurityLogistics.java
@@ -1,4 +1,4 @@
-package com.hncy.datatrans.server.pzhdata.entity.hnbase;
+package com.hncy.datatrans.server.pzhdata.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
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 b3f9bc7..5d8b92a 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
@@ -1,7 +1,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 com.hncy.datatrans.server.pzhdata.entity.OrgNonPublic;
import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper;
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/HomeStayMapper.java b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/HomeStayMapper.java
index 7a689e7..d44055a 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/HomeStayMapper.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/HomeStayMapper.java
@@ -1,6 +1,6 @@
package com.hncy.datatrans.server.pzhdata.mapper;
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.HomeStay;
+import com.hncy.datatrans.server.pzhdata.entity.HomeStay;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/OrgShorgMapper.java b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/OrgShorgMapper.java
new file mode 100644
index 0000000..9567ea5
--- /dev/null
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/OrgShorgMapper.java
@@ -0,0 +1,20 @@
+package com.hncy.datatrans.server.pzhdata.mapper;
+
+import com.hncy.datatrans.server.pzhdata.entity.OrgShorg;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author Ivan
+ * @Description 社会组织信息mapper
+ * @Date 2020/8/19 15:45
+ */
+public interface OrgShorgMapper {
+
+ //根据本地最新更新时间拉取中间库的民办非企业单位信息
+ List<OrgShorg> getNewNonEnterpriseByLatestDate(@Param("dateStr") String dateStr);
+
+ //根据本地最新更新时间拉取中间库的市民政局_社会团体信息2001年至2018年
+ List<OrgShorg> getNewSocialGroupsByLatestDate(@Param("dateStr") String dateStr);
+}
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/PublicSecurityLogisticsMapper.java b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/PublicSecurityLogisticsMapper.java
index c9bbef4..cf7efaf 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/PublicSecurityLogisticsMapper.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/PublicSecurityLogisticsMapper.java
@@ -1,6 +1,7 @@
package com.hncy.datatrans.server.pzhdata.mapper;
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.PublicSecurityLogistics;
+import com.hncy.datatrans.server.pzhdata.entity.PublicSecurityLogistics;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -11,5 +12,5 @@ import java.util.List;
*/
public interface PublicSecurityLogisticsMapper {
//根据本地最新更新时间拉取中间库的邮政的寄递物流信息信息
- List<PublicSecurityLogistics> getNewPublicSecurityLogisticsByLatestDate(String dateStr);
+ List<PublicSecurityLogistics> getNewPublicSecurityLogisticsByLatestDate(@Param("dateStr") String dateStr);
}
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 399fd35..c40ea49 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
@@ -1,6 +1,6 @@
package com.hncy.datatrans.server.pzhdata.service;
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.OrgNonPublic;
+import com.hncy.datatrans.server.pzhdata.entity.OrgNonPublic;
import java.util.List;
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/HomeStayService.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/HomeStayService.java
index 9f264c6..1eb4ccc 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/service/HomeStayService.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/HomeStayService.java
@@ -1,6 +1,6 @@
package com.hncy.datatrans.server.pzhdata.service;
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.HomeStay;
+import com.hncy.datatrans.server.pzhdata.entity.HomeStay;
import java.util.List;
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/OrgShorgService.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/OrgShorgService.java
new file mode 100644
index 0000000..16cae46
--- /dev/null
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/OrgShorgService.java
@@ -0,0 +1,15 @@
+package com.hncy.datatrans.server.pzhdata.service;
+
+import com.hncy.datatrans.server.pzhdata.entity.OrgShorg;
+
+import java.util.List;
+
+/**
+ * @Author Ivan
+ * @Description 社会组织信息service
+ * @Date 2020/8/19 15:46
+ */
+public interface OrgShorgService {
+ //根据本地最新更新时间拉取中间库的社会组织信息
+ List<OrgShorg> getNewOrgShorgByLatestDate(String dateStr);
+}
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/PublicSecurityLogisticsService.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/PublicSecurityLogisticsService.java
index 9c32339..8307024 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/service/PublicSecurityLogisticsService.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/PublicSecurityLogisticsService.java
@@ -1,6 +1,6 @@
package com.hncy.datatrans.server.pzhdata.service;
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.PublicSecurityLogistics;
+import com.hncy.datatrans.server.pzhdata.entity.PublicSecurityLogistics;
import java.util.List;
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 1f77c9b..409740f 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
@@ -1,6 +1,6 @@
package com.hncy.datatrans.server.pzhdata.service.impl;
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.OrgNonPublic;
+import com.hncy.datatrans.server.pzhdata.entity.OrgNonPublic;
import com.hncy.datatrans.server.pzhdata.mapper.EnterpriseBaseInfoMapper;
import com.hncy.datatrans.server.pzhdata.service.EnterpriseBaseInfoService;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/HomeStayServiceImpl.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/HomeStayServiceImpl.java
index 20acb0f..8b753f4 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/HomeStayServiceImpl.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/HomeStayServiceImpl.java
@@ -1,6 +1,6 @@
package com.hncy.datatrans.server.pzhdata.service.impl;
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.HomeStay;
+import com.hncy.datatrans.server.pzhdata.entity.HomeStay;
import com.hncy.datatrans.server.pzhdata.mapper.HomeStayMapper;
import com.hncy.datatrans.server.pzhdata.service.HomeStayService;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/OrgShorgServiceImpl.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/OrgShorgServiceImpl.java
new file mode 100644
index 0000000..0724b63
--- /dev/null
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/OrgShorgServiceImpl.java
@@ -0,0 +1,42 @@
+package com.hncy.datatrans.server.pzhdata.service.impl;
+
+import com.hncy.datatrans.server.pzhdata.entity.OrgShorg;
+import com.hncy.datatrans.server.pzhdata.mapper.OrgShorgMapper;
+import com.hncy.datatrans.server.pzhdata.service.OrgShorgService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author Ivan
+ * @Description 社会组织信息service实现类
+ * @Date 2020/8/19 15:46
+ */
+@Service
+public class OrgShorgServiceImpl implements OrgShorgService {
+
+ @Autowired
+ OrgShorgMapper orgShorgMapper;
+
+ /**
+ * @Author Ivan
+ * @Description 根据本地最新更新时间拉取中间库的社会组织信息
+ * @Date 2020/8/19 15:50
+ * @Param
+ * @return
+ */
+ @Override
+ public List<OrgShorg> getNewOrgShorgByLatestDate(String dateStr) {
+ List<OrgShorg> orgShorgs = new ArrayList<>();
+ //根据本地最新更新时间拉取中间库的民办非企业单位信息 mzj_pzhsmbfqydwxx
+ List<OrgShorg> org1 = orgShorgMapper.getNewNonEnterpriseByLatestDate(dateStr);
+ //根据本地最新更新时间拉取中间库的市民政局_社会团体信息2001年至2018年 mzj_pzhsshttxx
+ List<OrgShorg> org2 = orgShorgMapper.getNewSocialGroupsByLatestDate(dateStr);
+
+ orgShorgs.addAll(org1);
+ orgShorgs.addAll(org2);
+ return orgShorgs;
+ }
+}
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/PublicSecurityLogisticsServiceImpl.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/PublicSecurityLogisticsServiceImpl.java
index fab6bf9..e08e005 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/PublicSecurityLogisticsServiceImpl.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/PublicSecurityLogisticsServiceImpl.java
@@ -1,6 +1,6 @@
package com.hncy.datatrans.server.pzhdata.service.impl;
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.PublicSecurityLogistics;
+import com.hncy.datatrans.server.pzhdata.entity.PublicSecurityLogistics;
import com.hncy.datatrans.server.pzhdata.mapper.PublicSecurityLogisticsMapper;
import com.hncy.datatrans.server.pzhdata.service.PublicSecurityLogisticsService;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/resources/mapper/EnterpriseBaseInfoMapper.xml b/src/main/resources/mapper/EnterpriseBaseInfoMapper.xml
index 3e22a57..9a6bec8 100644
--- a/src/main/resources/mapper/EnterpriseBaseInfoMapper.xml
+++ b/src/main/resources/mapper/EnterpriseBaseInfoMapper.xml
@@ -41,7 +41,7 @@
<!-- 根据本地最新更新时间拉取中间库的企业信息-->
<select id="getNewEnterpriseInfoByLatestDate"
- resultType="com.hncy.datatrans.server.pzhdata.entity.hnbase.OrgNonPublic">
+ resultType="com.hncy.datatrans.server.pzhdata.entity.OrgNonPublic">
select PRIPID id,
UNISCID creditCode,
ENTNAME orgName,
diff --git a/src/main/resources/mapper/HomeStayMapper.xml b/src/main/resources/mapper/HomeStayMapper.xml
index 27b018c..d02ed82 100644
--- a/src/main/resources/mapper/HomeStayMapper.xml
+++ b/src/main/resources/mapper/HomeStayMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hncy.datatrans.server.pzhdata.mapper.HomeStayMapper">
- <resultMap id="selectMap" type="com.hncy.datatrans.server.pzhdata.entity.hnbase.HomeStay">
+ <resultMap id="selectMap" type="com.hncy.datatrans.server.pzhdata.entity.HomeStay">
<result column="id" property="id" />
<result column="area_id" property="areaId" />
<result column="areaName" property="areaName" />
@@ -42,7 +42,7 @@
<!-- 根据本地最新更新时间拉取中间库的养老机构及公寓信息-->
<select id="getNewHomeStayInfoByLatestDate"
- resultType="com.hncy.datatrans.server.pzhdata.entity.hnbase.HomeStay">
+ resultType="com.hncy.datatrans.server.pzhdata.entity.HomeStay">
select
-- CWS,
ID id,
diff --git a/src/main/resources/mapper/OrgShorgMapper.xml b/src/main/resources/mapper/OrgShorgMapper.xml
new file mode 100644
index 0000000..b0a4d79
--- /dev/null
+++ b/src/main/resources/mapper/OrgShorgMapper.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hncy.datatrans.server.pzhdata.mapper.OrgShorgMapper">
+
+<!--根据本地最新更新时间拉取中间库的民办非企业单位信息 mzj_pzhsmbfqydwxx-->
+ <select id="getNewNonEnterpriseByLatestDate"
+ resultType="com.hncy.datatrans.server.pzhdata.entity.OrgShorg">
+ select
+ BZJG gljgCode,
+ BZRQ pzDateStr,
+-- CLRQ,
+-- CSZZ,
+ DWDZ officeAddress,
+ FDDBRSJ fzrTel,
+ FDDBRXM frName,
+ FDDBRZJHM fzrCardNo,
+ FMXZQH areaId,
+-- GKMJ,
+ ID id,
+-- I_LABEL,
+ I_TIME createDate,
+-- JBRSJ,
+-- JBRXM,
+-- JBRZJHM,
+ JGLX shorgType,
+-- JGLXDH,
+ JGMC shorgName,
+ PZWH registedNo,
+ SHXYDM creditCode
+-- SXQX,
+-- YWFW,
+-- ZGJDMC,
+-- ZGJGDM
+ from mzj_pzhsmbfqydwxx where 1=1
+ <if test="dateStr!=null and dateStr!=''">
+ and I_TIME >= #{dateStr}
+ </if>
+ </select>
+
+<!-- 根据本地最新更新时间拉取中间库的市民政局_社会团体信息2001年至2018年 mzj_pzhsshttxx-->
+ <select id="getNewSocialGroupsByLatestDate" resultType="com.hncy.datatrans.server.pzhdata.entity.OrgShorg">
+ select
+ BZJG gljgCode,
+ BZRQ pzDateStr,
+ -- CLRQ,
+ -- CSZZ,
+ DWDZ officeAddress,
+ FDDBRSJ fzrTel,
+ FDDBRXM frName,
+ FDDBRZJHM fzrCardNo,
+ FMXZQH areaId,
+ -- GKMJ,
+ ID id,
+ -- I_LABEL,
+ I_TIME createDate,
+ -- JBRSJ,
+ -- JBRXM,
+ -- JBRZJHM,
+ JGLX shorgType,
+ -- JGLXDH,
+ JGMC shorgName,
+-- PZWH registedNo,
+ SHXYDM creditCode
+ -- SXQX,
+ -- YWFW,
+ -- ZGJDMC,
+ -- ZGJGDM
+ from mzj_pzhsshttxx where 1=1
+ <if test="dateStr!=null and dateStr!=''">
+ and I_TIME >= #{dateStr}
+ </if>
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/PublicSecurityLogisticsMapper.xml b/src/main/resources/mapper/PublicSecurityLogisticsMapper.xml
index 007350b..4127a78 100644
--- a/src/main/resources/mapper/PublicSecurityLogisticsMapper.xml
+++ b/src/main/resources/mapper/PublicSecurityLogisticsMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.hncy.datatrans.server.pzhdata.mapper.PublicSecurityLogisticsMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.hncy.datatrans.server.pzhdata.entity.hnbase.PublicSecurityLogistics">
+ <resultMap id="BaseResultMap" type="com.hncy.datatrans.server.pzhdata.entity.PublicSecurityLogistics">
<id column="id" property="id" />
<result column="license_registration_no" property="licenseRegistrationNo" />
<result column="logistics_name" property="logisticsName" />
@@ -34,7 +34,7 @@
</resultMap>
<!-- 根据本地最新更新时间拉取中间库的邮政的寄递物流信息信息-->
<select id="getNewPublicSecurityLogisticsByLatestDate"
- resultType="com.hncy.datatrans.server.pzhdata.entity.hnbase.PublicSecurityLogistics">
+ resultType="com.hncy.datatrans.server.pzhdata.entity.PublicSecurityLogistics">
select
CYRS numberOfEmployees,
DJZCLX registrationTypeName,
@@ -50,15 +50,15 @@
LZFS responsiblePersonTel,
-- l_LABEL,
l_TIME createDate,
- QYDZ areaName,
+ QYDZ addressOfEnterprise,
QYMC logisticsName,
-- SGSMC,
--- SSQX,
+-- SSQX areaName,
-- SXTNX,
- SZD areaName,
+-- SZD areaName,
WDSXT numberOfScStr,
- XGJSL numberOfX
--- ZCQX
+ XGJSL numberOfX,
+ ZCQX areaName
from syzglj_yzyggspgxfkb where 1=1
<if test="dateStr!=null and dateStr!=''">
and I_TIME >= #{dateStr}
--
GitLab