From 35c2d917cd4bd29e9ea99311e4950e51ed1dfe45 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Tue, 31 May 2022 15:24:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/opendata/service/CaLoudongService.java     | 2 ++
 .../java/com/epmet/opendata/service/CaPingfangService.java    | 2 ++
 .../main/java/com/epmet/opendata/service/CaRentalService.java | 1 +
 .../java/com/epmet/opendata/service/CaResidentService.java    | 1 +
 .../java/com/epmet/opendata/service/CaRotatorsService.java    | 1 +
 .../com/epmet/opendata/service/impl/CaLoudongServiceImpl.java | 3 +++
 .../epmet/opendata/service/impl/CaPingfangServiceImpl.java    | 3 +++
 .../com/epmet/opendata/service/impl/CaRentalServiceImpl.java  | 3 +++
 .../epmet/opendata/service/impl/CaResidentServiceImpl.java    | 3 +++
 .../epmet/opendata/service/impl/CaRotatorsServiceImpl.java    | 3 +++
 .../src/main/resources/mapper/CaLoudongDao.xml                | 4 ++--
 .../src/main/resources/mapper/CaPingfangDao.xml               | 4 ++--
 .../src/main/resources/mapper/CaRentalDao.xml                 | 4 ++--
 .../src/main/resources/mapper/CaResidentDao.xml               | 4 ++--
 .../src/main/resources/mapper/CaRotatorsDao.xml               | 4 ++--
 15 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaLoudongService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaLoudongService.java
index de86e928f3..7ca6cf5071 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaLoudongService.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaLoudongService.java
@@ -1,8 +1,10 @@
 package com.epmet.opendata.service;
 
+
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.opendata.dto.CaLoudongDTO;
+import com.epmet.opendata.entity.CaLoudongEntity;
 
 
 import java.util.List;
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaPingfangService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaPingfangService.java
index 24e314359c..7000448d74 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaPingfangService.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaPingfangService.java
@@ -1,8 +1,10 @@
 package com.epmet.opendata.service;
 
+
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.opendata.dto.CaPingfangDTO;
+import com.epmet.opendata.entity.CaPingfangEntity;
 
 
 import java.util.List;
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaRentalService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaRentalService.java
index 371476dd40..ab0ecc06ff 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaRentalService.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaRentalService.java
@@ -3,6 +3,7 @@ package com.epmet.opendata.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.opendata.dto.CaRentalDTO;
+import com.epmet.opendata.entity.CaRentalEntity;
 
 
 import java.util.List;
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaResidentService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaResidentService.java
index dfc3ea1cf6..88aea32a41 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaResidentService.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaResidentService.java
@@ -3,6 +3,7 @@ package com.epmet.opendata.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.opendata.dto.CaResidentDTO;
+import com.epmet.opendata.entity.CaResidentEntity;
 
 
 import java.util.List;
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaRotatorsService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaRotatorsService.java
index d5d7f6505c..f483fc139e 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaRotatorsService.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaRotatorsService.java
@@ -3,6 +3,7 @@ package com.epmet.opendata.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.opendata.dto.CaRotatorsDTO;
+import com.epmet.opendata.entity.CaRotatorsEntity;
 
 import java.util.List;
 import java.util.Map;
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java
index 7b573a3e11..92baafb116 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java
@@ -6,8 +6,11 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.opendata.dao.CaLoudongDao;
 import com.epmet.opendata.dto.CaLoudongDTO;
+import com.epmet.opendata.entity.CaLoudongEntity;
 import com.epmet.opendata.redis.CaLoudongRedis;
+import com.epmet.opendata.service.CaLoudongService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java
index 9282cedbf5..eabae1b5a0 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java
@@ -6,8 +6,11 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.opendata.dao.CaPingfangDao;
 import com.epmet.opendata.dto.CaPingfangDTO;
+import com.epmet.opendata.entity.CaPingfangEntity;
 import com.epmet.opendata.redis.CaPingfangRedis;
+import com.epmet.opendata.service.CaPingfangService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java
index 470d599b25..02fe9d27d0 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java
@@ -7,8 +7,11 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 
+import com.epmet.opendata.dao.CaRentalDao;
 import com.epmet.opendata.dto.CaRentalDTO;
+import com.epmet.opendata.entity.CaRentalEntity;
 import com.epmet.opendata.redis.CaRentalRedis;
+import com.epmet.opendata.service.CaRentalService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java
index b089b24316..ccb5ebf7d8 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java
@@ -6,8 +6,11 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.opendata.dao.CaResidentDao;
 import com.epmet.opendata.dto.CaResidentDTO;
+import com.epmet.opendata.entity.CaResidentEntity;
 import com.epmet.opendata.redis.CaResidentRedis;
+import com.epmet.opendata.service.CaResidentService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java
index 3fddda1d81..d7de043517 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java
@@ -6,8 +6,11 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.opendata.dao.CaRotatorsDao;
 import com.epmet.opendata.dto.CaRotatorsDTO;
+import com.epmet.opendata.entity.CaRotatorsEntity;
 import com.epmet.opendata.redis.CaRotatorsRedis;
+import com.epmet.opendata.service.CaRotatorsService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml
index 1d6e3478ba..a8c9a073a0 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml
@@ -1,9 +1,9 @@
 <?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.epmet.dao.CaLoudongDao">
+<mapper namespace="com.epmet.opendata.dao.CaLoudongDao">
 
-    <resultMap type="com.epmet.entity.CaLoudongEntity" id="caLoudongMap">
+    <resultMap type="com.epmet.opendata.entity.CaLoudongEntity" id="caLoudongMap">
         <result property="buildingId" column="building_id"/>
         <result property="buildingType" column="building_type"/>
         <result property="gridId" column="grid_id"/>
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml
index 683d7d8afd..dc026dac51 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml
@@ -1,9 +1,9 @@
 <?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.epmet.dao.CaPingfangDao">
+<mapper namespace="com.epmet.opendata.dao.CaPingfangDao">
 
-    <resultMap type="com.epmet.entity.CaPingfangEntity" id="caPingfangMap">
+    <resultMap type="com.epmet.opendata.entity.CaPingfangEntity" id="caPingfangMap">
         <result property="buildingId" column="building_id"/>
         <result property="buildingType" column="building_type"/>
         <result property="gridId" column="grid_id"/>
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml
index bff21e3518..851c086a46 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml
@@ -1,9 +1,9 @@
 <?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.epmet.dao.CaRentalDao">
+<mapper namespace="com.epmet.opendata.dao.CaRentalDao">
 
-    <resultMap type="com.epmet.entity.CaRentalEntity" id="caRentalMap">
+    <resultMap type="com.epmet.opendata.entity.CaRentalEntity" id="caRentalMap">
         <result property="rentalId" column="rental_id"/>
         <result property="gridId" column="grid_id"/>
         <result property="houseId" column="house_id"/>
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml
index 0d75a73d7d..f631ecc5da 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml
@@ -1,9 +1,9 @@
 <?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.epmet.dao.CaResidentDao">
+<mapper namespace="com.epmet.opendata.dao.CaResidentDao">
 
-    <resultMap type="com.epmet.entity.CaResidentEntity" id="caResidentMap">
+    <resultMap type="com.epmet.opendata.entity.CaResidentEntity" id="caResidentMap">
         <result property="residentId" column="resident_id"/>
         <result property="gridId" column="grid_id"/>
         <result property="residentProperty" column="resident_property"/>
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml
index 51b07d7bc5..2f764bcc53 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml
@@ -1,9 +1,9 @@
 <?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.epmet.dao.CaRotatorsDao">
+<mapper namespace="com.epmet.opendata.dao.CaRotatorsDao">
 
-    <resultMap type="com.epmet.entity.CaRotatorsEntity" id="caRotatorsMap">
+    <resultMap type="com.epmet.opendata.entity.CaRotatorsEntity" id="caRotatorsMap">
         <result property="rotatorsId" column="rotators_id"/>
         <result property="idCard" column="id_card"/>
         <result property="idType" column="id_type"/>