优化代码

java110-db/src/main/resources/mapper/community/OwnerRoomRelV1ServiceDaoImplMapper.xml

@@ -1,133 +0,0 @@
-<?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="ownerRoomRelV1ServiceDaoImpl">
-
-
-
-
-
-    <!-- 保存业主房屋关系表信息 add by wuxw 2018-07-03 -->
-    <insert id="saveOwnerRoomRelInfo" parameterType="Map">
-        insert into building_owner_room_rel(
-rel_id,remark,start_time,state,end_time,owner_id,user_id,room_id
-) values (
-#{relId},#{remark},#{startTime},#{state},#{endTime},#{ownerId},#{userId},#{roomId}
-)
-    </insert>
-
-
-
-    <!-- 查询业主房屋关系表信息 add by wuxw 2018-07-03 -->
-    <select id="getOwnerRoomRelInfo" parameterType="Map" resultType="Map">
-        select  t.rel_id,t.rel_id relId,t.remark,t.status_cd,t.status_cd statusCd,t.start_time,t.start_time startTime,t.state,t.end_time,t.end_time endTime,t.owner_id,t.owner_id ownerId,t.user_id,t.user_id userId,t.room_id,t.room_id roomId 
-from building_owner_room_rel t 
-where 1 =1 
-<if test="relId !=null and relId != ''">
-   and t.rel_id= #{relId}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="startTime !=null and startTime != ''">
-   and t.start_time= #{startTime}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="endTime !=null and endTime != ''">
-   and t.end_time= #{endTime}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-   and t.owner_id= #{ownerId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-   and t.room_id= #{roomId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
-
-    </select>
-
-
-
-
-    <!-- 修改业主房屋关系表信息 add by wuxw 2018-07-03 -->
-    <update id="updateOwnerRoomRelInfo" parameterType="Map">
-        update  building_owner_room_rel t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="startTime !=null and startTime != ''">
-, t.start_time= #{startTime}
-</if> 
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if> 
-<if test="endTime !=null and endTime != ''">
-, t.end_time= #{endTime}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-, t.owner_id= #{ownerId}
-</if> 
-<if test="userId !=null and userId != ''">
-, t.user_id= #{userId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-, t.room_id= #{roomId}
-</if> 
- where 1=1 <if test="relId !=null and relId != ''">
-and t.rel_id= #{relId}
-</if> 
-
-    </update>
-
-    <!-- 查询业主房屋关系表数量 add by wuxw 2018-07-03 -->
-     <select id="queryOwnerRoomRelsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from building_owner_room_rel t 
-where 1 =1 
-<if test="relId !=null and relId != ''">
-   and t.rel_id= #{relId}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="startTime !=null and startTime != ''">
-   and t.start_time= #{startTime}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="endTime !=null and endTime != ''">
-   and t.end_time= #{endTime}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-   and t.owner_id= #{ownerId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-   and t.room_id= #{roomId}
-</if> 
-
-
-     </select>
-
-</mapper>

java110-db/src/main/resources/mapper/community/OwnerV1ServiceDaoImplMapper.xml

@@ -1,169 +0,0 @@
-<?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="ownerV1ServiceDaoImpl">
-
-
-
-
-
-    <!-- 保存业主信息信息 add by wuxw 2018-07-03 -->
-    <insert id="saveOwnerInfo" parameterType="Map">
-        insert into building_owner(
-id_card,sex,link,owner_type_cd,remark,owner_id,user_id,name,state,community_id,age,member_id
-) values (
-#{idCard},#{sex},#{link},#{ownerTypeCd},#{remark},#{ownerId},#{userId},#{name},#{state},#{communityId},#{age},#{memberId}
-)
-    </insert>
-
-
-
-    <!-- 查询业主信息信息 add by wuxw 2018-07-03 -->
-    <select id="getOwnerInfo" parameterType="Map" resultType="Map">
-        select  t.id_card,t.id_card idCard,t.sex,t.link,t.owner_type_cd,t.owner_type_cd ownerTypeCd,t.remark,t.status_cd,t.status_cd statusCd,t.owner_id,t.owner_id ownerId,t.user_id,t.user_id userId,t.name,t.state,t.community_id,t.community_id communityId,t.age,t.member_id,t.member_id memberId 
-from building_owner t 
-where 1 =1 
-<if test="idCard !=null and idCard != ''">
-   and t.id_card= #{idCard}
-</if> 
-<if test="sex !=null and sex != ''">
-   and t.sex= #{sex}
-</if> 
-<if test="link !=null and link != ''">
-   and t.link= #{link}
-</if> 
-<if test="ownerTypeCd !=null and ownerTypeCd != ''">
-   and t.owner_type_cd= #{ownerTypeCd}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-   and t.owner_id= #{ownerId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="name !=null and name != ''">
-   and t.name= #{name}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="age !=null and age != ''">
-   and t.age= #{age}
-</if> 
-<if test="memberId !=null and memberId != ''">
-   and t.member_id= #{memberId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
-
-    </select>
-
-
-
-
-    <!-- 修改业主信息信息 add by wuxw 2018-07-03 -->
-    <update id="updateOwnerInfo" parameterType="Map">
-        update  building_owner t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="idCard !=null and idCard != ''">
-, t.id_card= #{idCard}
-</if> 
-<if test="sex !=null and sex != ''">
-, t.sex= #{sex}
-</if> 
-<if test="link !=null and link != ''">
-, t.link= #{link}
-</if> 
-<if test="ownerTypeCd !=null and ownerTypeCd != ''">
-, t.owner_type_cd= #{ownerTypeCd}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-, t.owner_id= #{ownerId}
-</if> 
-<if test="userId !=null and userId != ''">
-, t.user_id= #{userId}
-</if> 
-<if test="name !=null and name != ''">
-, t.name= #{name}
-</if> 
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="age !=null and age != ''">
-, t.age= #{age}
-</if> 
- where 1=1 <if test="memberId !=null and memberId != ''">
-and t.member_id= #{memberId}
-</if> 
-
-    </update>
-
-    <!-- 查询业主信息数量 add by wuxw 2018-07-03 -->
-     <select id="queryOwnersCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from building_owner t 
-where 1 =1 
-<if test="idCard !=null and idCard != ''">
-   and t.id_card= #{idCard}
-</if> 
-<if test="sex !=null and sex != ''">
-   and t.sex= #{sex}
-</if> 
-<if test="link !=null and link != ''">
-   and t.link= #{link}
-</if> 
-<if test="ownerTypeCd !=null and ownerTypeCd != ''">
-   and t.owner_type_cd= #{ownerTypeCd}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-   and t.owner_id= #{ownerId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="name !=null and name != ''">
-   and t.name= #{name}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="age !=null and age != ''">
-   and t.age= #{age}
-</if> 
-<if test="memberId !=null and memberId != ''">
-   and t.member_id= #{memberId}
-</if> 
-
-
-     </select>
-
-</mapper>

java110-db/src/main/resources/mapper/user/OwnerRoomRelV1ServiceDaoImplMapper.xml

@@ -0,0 +1,130 @@
+<?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="ownerRoomRelV1ServiceDaoImpl">
+
+
+    <!-- 保存业主房屋关系表信息 add by wuxw 2018-07-03 -->
+    <insert id="saveOwnerRoomRelInfo" parameterType="Map">
+        insert into building_owner_room_rel(
+        rel_id,remark,start_time,state,end_time,owner_id,user_id,room_id
+        ) values (
+        #{relId},#{remark},#{startTime},#{state},#{endTime},#{ownerId},#{userId},#{roomId}
+        )
+    </insert>
+
+
+    <!-- 查询业主房屋关系表信息 add by wuxw 2018-07-03 -->
+    <select id="getOwnerRoomRelInfo" parameterType="Map" resultType="Map">
+        select t.rel_id,t.rel_id relId,t.remark,t.status_cd,t.status_cd statusCd,t.start_time,t.start_time
+        startTime,t.state,t.end_time,t.end_time endTime,t.owner_id,t.owner_id ownerId,t.user_id,t.user_id
+        userId,t.room_id,t.room_id roomId
+        from building_owner_room_rel t
+        where 1 =1
+        <if test="relId !=null and relId != ''">
+            and t.rel_id= #{relId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.end_time= #{endTime}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and t.owner_id= #{ownerId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            and t.room_id= #{roomId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
+
+
+    <!-- 修改业主房屋关系表信息 add by wuxw 2018-07-03 -->
+    <update id="updateOwnerRoomRelInfo" parameterType="Map">
+        update building_owner_room_rel t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            , t.start_time= #{startTime}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            , t.end_time= #{endTime}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            , t.owner_id= #{ownerId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            , t.user_id= #{userId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            , t.room_id= #{roomId}
+        </if>
+        where 1=1
+        <if test="relId !=null and relId != ''">
+            and t.rel_id= #{relId}
+        </if>
+
+    </update>
+
+    <!-- 查询业主房屋关系表数量 add by wuxw 2018-07-03 -->
+    <select id="queryOwnerRoomRelsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from building_owner_room_rel t
+        where 1 =1
+        <if test="relId !=null and relId != ''">
+            and t.rel_id= #{relId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.end_time= #{endTime}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and t.owner_id= #{ownerId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            and t.room_id= #{roomId}
+        </if>
+
+
+    </select>
+
+</mapper>

java110-db/src/main/resources/mapper/user/OwnerV1ServiceDaoImplMapper.xml

@@ -0,0 +1,166 @@
+<?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="ownerV1ServiceDaoImpl">
+
+
+    <!-- 保存业主信息信息 add by wuxw 2018-07-03 -->
+    <insert id="saveOwnerInfo" parameterType="Map">
+        insert into building_owner(
+        id_card,sex,link,owner_type_cd,remark,owner_id,user_id,name,state,community_id,age,member_id
+        ) values (
+        #{idCard},#{sex},#{link},#{ownerTypeCd},#{remark},#{ownerId},#{userId},#{name},#{state},#{communityId},#{age},#{memberId}
+        )
+    </insert>
+
+
+    <!-- 查询业主信息信息 add by wuxw 2018-07-03 -->
+    <select id="getOwnerInfo" parameterType="Map" resultType="Map">
+        select t.id_card,t.id_card idCard,t.sex,t.link,t.owner_type_cd,t.owner_type_cd
+        ownerTypeCd,t.remark,t.status_cd,t.status_cd statusCd,t.owner_id,t.owner_id ownerId,t.user_id,t.user_id
+        userId,t.name,t.state,t.community_id,t.community_id communityId,t.age,t.member_id,t.member_id memberId
+        from building_owner t
+        where 1 =1
+        <if test="idCard !=null and idCard != ''">
+            and t.id_card= #{idCard}
+        </if>
+        <if test="sex !=null and sex != ''">
+            and t.sex= #{sex}
+        </if>
+        <if test="link !=null and link != ''">
+            and t.link= #{link}
+        </if>
+        <if test="ownerTypeCd !=null and ownerTypeCd != ''">
+            and t.owner_type_cd= #{ownerTypeCd}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and t.owner_id= #{ownerId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="name !=null and name != ''">
+            and t.name= #{name}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="age !=null and age != ''">
+            and t.age= #{age}
+        </if>
+        <if test="memberId !=null and memberId != ''">
+            and t.member_id= #{memberId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
+
+
+    <!-- 修改业主信息信息 add by wuxw 2018-07-03 -->
+    <update id="updateOwnerInfo" parameterType="Map">
+        update building_owner t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="idCard !=null and idCard != ''">
+            , t.id_card= #{idCard}
+        </if>
+        <if test="sex !=null and sex != ''">
+            , t.sex= #{sex}
+        </if>
+        <if test="link !=null and link != ''">
+            , t.link= #{link}
+        </if>
+        <if test="ownerTypeCd !=null and ownerTypeCd != ''">
+            , t.owner_type_cd= #{ownerTypeCd}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            , t.owner_id= #{ownerId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            , t.user_id= #{userId}
+        </if>
+        <if test="name !=null and name != ''">
+            , t.name= #{name}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="age !=null and age != ''">
+            , t.age= #{age}
+        </if>
+        where 1=1
+        <if test="memberId !=null and memberId != ''">
+            and t.member_id= #{memberId}
+        </if>
+
+    </update>
+
+    <!-- 查询业主信息数量 add by wuxw 2018-07-03 -->
+    <select id="queryOwnersCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from building_owner t
+        where 1 =1
+        <if test="idCard !=null and idCard != ''">
+            and t.id_card= #{idCard}
+        </if>
+        <if test="sex !=null and sex != ''">
+            and t.sex= #{sex}
+        </if>
+        <if test="link !=null and link != ''">
+            and t.link= #{link}
+        </if>
+        <if test="ownerTypeCd !=null and ownerTypeCd != ''">
+            and t.owner_type_cd= #{ownerTypeCd}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and t.owner_id= #{ownerId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="name !=null and name != ''">
+            and t.name= #{name}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="age !=null and age != ''">
+            and t.age= #{age}
+        </if>
+        <if test="memberId !=null and memberId != ''">
+            and t.member_id= #{memberId}
+        </if>
+
+
+    </select>
+
+</mapper>

java110-interface/src/main/java/com/java110/intf/community/IOwnerRoomRelV1InnerServiceSMO.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.intf.community;
+package com.java110.intf.user;
 
 import com.java110.config.feign.FeignConfiguration;
 import com.java110.dto.owner.OwnerRoomRelDto;
@@ -33,7 +33,7 @@ import java.util.List;
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-@FeignClient(name = "${java110.community-service}", configuration = {FeignConfiguration.class})
+@FeignClient(name = "${java110.user-service}", configuration = {FeignConfiguration.class})
 @RequestMapping("/ownerRoomRelV1Api")
 public interface IOwnerRoomRelV1InnerServiceSMO {
 

java110-interface/src/main/java/com/java110/intf/community/IOwnerV1InnerServiceSMO.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.intf.community;
+package com.java110.intf.user;
 
 import com.java110.config.feign.FeignConfiguration;
 import com.java110.dto.owner.OwnerDto;
@@ -33,7 +33,7 @@ import java.util.List;
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-@FeignClient(name = "${java110.community-service}", configuration = {FeignConfiguration.class})
+@FeignClient(name = "${java110.user-service}", configuration = {FeignConfiguration.class})
 @RequestMapping("/ownerV1Api")
 public interface IOwnerV1InnerServiceSMO {
 

service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java

@@ -10,6 +10,8 @@ import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.owner.OwnerRoomRelDto;
 import com.java110.entity.assetImport.ImportOwnerRoomDto;
 import com.java110.intf.community.*;
+import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerV1InnerServiceSMO;
 import com.java110.po.floor.FloorPo;
 import com.java110.po.owner.OwnerPo;
 import com.java110.po.owner.OwnerRoomRelPo;
@@ -30,7 +32,7 @@ import java.util.List;
  */
 @RestController
 public class ImportOwnerRoomInnerServiceSMOImpl extends BaseServiceSMO implements IImportOwnerRoomInnerServiceSMO {
-    private static Logger logger = LoggerFactory.getLogger(CommunityServiceSMOImpl.class);
+    private static Logger logger = LoggerFactory.getLogger(ImportOwnerRoomInnerServiceSMOImpl.class);
 
 
     @Autowired

service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerCmd.java

@@ -10,7 +10,7 @@ import com.java110.dto.RoomDto;
 import com.java110.dto.owner.OwnerAppUserDto;
 import com.java110.dto.owner.OwnerCarDto;
 import com.java110.dto.owner.OwnerDto;
-import com.java110.intf.community.IOwnerV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerV1InnerServiceSMO;
 import com.java110.intf.community.IRoomInnerServiceSMO;
 import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
 import com.java110.intf.user.IOwnerAppUserV1InnerServiceSMO;

service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java

@@ -14,7 +14,7 @@ import com.java110.dto.owner.OwnerAppUserDto;
 import com.java110.dto.owner.OwnerDto;
 import com.java110.intf.common.IFileInnerServiceSMO;
 import com.java110.intf.common.IFileRelInnerServiceSMO;
-import com.java110.intf.community.IOwnerV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
 import com.java110.intf.user.IOwnerAppUserV1InnerServiceSMO;
 import com.java110.intf.user.IOwnerAttrInnerServiceSMO;

service-user/src/main/java/com/java110/user/cmd/owner/OwnerExitRoomCmd.java

@@ -7,19 +7,17 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.AbstractServiceCmdListener;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.RoomDto;
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.fee.PayFeeDto;
 import com.java110.dto.owner.OwnerRoomRelDto;
-import com.java110.intf.community.IOwnerRoomRelV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
 import com.java110.intf.community.IRoomV1InnerServiceSMO;
 import com.java110.intf.fee.IPayFeeV1InnerServiceSMO;
 import com.java110.po.owner.OwnerRoomRelPo;
 import com.java110.po.room.RoomPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
-import com.java110.utils.util.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;

service-user/src/main/java/com/java110/user/cmd/owner/SaveHandoverCmd.java

@@ -13,11 +13,10 @@ import com.java110.dto.fee.FeeAttrDto;
 import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.owner.OwnerDto;
-import com.java110.dto.owner.OwnerRoomRelDto;
 import com.java110.dto.payFeeBatch.PayFeeBatchDto;
 import com.java110.dto.user.UserDto;
-import com.java110.intf.community.IOwnerRoomRelV1InnerServiceSMO;
-import com.java110.intf.community.IOwnerV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerV1InnerServiceSMO;
 import com.java110.intf.community.IRoomInnerServiceSMO;
 import com.java110.intf.community.IRoomV1InnerServiceSMO;
 import com.java110.intf.fee.*;
@@ -28,7 +27,6 @@ import com.java110.po.owner.OwnerPo;
 import com.java110.po.owner.OwnerRoomRelPo;
 import com.java110.po.payFeeBatch.PayFeeBatchPo;
 import com.java110.po.room.RoomPo;
-import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -37,7 +35,6 @@ import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Java110Cmd(serviceCode = "owner.saveHandover")

service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCmd.java

@@ -15,8 +15,8 @@ import com.java110.dto.owner.OwnerDto;
 import com.java110.intf.common.IFileInnerServiceSMO;
 import com.java110.intf.common.IFileRelInnerServiceSMO;
 import com.java110.intf.common.ISmsInnerServiceSMO;
-import com.java110.intf.community.IOwnerRoomRelV1InnerServiceSMO;
-import com.java110.intf.community.IOwnerV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerV1InnerServiceSMO;
 import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
 import com.java110.intf.user.IOwnerAttrInnerServiceSMO;
 import com.java110.intf.user.IOwnerInnerServiceSMO;

service-community/src/main/java/com/java110/community/dao/IOwnerRoomRelV1ServiceDao.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.community.dao;
+package com.java110.user.dao;
 
 
 import com.java110.utils.exception.DAOException;

service-community/src/main/java/com/java110/community/dao/IOwnerV1ServiceDao.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.community.dao;
+package com.java110.user.dao;
 
 
 import com.java110.utils.exception.DAOException;

service-community/src/main/java/com/java110/community/dao/impl/OwnerRoomRelV1ServiceDaoImpl.java

@@ -13,18 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.community.dao.impl;
+package com.java110.user.dao.impl;
 
-import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.DAOException;
-import com.java110.utils.util.DateUtil;
 import com.java110.core.base.dao.BaseServiceDao;
-import com.java110.community.dao.IOwnerRoomRelV1ServiceDao;
+import com.java110.user.dao.IOwnerRoomRelV1ServiceDao;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;

service-community/src/main/java/com/java110/community/dao/impl/OwnerV1ServiceDaoImpl.java

@@ -13,18 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.community.dao.impl;
+package com.java110.user.dao.impl;
 
-import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.DAOException;
-import com.java110.utils.util.DateUtil;
 import com.java110.core.base.dao.BaseServiceDao;
-import com.java110.community.dao.IOwnerV1ServiceDao;
+import com.java110.user.dao.IOwnerV1ServiceDao;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;

service-community/src/main/java/com/java110/community/smo/impl/OwnerRoomRelV1InnerServiceSMOImpl.java

@@ -13,23 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.community.smo.impl;
+package com.java110.user.smo.impl;
 
 
-import com.java110.community.dao.IOwnerRoomRelV1ServiceDao;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.dto.owner.OwnerRoomRelDto;
-import com.java110.intf.community.IOwnerRoomRelV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
 import com.java110.po.owner.OwnerRoomRelPo;
+import com.java110.user.dao.IOwnerRoomRelV1ServiceDao;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.user.UserDto;
 import com.java110.dto.PageDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**

service-community/src/main/java/com/java110/community/smo/impl/OwnerV1InnerServiceSMOImpl.java

@@ -13,22 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.java110.community.smo.impl;
+package com.java110.user.smo.impl;
 
 
-import com.java110.community.dao.IOwnerV1ServiceDao;
-import com.java110.intf.community.IOwnerV1InnerServiceSMO;
+import com.java110.user.dao.IOwnerV1ServiceDao;
+import com.java110.intf.user.IOwnerV1InnerServiceSMO;
 import com.java110.dto.owner.OwnerDto;
 import com.java110.po.owner.OwnerPo;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.user.UserDto;
 import com.java110.dto.PageDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**