优化代码

java110-bean/src/main/java/com/java110/dto/parkingBoxArea/ParkingBoxAreaDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.parkingBoxArea;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,12 +15,14 @@ import java.util.Date;
  **/
 public class ParkingBoxAreaDto extends PageDto implements Serializable {
 
+    public static final String DEFAULT_AREA_TRUE = "T";
+
     private String defaultArea;
-private String baId;
-private String paId;
-private String remark;
-private String communityId;
-private String boxId;
+    private String baId;
+    private String paId;
+    private String remark;
+    private String communityId;
+    private String boxId;
 
 
     private Date createTime;
@@ -30,37 +33,48 @@ private String boxId;
     public String getDefaultArea() {
         return defaultArea;
     }
-public void setDefaultArea(String defaultArea) {
+
+    public void setDefaultArea(String defaultArea) {
         this.defaultArea = defaultArea;
     }
-public String getBaId() {
+
+    public String getBaId() {
         return baId;
     }
-public void setBaId(String baId) {
+
+    public void setBaId(String baId) {
         this.baId = baId;
     }
-public String getPaId() {
+
+    public String getPaId() {
         return paId;
     }
-public void setPaId(String paId) {
+
+    public void setPaId(String paId) {
         this.paId = paId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getBoxId() {
+
+    public String getBoxId() {
         return boxId;
     }
-public void setBoxId(String boxId) {
+
+    public void setBoxId(String boxId) {
         this.boxId = boxId;
     }
 

java110-bean/src/main/java/com/java110/po/parkingBoxArea/ParkingBoxAreaPo.java

@@ -16,7 +16,7 @@
 package com.java110.po.parkingBoxArea;
 
 import java.io.Serializable;
-import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2021-10-18 00:15:30 mail: 928255095@qq.com
@@ -28,55 +28,68 @@ import java.util.Date;
 public class ParkingBoxAreaPo implements Serializable {
 
     private String defaultArea;
-private String baId;
-private String paId;
-private String remark;
-private String statusCd = "0";
-private String communityId;
-private String boxId;
-public String getDefaultArea() {
+    private String baId;
+    private String paId;
+    private String remark;
+    private String statusCd = "0";
+    private String communityId;
+    private String boxId;
+
+    public String getDefaultArea() {
         return defaultArea;
     }
-public void setDefaultArea(String defaultArea) {
+
+    public void setDefaultArea(String defaultArea) {
         this.defaultArea = defaultArea;
     }
-public String getBaId() {
+
+    public String getBaId() {
         return baId;
     }
-public void setBaId(String baId) {
+
+    public void setBaId(String baId) {
         this.baId = baId;
     }
-public String getPaId() {
+
+    public String getPaId() {
         return paId;
     }
-public void setPaId(String paId) {
+
+    public void setPaId(String paId) {
         this.paId = paId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getBoxId() {
+
+    public String getBoxId() {
         return boxId;
     }
-public void setBoxId(String boxId) {
+
+    public void setBoxId(String boxId) {
         this.boxId = boxId;
     }
 
 
-
 }

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

@@ -5,111 +5,108 @@
 <mapper namespace="parkingBoxAreaV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存停车场岗亭信息 add by wuxw 2018-07-03 -->
     <insert id="saveParkingBoxAreaInfo" parameterType="Map">
         insert into parking_box_area(
-default_area,ba_id,pa_id,remark,community_id,box_id
-) values (
-#{defaultArea},#{baId},#{paId},#{remark},#{communityId},#{boxId}
-)
+        default_area,ba_id,pa_id,remark,community_id,box_id
+        ) values (
+        #{defaultArea},#{baId},#{paId},#{remark},#{communityId},#{boxId}
+        )
     </insert>
 
 
-
     <!-- 查询停车场岗亭信息 add by wuxw 2018-07-03 -->
     <select id="getParkingBoxAreaInfo" parameterType="Map" resultType="Map">
-        select  t.default_area,t.default_area defaultArea,t.ba_id,t.ba_id baId,t.pa_id,t.pa_id paId,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.box_id,t.box_id boxId 
-from parking_box_area t 
-where 1 =1 
-<if test="defaultArea !=null and defaultArea != ''">
-   and t.default_area= #{defaultArea}
-</if> 
-<if test="baId !=null and baId != ''">
-   and t.ba_id= #{baId}
-</if> 
-<if test="paId !=null and paId != ''">
-   and t.pa_id= #{paId}
-</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="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="boxId !=null and boxId != ''">
-   and t.box_id= #{boxId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.default_area,t.default_area defaultArea,t.ba_id,t.ba_id baId,t.pa_id,t.pa_id
+        paId,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.box_id,t.box_id boxId
+        from parking_box_area t
+        where 1 =1
+        <if test="defaultArea !=null and defaultArea != ''">
+            and t.default_area= #{defaultArea}
+        </if>
+        <if test="baId !=null and baId != ''">
+            and t.ba_id= #{baId}
+        </if>
+        <if test="paId !=null and paId != ''">
+            and t.pa_id= #{paId}
+        </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="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="boxId !=null and boxId != ''">
+            and t.box_id= #{boxId}
+        </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="updateParkingBoxAreaInfo" parameterType="Map">
-        update  parking_box_area t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="defaultArea !=null and defaultArea != ''">
-, t.default_area= #{defaultArea}
-</if> 
-<if test="paId !=null and paId != ''">
-, t.pa_id= #{paId}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="boxId !=null and boxId != ''">
-, t.box_id= #{boxId}
-</if> 
- where 1=1 <if test="baId !=null and baId != ''">
-and t.ba_id= #{baId}
-</if> 
+        update parking_box_area t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="defaultArea !=null and defaultArea != ''">
+            , t.default_area= #{defaultArea}
+        </if>
+        <if test="paId !=null and paId != ''">
+            , t.pa_id= #{paId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+
+        <if test="boxId !=null and boxId != ''">
+            , t.box_id= #{boxId}
+        </if>
+        where 1=1
+        <if test="baId !=null and baId != ''">
+            and t.ba_id= #{baId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
 
     </update>
 
     <!-- 查询停车场岗亭数量 add by wuxw 2018-07-03 -->
-     <select id="queryParkingBoxAreasCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from parking_box_area t 
-where 1 =1 
-<if test="defaultArea !=null and defaultArea != ''">
-   and t.default_area= #{defaultArea}
-</if> 
-<if test="baId !=null and baId != ''">
-   and t.ba_id= #{baId}
-</if> 
-<if test="paId !=null and paId != ''">
-   and t.pa_id= #{paId}
-</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="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="boxId !=null and boxId != ''">
-   and t.box_id= #{boxId}
-</if> 
+    <select id="queryParkingBoxAreasCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from parking_box_area t
+        where 1 =1
+        <if test="defaultArea !=null and defaultArea != ''">
+            and t.default_area= #{defaultArea}
+        </if>
+        <if test="baId !=null and baId != ''">
+            and t.ba_id= #{baId}
+        </if>
+        <if test="paId !=null and paId != ''">
+            and t.pa_id= #{paId}
+        </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="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="boxId !=null and boxId != ''">
+            and t.box_id= #{boxId}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

service-community/src/main/java/com/java110/community/cmd/parkingBox/SaveParkingBoxCmd.java

@@ -22,16 +22,24 @@ 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.parking.ParkingAreaDto;
+import com.java110.dto.parkingBoxArea.ParkingBoxAreaDto;
+import com.java110.intf.community.IParkingAreaInnerServiceSMO;
+import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
 import com.java110.intf.community.IParkingBoxV1InnerServiceSMO;
 import com.java110.po.parkingBox.ParkingBoxPo;
+import com.java110.po.parkingBoxArea.ParkingBoxAreaPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.List;
+
 /**
  * 类表述：保存
  * 服务编码：parkingBox.saveParkingBox
@@ -52,6 +60,12 @@ public class SaveParkingBoxCmd extends AbstractServiceCmdListener {
     @Autowired
     private IParkingBoxV1InnerServiceSMO parkingBoxV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IParkingAreaInnerServiceSMO parkingAreaInnerServiceSMOImpl;
+
+    @Autowired
+    private IParkingBoxAreaV1InnerServiceSMO parkingBoxAreaV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "boxName", "请求报文中未包含boxName");
@@ -74,7 +88,30 @@ public class SaveParkingBoxCmd extends AbstractServiceCmdListener {
         if (flag < 1) {
             throw new CmdException("保存数据失败");
         }
+        if (!reqJson.containsKey("paId") || StringUtil.isEmpty(reqJson.getString("paId"))) {
+            cmdDataFlowContext.setResponseEntity(ResultVo.success());
+            return;
+        }
 
+        //判断停车场是否存在
+        ParkingAreaDto parkingAreaDto = new ParkingAreaDto();
+        parkingAreaDto.setPaId(reqJson.getString("paId"));
+        parkingAreaDto.setCommunityId(reqJson.getString("communityId"));
+        List<ParkingAreaDto> parkingAreaDtos = parkingAreaInnerServiceSMOImpl.queryParkingAreas(parkingAreaDto);
+
+        Assert.listOnlyOne(parkingAreaDtos, "停车场不存在");
+
+        ParkingBoxAreaPo parkingBoxAreaPo = new ParkingBoxAreaPo();
+        parkingBoxAreaPo.setBaId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+        parkingBoxAreaPo.setBoxId(parkingBoxPo.getBoxId());
+        parkingBoxAreaPo.setPaId(parkingAreaDtos.get(0).getPaId());
+        parkingBoxAreaPo.setCommunityId(parkingAreaDtos.get(0).getCommunityId());
+        parkingBoxAreaPo.setDefaultArea(ParkingBoxAreaDto.DEFAULT_AREA_TRUE);
+
+        flag = parkingBoxAreaV1InnerServiceSMOImpl.saveParkingBoxArea(parkingBoxAreaPo);
+        if (flag < 1) {
+            throw new CmdException("保存数据失败");
+        }
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

service-community/src/main/java/com/java110/community/cmd/parkingBox/UpdateParkingBoxCmd.java

@@ -21,16 +21,25 @@ 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.parking.ParkingAreaDto;
+import com.java110.dto.parkingBoxArea.ParkingBoxAreaDto;
+import com.java110.intf.community.IParkingAreaInnerServiceSMO;
+import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
 import com.java110.intf.community.IParkingBoxV1InnerServiceSMO;
 import com.java110.po.parkingBox.ParkingBoxPo;
+import com.java110.po.parkingBoxArea.ParkingBoxAreaPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.List;
+
 
 /**
  * 类表述：更新
@@ -46,11 +55,18 @@ import org.springframework.beans.factory.annotation.Autowired;
 public class UpdateParkingBoxCmd extends AbstractServiceCmdListener {
 
     private static Logger logger = LoggerFactory.getLogger(UpdateParkingBoxCmd.class);
+    public static final String CODE_PREFIX_ID = "10";
 
 
     @Autowired
     private IParkingBoxV1InnerServiceSMO parkingBoxV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IParkingAreaInnerServiceSMO parkingAreaInnerServiceSMOImpl;
+
+    @Autowired
+    private IParkingBoxAreaV1InnerServiceSMO parkingBoxAreaV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "boxId", "boxId不能为空");
@@ -69,6 +85,40 @@ public class UpdateParkingBoxCmd extends AbstractServiceCmdListener {
             throw new CmdException("更新数据失败");
         }
 
+        if (!reqJson.containsKey("paId") || StringUtil.isEmpty(reqJson.getString("paId"))) {
+            cmdDataFlowContext.setResponseEntity(ResultVo.success());
+            return ;
+        }
+
+        //判断停车场是否存在
+        ParkingAreaDto parkingAreaDto = new ParkingAreaDto();
+        parkingAreaDto.setPaId(reqJson.getString("paId"));
+        parkingAreaDto.setCommunityId(reqJson.getString("communityId"));
+        List<ParkingAreaDto> parkingAreaDtos = parkingAreaInnerServiceSMOImpl.queryParkingAreas(parkingAreaDto);
+
+        Assert.listOnlyOne(parkingAreaDtos, "停车场不存在");
+
+        ParkingBoxAreaDto parkingBoxAreaDto = new ParkingBoxAreaDto();
+        parkingBoxAreaDto.setBoxId(reqJson.getString("boxId"));
+        parkingBoxAreaDto.setPaId(parkingAreaDtos.get(0).getPaId());
+        parkingBoxAreaDto.setCommunityId(parkingAreaDtos.get(0).getCommunityId());
+        List<ParkingBoxAreaDto> parkingBoxAreaDtos = parkingBoxAreaV1InnerServiceSMOImpl.queryParkingBoxAreas(parkingBoxAreaDto);
+        ParkingBoxAreaPo parkingBoxAreaPo = new ParkingBoxAreaPo();
+        parkingBoxAreaPo.setBoxId(parkingBoxPo.getBoxId());
+        parkingBoxAreaPo.setPaId(parkingAreaDtos.get(0).getPaId());
+        parkingBoxAreaPo.setCommunityId(parkingAreaDtos.get(0).getCommunityId());
+        if(parkingBoxAreaDtos == null || parkingBoxAreaDtos.size() < 1) {
+            parkingBoxAreaPo.setBaId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+            parkingBoxAreaPo.setDefaultArea(ParkingBoxAreaDto.DEFAULT_AREA_TRUE);
+            flag = parkingBoxAreaV1InnerServiceSMOImpl.saveParkingBoxArea(parkingBoxAreaPo);
+        }else{
+            parkingBoxAreaPo.setBaId(parkingBoxAreaDtos.get(0).getBaId());
+            flag = parkingBoxAreaV1InnerServiceSMOImpl.updateParkingBoxArea(parkingBoxAreaPo);
+        }
+        if (flag < 1) {
+            throw new CmdException("保存数据失败");
+        }
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }