优化 小区位置功能

java110-bean/src/main/java/com/java110/dto/community/CommunityLocationDto.java

@@ -20,6 +20,8 @@ public class CommunityLocationDto extends PageDto implements Serializable {
     private String locationType;
     private String communityId;
     private String locationTypeName;
+    private String locationObjId;
+    private String locationObjName;
 
 
     private Date createTime;
@@ -83,4 +85,20 @@ public class CommunityLocationDto extends PageDto implements Serializable {
     public void setLocationTypeName(String locationTypeName) {
         this.locationTypeName = locationTypeName;
     }
+
+    public String getLocationObjId() {
+        return locationObjId;
+    }
+
+    public void setLocationObjId(String locationObjId) {
+        this.locationObjId = locationObjId;
+    }
+
+    public String getLocationObjName() {
+        return locationObjName;
+    }
+
+    public void setLocationObjName(String locationObjName) {
+        this.locationObjName = locationObjName;
+    }
 }

java110-bean/src/main/java/com/java110/po/community/CommunityLocationPo.java

@@ -1,37 +1,46 @@
 package com.java110.po.community;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class CommunityLocationPo implements Serializable {
 
     private String locationName;
-private String locationId;
-private String locationType;
-private String communityId;
-private String statusCd="0";
-public String getLocationName() {
+    private String locationId;
+    private String locationType;
+    private String communityId;
+    private String locationObjId;
+    private String locationObjName;
+    private String statusCd = "0";
+
+    public String getLocationName() {
         return locationName;
     }
-public void setLocationName(String locationName) {
+
+    public void setLocationName(String locationName) {
         this.locationName = locationName;
     }
-public String getLocationId() {
+
+    public String getLocationId() {
         return locationId;
     }
-public void setLocationId(String locationId) {
+
+    public void setLocationId(String locationId) {
         this.locationId = locationId;
     }
-public String getLocationType() {
+
+    public String getLocationType() {
         return locationType;
     }
-public void setLocationType(String locationType) {
+
+    public void setLocationType(String locationType) {
         this.locationType = locationType;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
@@ -42,4 +51,20 @@ public void setCommunityId(String communityId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getLocationObjId() {
+        return locationObjId;
+    }
+
+    public void setLocationObjId(String locationObjId) {
+        this.locationObjId = locationObjId;
+    }
+
+    public String getLocationObjName() {
+        return locationObjName;
+    }
+
+    public void setLocationObjName(String locationObjName) {
+        this.locationObjName = locationObjName;
+    }
 }

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

@@ -5,93 +5,108 @@
 <mapper namespace="communityLocationV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存小区位置信息 add by wuxw 2018-07-03 -->
     <insert id="saveCommunityLocationInfo" parameterType="Map">
         insert into community_location(
-location_name,location_id,location_type,community_id
-) values (
-#{locationName},#{locationId},#{locationType},#{communityId}
-)
+        location_name,location_id,location_type,community_id,location_obj_id,location_obj_name
+        ) values (
+        #{locationName},#{locationId},#{locationType},#{communityId},#{locationObjId},#{locationObjName}
+        )
     </insert>
 
 
-
     <!-- 查询小区位置信息 add by wuxw 2018-07-03 -->
     <select id="getCommunityLocationInfo" parameterType="Map" resultType="Map">
-        select  t.location_name,t.location_name locationName,t.location_id,t.location_id locationId,t.location_type,t.location_type locationType,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId 
-from community_location t 
-where 1 =1 
-<if test="locationName !=null and locationName != ''">
-   and t.location_name= #{locationName}
-</if> 
-<if test="locationId !=null and locationId != ''">
-   and t.location_id= #{locationId}
-</if> 
-<if test="locationType !=null and locationType != ''">
-   and t.location_type= #{locationType}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.location_name,t.location_name locationName,t.location_id,t.location_id
+        locationId,t.location_type,t.location_type locationType,t.status_cd,t.status_cd
+        statusCd,t.community_id,t.community_id communityId,t.location_obj_id locationObjId,t.location_obj_name locationObjName
+        from community_location t
+        where 1 =1
+        <if test="locationName !=null and locationName != ''">
+            and t.location_name= #{locationName}
+        </if>
+        <if test="locationId !=null and locationId != ''">
+            and t.location_id= #{locationId}
+        </if>
+        <if test="locationType !=null and locationType != ''">
+            and t.location_type= #{locationType}
+        </if>
+        <if test="locationObjId !=null and locationObjId != ''">
+            and t.location_obj_id= #{locationObjId}
+        </if>
+        <if test="locationObjName !=null and locationObjName != ''">
+            and t.location_obj_name= #{locationObjName}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </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="updateCommunityLocationInfo" parameterType="Map">
-        update  community_location t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="locationName !=null and locationName != ''">
-, t.location_name= #{locationName}
-</if> 
-<if test="locationType !=null and locationType != ''">
-, t.location_type= #{locationType}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
- where 1=1 <if test="locationId !=null and locationId != ''">
-and t.location_id= #{locationId}
-</if> 
+        update community_location t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="locationName !=null and locationName != ''">
+            , t.location_name= #{locationName}
+        </if>
+        <if test="locationType !=null and locationType != ''">
+            , t.location_type= #{locationType}
+        </if>
+        <if test="locationObjId !=null and locationObjId != ''">
+            , t.location_obj_id= #{locationObjId}
+        </if>
+        <if test="locationObjName !=null and locationObjName != ''">
+            , t.location_obj_name= #{locationObjName}
+        </if>
+        where 1=1
+        <if test="locationId !=null and locationId != ''">
+            and t.location_id= #{locationId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
     </update>
 
     <!-- 查询小区位置数量 add by wuxw 2018-07-03 -->
-     <select id="queryCommunityLocationsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from community_location t 
-where 1 =1 
-<if test="locationName !=null and locationName != ''">
-   and t.location_name= #{locationName}
-</if> 
-<if test="locationId !=null and locationId != ''">
-   and t.location_id= #{locationId}
-</if> 
-<if test="locationType !=null and locationType != ''">
-   and t.location_type= #{locationType}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
+    <select id="queryCommunityLocationsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from community_location t
+        where 1 =1
+        <if test="locationName !=null and locationName != ''">
+            and t.location_name= #{locationName}
+        </if>
+        <if test="locationId !=null and locationId != ''">
+            and t.location_id= #{locationId}
+        </if>
+        <if test="locationType !=null and locationType != ''">
+            and t.location_type= #{locationType}
+        </if>
+        <if test="locationObjId !=null and locationObjId != ''">
+            and t.location_obj_id= #{locationObjId}
+        </if>
+        <if test="locationObjName !=null and locationObjName != ''">
+            and t.location_obj_name= #{locationObjName}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

service-community/src/main/java/com/java110/community/cmd/communityLocation/UpdateCommunityLocationCmd.java

@@ -21,16 +21,15 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.community.ICommunityLocationV1InnerServiceSMO;
 import com.java110.po.community.CommunityLocationPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 
 
 /**
@@ -46,7 +45,7 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "communityLocation.updateCommunityLocation")
 public class UpdateCommunityLocationCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(UpdateCommunityLocationCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(UpdateCommunityLocationCmd.class);
 
 
     @Autowired
@@ -55,7 +54,7 @@ public class UpdateCommunityLocationCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "locationId", "locationId不能为空");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
+        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
 
     }
 
@@ -63,7 +62,7 @@ Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       CommunityLocationPo communityLocationPo = BeanConvertUtil.covertBean(reqJson, CommunityLocationPo.class);
+        CommunityLocationPo communityLocationPo = BeanConvertUtil.covertBean(reqJson, CommunityLocationPo.class);
         int flag = communityLocationV1InnerServiceSMOImpl.updateCommunityLocation(communityLocationPo);
 
         if (flag < 1) {