加入验房功能

java110-bean/src/main/java/com/java110/dto/roomRenovationDetail/RoomRenovationDetailDto.java

@@ -0,0 +1,113 @@
+package com.java110.dto.roomRenovationDetail;
+
+import com.java110.dto.PageDto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description 装修明细数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class RoomRenovationDetailDto extends PageDto implements Serializable {
+
+    private String detailType;
+    private String staffName;
+    private String detailId;
+    private String remark;
+    private String state;
+    private String rId;
+    private String communityId;
+    private String staffId;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getDetailType() {
+        return detailType;
+    }
+
+    public void setDetailType(String detailType) {
+        this.detailType = detailType;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public String getDetailId() {
+        return detailId;
+    }
+
+    public void setDetailId(String detailId) {
+        this.detailId = detailId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getrId() {
+        return rId;
+    }
+
+    public void setrId(String rId) {
+        this.rId = rId;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+}

java110-bean/src/main/java/com/java110/po/roomRenovationDetail/RoomRenovationDetailPo.java

@@ -0,0 +1,90 @@
+package com.java110.po.roomRenovationDetail;
+
+import java.io.Serializable;
+
+public class RoomRenovationDetailPo implements Serializable {
+
+    private String detailType;
+    private String staffName;
+    private String detailId;
+    private String statusCd = "0";
+    private String remark;
+    private String state;
+    private String rId;
+    private String communityId;
+    private String staffId;
+
+    public String getDetailType() {
+        return detailType;
+    }
+
+    public void setDetailType(String detailType) {
+        this.detailType = detailType;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public String getDetailId() {
+        return detailId;
+    }
+
+    public void setDetailId(String detailId) {
+        this.detailId = detailId;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getrId() {
+        return rId;
+    }
+
+    public void setrId(String rId) {
+        this.rId = rId;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+
+}

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

@@ -0,0 +1,133 @@
+<?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="roomRenovationDetailServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存装修明细信息 add by wuxw 2018-07-03 -->
+    <insert id="saveRoomRenovationDetailInfo" parameterType="Map">
+        insert into room_renovation_detail(
+detail_type,staff_name,detail_id,remark,state,r_id,community_id,staff_id
+) values (
+#{detailType},#{staffName},#{detailId},#{remark},#{state},#{rId},#{communityId},#{staffId}
+)
+    </insert>
+
+
+
+    <!-- 查询装修明细信息 add by wuxw 2018-07-03 -->
+    <select id="getRoomRenovationDetailInfo" parameterType="Map" resultType="Map">
+        select  t.detail_type,t.detail_type detailType,t.staff_name,t.staff_name staffName,t.detail_id,t.detail_id detailId,t.status_cd,t.status_cd statusCd,t.remark,t.state,t.r_id,t.r_id rId,t.community_id,t.community_id communityId,t.staff_id,t.staff_id staffId 
+from room_renovation_detail t 
+where 1 =1 
+<if test="detailType !=null and detailType != ''">
+   and t.detail_type= #{detailType}
+</if> 
+<if test="staffName !=null and staffName != ''">
+   and t.staff_name= #{staffName}
+</if> 
+<if test="detailId !=null and detailId != ''">
+   and t.detail_id= #{detailId}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="remark !=null and remark != ''">
+   and t.remark= #{remark}
+</if> 
+<if test="state !=null and state != ''">
+   and t.state= #{state}
+</if> 
+<if test="rId !=null and rId != ''">
+   and t.r_id= #{rId}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="staffId !=null and staffId != ''">
+   and t.staff_id= #{staffId}
+</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="updateRoomRenovationDetailInfo" parameterType="Map">
+        update  room_renovation_detail t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="detailType !=null and detailType != ''">
+, t.detail_type= #{detailType}
+</if> 
+<if test="staffName !=null and staffName != ''">
+, t.staff_name= #{staffName}
+</if> 
+<if test="remark !=null and remark != ''">
+, t.remark= #{remark}
+</if> 
+<if test="state !=null and state != ''">
+, t.state= #{state}
+</if> 
+<if test="rId !=null and rId != ''">
+, t.r_id= #{rId}
+</if> 
+<if test="communityId !=null and communityId != ''">
+, t.community_id= #{communityId}
+</if> 
+<if test="staffId !=null and staffId != ''">
+, t.staff_id= #{staffId}
+</if> 
+ where 1=1 <if test="detailId !=null and detailId != ''">
+and t.detail_id= #{detailId}
+</if> 
+
+    </update>
+
+    <!-- 查询装修明细数量 add by wuxw 2018-07-03 -->
+     <select id="queryRoomRenovationDetailsCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from room_renovation_detail t 
+where 1 =1 
+<if test="detailType !=null and detailType != ''">
+   and t.detail_type= #{detailType}
+</if> 
+<if test="staffName !=null and staffName != ''">
+   and t.staff_name= #{staffName}
+</if> 
+<if test="detailId !=null and detailId != ''">
+   and t.detail_id= #{detailId}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="remark !=null and remark != ''">
+   and t.remark= #{remark}
+</if> 
+<if test="state !=null and state != ''">
+   and t.state= #{state}
+</if> 
+<if test="rId !=null and rId != ''">
+   and t.r_id= #{rId}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="staffId !=null and staffId != ''">
+   and t.staff_id= #{staffId}
+</if> 
+
+
+     </select>
+
+</mapper>

java110-generator/src/main/java/com/java110/code/newBack/GeneratorApiListener.java

@@ -28,7 +28,7 @@ public class GeneratorApiListener extends BaseGenerator {
 
 
     private void genneratorPo(Data data) throws Exception {
-        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/Po.java").getFile());
+        StringBuffer sb = readFile(this.getClass().getResource("/newTemplate/Po.txt").getFile());
         String fileContext = sb.toString();
 
         fileContext = super.replaceTemplateContext(fileContext, data);
@@ -76,7 +76,7 @@ public class GeneratorApiListener extends BaseGenerator {
      * @param data
      */
     private void genneratorISaveBmo(Data data) throws Exception {
-        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/ISaveBMO.java").getFile());
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/ISaveBMO.txt").getFile());
         String fileContext = sb.toString();
 
         fileContext = super.replaceTemplateContext(fileContext, data);
@@ -98,7 +98,7 @@ public class GeneratorApiListener extends BaseGenerator {
      * @param data
      */
     private void genneratorSaveBmoImpl(Data data) throws Exception {
-        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/SaveBMOImpl.java").getFile());
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/SaveBMOImpl.txt").getFile());
         String fileContext = sb.toString();
         fileContext = fileContext.replace("@@shareName@@", data.getShareName())
                 .replace("@@ShareName@@", toUpperCaseFirstOne(data.getShareName()));
@@ -123,7 +123,7 @@ public class GeneratorApiListener extends BaseGenerator {
      * @param data
      */
     private void genneratorIUpdateBmo(Data data) throws Exception {
-        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/IUpdateBMO.java").getFile());
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/IUpdateBMO.txt").getFile());
         String fileContext = sb.toString();
 
         fileContext = super.replaceTemplateContext(fileContext, data);
@@ -145,7 +145,7 @@ public class GeneratorApiListener extends BaseGenerator {
      * @param data
      */
     private void genneratorUpdateBmoImpl(Data data) throws Exception {
-        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/UpdateBMOImpl.java").getFile());
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/UpdateBMOImpl.txt").getFile());
         String fileContext = sb.toString();
         fileContext = fileContext.replace("@@shareName@@", data.getShareName())
                 .replace("@@ShareName@@", toUpperCaseFirstOne(data.getShareName()));
@@ -169,7 +169,7 @@ public class GeneratorApiListener extends BaseGenerator {
      * @param data
      */
     private void genneratorIDeleteBmo(Data data) throws Exception {
-        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/IDeleteBMO.java").getFile());
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/IDeleteBMO.txt").getFile());
         String fileContext = sb.toString();
 
         fileContext = super.replaceTemplateContext(fileContext, data);
@@ -191,7 +191,7 @@ public class GeneratorApiListener extends BaseGenerator {
      * @param data
      */
     private void genneratorDeleteBmoImpl(Data data) throws Exception {
-        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/DeleteBMOImpl.java").getFile());
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/DeleteBMOImpl.txt").getFile());
         String fileContext = sb.toString();
         fileContext = fileContext.replace("@@shareName@@", data.getShareName())
                 .replace("@@ShareName@@", toUpperCaseFirstOne(data.getShareName()));
@@ -215,7 +215,7 @@ public class GeneratorApiListener extends BaseGenerator {
      * @param data
      */
     private void genneratorIGetBmo(Data data) throws Exception {
-        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/IGetBMO.java").getFile());
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/IGetBMO.txt").getFile());
         String fileContext = sb.toString();
 
         fileContext = super.replaceTemplateContext(fileContext, data);
@@ -237,7 +237,7 @@ public class GeneratorApiListener extends BaseGenerator {
      * @param data
      */
     private void genneratorGetBmoImpl(Data data) throws Exception {
-        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/GetBMOImpl.java").getFile());
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/GetBMOImpl.txt").getFile());
         String fileContext = sb.toString();
         fileContext = fileContext.replace("@@shareName@@", data.getShareName())
                 .replace("@@ShareName@@", toUpperCaseFirstOne(data.getShareName()));
@@ -256,7 +256,7 @@ public class GeneratorApiListener extends BaseGenerator {
     }
 
     private void genneratorApi(Data data) throws Exception {
-        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/Api.java").getFile());
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newTemplate/Api.txt").getFile());
         String fileContext = sb.toString();
         fileContext = fileContext.replace("@@shareName@@", data.getShareName())
                 .replace("@@ShareName@@", toUpperCaseFirstOne(data.getShareName()));

java110-generator/src/main/resources/newBack/template_1.json

@@ -1,59 +1,43 @@
 {
   "autoMove": true,
-  "id": "rId",
-  "name": "roomRenovation",
-  "desc": "装修申请",
+  "id": "detailId",
+  "name": "roomRenovationDetail",
+  "desc": "装修明细",
   "shareParam": "communityId",
   "shareColumn": "community_id",
   "shareName": "community",
-  "tableName": "room_renovation",
+  "tableName": "room_renovation_detail",
   "param": {
     "rId": "r_id",
-    "roomId": "room_id",
-    "roomName": "room_name",
+    "detailId": "detail_id",
     "communityId": "community_id",
     "statusCd": "status_cd",
-    "startTime": "start_time",
-    "endTime": "end_time",
-    "personName": "person_name",
-    "personTel": "person_tel",
+    "detailType": "detail_type",
+    "staffId": "staff_id",
+    "staffName": "staff_name",
     "state": "state",
-    "isViolation": "is_violation",
-    "violationDesc": "violation_desc",
     "remark": "remark"
   },
   "required": [
     {
-      "code": "roomId",
-      "msg": "房屋不能为空"
-    },
-    {
-      "code": "roomName",
-      "msg": "房屋不能为空"
+      "code": "rId",
+      "msg": "装修ID不能为空"
     },
     {
       "code": "communityId",
       "msg": "小区不能为空"
     },
     {
-      "code": "startTime",
-      "msg": "装修时间不能为空"
-    },
-    {
-      "code": "endTime",
-      "msg": "结束时间不能为空"
-    },
-    {
-      "code": "personName",
-      "msg": "联系人不能为空"
+      "code": "detailType",
+      "msg": "类型不能为空"
     },
     {
-      "code": "personTel",
-      "msg": "联系电话不能为空"
+      "code": "state",
+      "msg": "状态不能为空"
     },
     {
-      "code": "isViolation",
-      "msg": "是否违规不能为空"
+      "code": "remark",
+      "msg": "说明不能为空"
     }
   ]
 }

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

@@ -0,0 +1,53 @@
+package com.java110.intf.community;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.roomRenovationDetail.RoomRenovationDetailDto;
+import com.java110.po.roomRenovationDetail.RoomRenovationDetailPo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * @ClassName IRoomRenovationDetailInnerServiceSMO
+ * @Description 装修明细接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/roomRenovationDetailApi")
+public interface IRoomRenovationDetailInnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveRoomRenovationDetail", method = RequestMethod.POST)
+    public int saveRoomRenovationDetail(@RequestBody RoomRenovationDetailPo roomRenovationDetailPo);
+
+    @RequestMapping(value = "/updateRoomRenovationDetail", method = RequestMethod.POST)
+    public int updateRoomRenovationDetail(@RequestBody  RoomRenovationDetailPo roomRenovationDetailPo);
+
+    @RequestMapping(value = "/deleteRoomRenovationDetail", method = RequestMethod.POST)
+    public int deleteRoomRenovationDetail(@RequestBody  RoomRenovationDetailPo roomRenovationDetailPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param roomRenovationDetailDto 数据对象分享
+     * @return RoomRenovationDetailDto 对象数据
+     */
+    @RequestMapping(value = "/queryRoomRenovationDetails", method = RequestMethod.POST)
+    List<RoomRenovationDetailDto> queryRoomRenovationDetails(@RequestBody RoomRenovationDetailDto roomRenovationDetailDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param roomRenovationDetailDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryRoomRenovationDetailsCount", method = RequestMethod.POST)
+    int queryRoomRenovationDetailsCount(@RequestBody RoomRenovationDetailDto roomRenovationDetailDto);
+}

service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java

@@ -5,13 +5,20 @@ import com.java110.community.bmo.roomRenovation.IDeleteRoomRenovationBMO;
 import com.java110.community.bmo.roomRenovation.IGetRoomRenovationBMO;
 import com.java110.community.bmo.roomRenovation.ISaveRoomRenovationBMO;
 import com.java110.community.bmo.roomRenovation.IUpdateRoomRenovationBMO;
+import com.java110.community.bmo.roomRenovationDetail.IDeleteRoomRenovationDetailBMO;
+import com.java110.community.bmo.roomRenovationDetail.IGetRoomRenovationDetailBMO;
+import com.java110.community.bmo.roomRenovationDetail.ISaveRoomRenovationDetailBMO;
+import com.java110.community.bmo.roomRenovationDetail.IUpdateRoomRenovationDetailBMO;
 import com.java110.dto.roomRenovation.RoomRenovationDto;
+import com.java110.dto.roomRenovationDetail.RoomRenovationDetailDto;
 import com.java110.po.roomRenovation.RoomRenovationPo;
+import com.java110.po.roomRenovationDetail.RoomRenovationDetailPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -32,6 +39,16 @@ public class RoomRenovationApi {
     @Autowired
     private IGetRoomRenovationBMO getRoomRenovationBMOImpl;
 
+    @Autowired
+    private ISaveRoomRenovationDetailBMO saveRoomRenovationDetailBMOImpl;
+    @Autowired
+    private IUpdateRoomRenovationDetailBMO updateRoomRenovationDetailBMOImpl;
+    @Autowired
+    private IDeleteRoomRenovationDetailBMO deleteRoomRenovationDetailBMOImpl;
+
+    @Autowired
+    private IGetRoomRenovationDetailBMO getRoomRenovationDetailBMOImpl;
+
     /**
      * 微信保存消息模板
      *
@@ -122,4 +139,72 @@ public class RoomRenovationApi {
         roomRenovationDto.setCommunityId(communityId);
         return getRoomRenovationBMOImpl.get(roomRenovationDto);
     }
+
+
+    /**
+     * 微信保存消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /roomRenovation/saveRoomRenovationDetail
+     * @path /app/roomRenovation/saveRoomRenovationDetail
+     */
+    @RequestMapping(value = "/saveRoomRenovationDetail", method = RequestMethod.POST)
+    public ResponseEntity<String> saveRoomRenovationDetail(
+            @RequestHeader(value = "user-id") String userId,
+            @RequestHeader(value = "user-name") String userName,
+            @RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "rId", "请求报文中未包含rId");
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+        Assert.hasKeyAndValue(reqJson, "detailType", "请求报文中未包含detailType");
+        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
+        Assert.hasKeyAndValue(reqJson, "remark", "请求报文中未包含remark");
+
+        RoomRenovationDetailPo roomRenovationDetailPo = BeanConvertUtil.covertBean(reqJson, RoomRenovationDetailPo.class);
+        roomRenovationDetailPo.setStaffId(userId);
+        roomRenovationDetailPo.setStaffName(userName);
+        return saveRoomRenovationDetailBMOImpl.save(roomRenovationDetailPo);
+    }
+
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /roomRenovation/deleteRoomRenovationDetail
+     * @path /app/roomRenovation/deleteRoomRenovationDetail
+     */
+    @RequestMapping(value = "/deleteRoomRenovationDetail", method = RequestMethod.POST)
+    public ResponseEntity<String> deleteRoomRenovationDetail(@RequestBody JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+
+        Assert.hasKeyAndValue(reqJson, "detailId", "detailId不能为空");
+
+
+        RoomRenovationDetailPo roomRenovationDetailPo = BeanConvertUtil.covertBean(reqJson, RoomRenovationDetailPo.class);
+        return deleteRoomRenovationDetailBMOImpl.delete(roomRenovationDetailPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param communityId 小区ID
+     * @return
+     * @serviceCode /roomRenovation/queryRoomRenovationDetail
+     * @path /app/roomRenovation/queryRoomRenovationDetail
+     */
+    @RequestMapping(value = "/queryRoomRenovationDetail", method = RequestMethod.GET)
+    public ResponseEntity<String> queryRoomRenovationDetail(@RequestParam(value = "communityId") String communityId,
+                                                            @RequestParam(value = "page") int page,
+                                                            @RequestParam(value = "row") int row,
+                                                            @RequestParam(value = "rId") String rId) {
+        RoomRenovationDetailDto roomRenovationDetailDto = new RoomRenovationDetailDto();
+        roomRenovationDetailDto.setPage(page);
+        roomRenovationDetailDto.setRow(row);
+        roomRenovationDetailDto.setCommunityId(communityId);
+        roomRenovationDetailDto.setrId(rId);
+        return getRoomRenovationDetailBMOImpl.get(roomRenovationDetailDto);
+    }
 }

service-community/src/main/java/com/java110/community/bmo/roomRenovationDetail/IDeleteRoomRenovationDetailBMO.java

@@ -0,0 +1,17 @@
+package com.java110.community.bmo.roomRenovationDetail;
+import com.java110.po.roomRenovationDetail.RoomRenovationDetailPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IDeleteRoomRenovationDetailBMO {
+
+
+    /**
+     * 修改装修明细
+     * add by wuxw
+     * @param roomRenovationDetailPo
+     * @return
+     */
+    ResponseEntity<String> delete(RoomRenovationDetailPo roomRenovationDetailPo);
+
+
+}

service-community/src/main/java/com/java110/community/bmo/roomRenovationDetail/IGetRoomRenovationDetailBMO.java

@@ -0,0 +1,16 @@
+package com.java110.community.bmo.roomRenovationDetail;
+import com.java110.dto.roomRenovationDetail.RoomRenovationDetailDto;
+import org.springframework.http.ResponseEntity;
+public interface IGetRoomRenovationDetailBMO {
+
+
+    /**
+     * 查询装修明细
+     * add by wuxw
+     * @param  roomRenovationDetailDto
+     * @return
+     */
+    ResponseEntity<String> get(RoomRenovationDetailDto roomRenovationDetailDto);
+
+
+}

service-community/src/main/java/com/java110/community/bmo/roomRenovationDetail/ISaveRoomRenovationDetailBMO.java

@@ -0,0 +1,17 @@
+package com.java110.community.bmo.roomRenovationDetail;
+
+import com.java110.po.roomRenovationDetail.RoomRenovationDetailPo;
+import org.springframework.http.ResponseEntity;
+public interface ISaveRoomRenovationDetailBMO {
+
+
+    /**
+     * 添加装修明细
+     * add by wuxw
+     * @param roomRenovationDetailPo
+     * @return
+     */
+    ResponseEntity<String> save(RoomRenovationDetailPo roomRenovationDetailPo);
+
+
+}

service-community/src/main/java/com/java110/community/bmo/roomRenovationDetail/IUpdateRoomRenovationDetailBMO.java

@@ -0,0 +1,19 @@
+package com.java110.community.bmo.roomRenovationDetail;
+
+import com.java110.po.roomRenovationDetail.RoomRenovationDetailPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IUpdateRoomRenovationDetailBMO {
+
+
+    /**
+     * 修改装修明细
+     * add by wuxw
+     *
+     * @param roomRenovationDetailPo
+     * @return
+     */
+    ResponseEntity<String> update(RoomRenovationDetailPo roomRenovationDetailPo);
+
+
+}

service-community/src/main/java/com/java110/community/bmo/roomRenovationDetail/impl/DeleteRoomRenovationDetailBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.community.bmo.roomRenovationDetail.impl;
+
+import com.java110.community.bmo.roomRenovationDetail.IDeleteRoomRenovationDetailBMO;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.intf.community.IRoomRenovationDetailInnerServiceSMO;
+import com.java110.po.roomRenovationDetail.RoomRenovationDetailPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("deleteRoomRenovationDetailBMOImpl")
+public class DeleteRoomRenovationDetailBMOImpl implements IDeleteRoomRenovationDetailBMO {
+
+    @Autowired
+    private IRoomRenovationDetailInnerServiceSMO roomRenovationDetailInnerServiceSMOImpl;
+
+    /**
+     * @param roomRenovationDetailPo 数据
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> delete(RoomRenovationDetailPo roomRenovationDetailPo) {
+
+        int flag = roomRenovationDetailInnerServiceSMOImpl.deleteRoomRenovationDetail(roomRenovationDetailPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-community/src/main/java/com/java110/community/bmo/roomRenovationDetail/impl/GetRoomRenovationDetailBMOImpl.java

@@ -0,0 +1,44 @@
+package com.java110.community.bmo.roomRenovationDetail.impl;
+
+import com.java110.community.bmo.roomRenovationDetail.IGetRoomRenovationDetailBMO;
+import com.java110.dto.roomRenovationDetail.RoomRenovationDetailDto;
+import com.java110.intf.community.IRoomRenovationDetailInnerServiceSMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service("getRoomRenovationDetailBMOImpl")
+public class GetRoomRenovationDetailBMOImpl implements IGetRoomRenovationDetailBMO {
+
+    @Autowired
+    private IRoomRenovationDetailInnerServiceSMO roomRenovationDetailInnerServiceSMOImpl;
+
+    /**
+     * @param roomRenovationDetailDto
+     * @return 订单服务能够接受的报文
+     */
+    public ResponseEntity<String> get(RoomRenovationDetailDto roomRenovationDetailDto) {
+
+
+        int count = roomRenovationDetailInnerServiceSMOImpl.queryRoomRenovationDetailsCount(roomRenovationDetailDto);
+
+        List<RoomRenovationDetailDto> roomRenovationDetailDtos = null;
+        if (count > 0) {
+            roomRenovationDetailDtos = roomRenovationDetailInnerServiceSMOImpl.queryRoomRenovationDetails(roomRenovationDetailDto);
+        } else {
+            roomRenovationDetailDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) roomRenovationDetailDto.getRow()), count, roomRenovationDetailDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
+}

service-community/src/main/java/com/java110/community/bmo/roomRenovationDetail/impl/SaveRoomRenovationDetailBMOImpl.java

@@ -0,0 +1,38 @@
+package com.java110.community.bmo.roomRenovationDetail.impl;
+
+import com.java110.community.bmo.roomRenovationDetail.ISaveRoomRenovationDetailBMO;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.community.IRoomRenovationDetailInnerServiceSMO;
+import com.java110.po.roomRenovationDetail.RoomRenovationDetailPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("saveRoomRenovationDetailBMOImpl")
+public class SaveRoomRenovationDetailBMOImpl implements ISaveRoomRenovationDetailBMO {
+
+    @Autowired
+    private IRoomRenovationDetailInnerServiceSMO roomRenovationDetailInnerServiceSMOImpl;
+
+    /**
+     * 添加小区信息
+     *
+     * @param roomRenovationDetailPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> save(RoomRenovationDetailPo roomRenovationDetailPo) {
+
+        roomRenovationDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
+        int flag = roomRenovationDetailInnerServiceSMOImpl.saveRoomRenovationDetail(roomRenovationDetailPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-community/src/main/java/com/java110/community/bmo/roomRenovationDetail/impl/UpdateRoomRenovationDetailBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.community.bmo.roomRenovationDetail.impl;
+
+import com.java110.community.bmo.roomRenovationDetail.IUpdateRoomRenovationDetailBMO;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.intf.community.IRoomRenovationDetailInnerServiceSMO;
+import com.java110.po.roomRenovationDetail.RoomRenovationDetailPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("updateRoomRenovationDetailBMOImpl")
+public class UpdateRoomRenovationDetailBMOImpl implements IUpdateRoomRenovationDetailBMO {
+
+    @Autowired
+    private IRoomRenovationDetailInnerServiceSMO roomRenovationDetailInnerServiceSMOImpl;
+
+    /**
+     * @param roomRenovationDetailPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> update(RoomRenovationDetailPo roomRenovationDetailPo) {
+
+        int flag = roomRenovationDetailInnerServiceSMOImpl.updateRoomRenovationDetail(roomRenovationDetailPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

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

@@ -0,0 +1,61 @@
+package com.java110.community.dao;
+
+
+import com.java110.utils.exception.DAOException;
+import com.java110.entity.merchant.BoMerchant;
+import com.java110.entity.merchant.BoMerchantAttr;
+import com.java110.entity.merchant.Merchant;
+import com.java110.entity.merchant.MerchantAttr;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 装修明细组件内部之间使用，没有给外围系统提供服务能力
+ * 装修明细服务接口类，要求全部以字符串传输，方便微服务化
+ * 新建客户，修改客户，删除客户，查询客户等功能
+ *
+ * Created by wuxw on 2016/12/27.
+ */
+public interface IRoomRenovationDetailServiceDao {
+
+
+    /**
+     * 保存 装修明细信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void saveRoomRenovationDetailInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询装修明细信息（instance过程）
+     * 根据bId 查询装修明细信息
+     * @param info bId 信息
+     * @return 装修明细信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getRoomRenovationDetailInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改装修明细信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updateRoomRenovationDetailInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询装修明细总数
+     *
+     * @param info 装修明细信息
+     * @return 装修明细数量
+     */
+    int queryRoomRenovationDetailsCount(Map info);
+
+}

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

@@ -0,0 +1,98 @@
+package com.java110.community.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.IRoomRenovationDetailServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 装修明细服务 与数据库交互
+ * Created by wuxw on 2017/4/5.
+ */
+@Service("roomRenovationDetailServiceDaoImpl")
+//@Transactional
+public class RoomRenovationDetailServiceDaoImpl extends BaseServiceDao implements IRoomRenovationDetailServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(RoomRenovationDetailServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存装修明细信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveRoomRenovationDetailInfo(Map info) throws DAOException {
+        logger.debug("保存装修明细信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("roomRenovationDetailServiceDaoImpl.saveRoomRenovationDetailInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存装修明细信息Instance数据失败："+ JSONObject.toJSONString(info));
+        }
+    }
+
+
+    /**
+     * 查询装修明细信息（instance）
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getRoomRenovationDetailInfo(Map info) throws DAOException {
+        logger.debug("查询装修明细信息 入参 info : {}",info);
+
+        List<Map> businessRoomRenovationDetailInfos = sqlSessionTemplate.selectList("roomRenovationDetailServiceDaoImpl.getRoomRenovationDetailInfo",info);
+
+        return businessRoomRenovationDetailInfos;
+    }
+
+
+    /**
+     * 修改装修明细信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updateRoomRenovationDetailInfo(Map info) throws DAOException {
+        logger.debug("修改装修明细信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("roomRenovationDetailServiceDaoImpl.updateRoomRenovationDetailInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改装修明细信息Instance数据失败："+ JSONObject.toJSONString(info));
+        }
+    }
+
+     /**
+     * 查询装修明细数量
+     * @param info 装修明细信息
+     * @return 装修明细数量
+     */
+    @Override
+    public int queryRoomRenovationDetailsCount(Map info) {
+        logger.debug("查询装修明细数据 入参 info : {}",info);
+
+        List<Map> businessRoomRenovationDetailInfos = sqlSessionTemplate.selectList("roomRenovationDetailServiceDaoImpl.queryRoomRenovationDetailsCount", info);
+        if (businessRoomRenovationDetailInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessRoomRenovationDetailInfos.get(0).get("count").toString());
+    }
+
+
+}

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

@@ -0,0 +1,83 @@
+package com.java110.community.smo.impl;
+
+
+import com.java110.community.dao.IRoomRenovationDetailServiceDao;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.roomRenovationDetail.RoomRenovationDetailDto;
+import com.java110.intf.community.IRoomRenovationDetailInnerServiceSMO;
+import com.java110.po.roomRenovationDetail.RoomRenovationDetailPo;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @ClassName FloorInnerServiceSMOImpl
+ * @Description 装修明细内部服务实现类
+ * @Author wuxw
+ * @Date 2019/4/24 9:20
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@RestController
+public class RoomRenovationDetailInnerServiceSMOImpl extends BaseServiceSMO implements IRoomRenovationDetailInnerServiceSMO {
+
+    @Autowired
+    private IRoomRenovationDetailServiceDao roomRenovationDetailServiceDaoImpl;
+
+
+    @Override
+    public int saveRoomRenovationDetail(@RequestBody RoomRenovationDetailPo roomRenovationDetailPo) {
+        int saveFlag = 1;
+        roomRenovationDetailServiceDaoImpl.saveRoomRenovationDetailInfo(BeanConvertUtil.beanCovertMap(roomRenovationDetailPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int updateRoomRenovationDetail(@RequestBody RoomRenovationDetailPo roomRenovationDetailPo) {
+        int saveFlag = 1;
+        roomRenovationDetailServiceDaoImpl.updateRoomRenovationDetailInfo(BeanConvertUtil.beanCovertMap(roomRenovationDetailPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int deleteRoomRenovationDetail(@RequestBody RoomRenovationDetailPo roomRenovationDetailPo) {
+        int saveFlag = 1;
+        roomRenovationDetailPo.setStatusCd("1");
+        roomRenovationDetailServiceDaoImpl.updateRoomRenovationDetailInfo(BeanConvertUtil.beanCovertMap(roomRenovationDetailPo));
+        return saveFlag;
+    }
+
+    @Override
+    public List<RoomRenovationDetailDto> queryRoomRenovationDetails(@RequestBody RoomRenovationDetailDto roomRenovationDetailDto) {
+
+        //校验是否传了 分页信息
+
+        int page = roomRenovationDetailDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            roomRenovationDetailDto.setPage((page - 1) * roomRenovationDetailDto.getRow());
+        }
+
+        List<RoomRenovationDetailDto> roomRenovationDetails = BeanConvertUtil.covertBeanList(roomRenovationDetailServiceDaoImpl.getRoomRenovationDetailInfo(BeanConvertUtil.beanCovertMap(roomRenovationDetailDto)), RoomRenovationDetailDto.class);
+
+        return roomRenovationDetails;
+    }
+
+
+    @Override
+    public int queryRoomRenovationDetailsCount(@RequestBody RoomRenovationDetailDto roomRenovationDetailDto) {
+        return roomRenovationDetailServiceDaoImpl.queryRoomRenovationDetailsCount(BeanConvertUtil.beanCovertMap(roomRenovationDetailDto));
+    }
+
+    public IRoomRenovationDetailServiceDao getRoomRenovationDetailServiceDaoImpl() {
+        return roomRenovationDetailServiceDaoImpl;
+    }
+
+    public void setRoomRenovationDetailServiceDaoImpl(IRoomRenovationDetailServiceDao roomRenovationDetailServiceDaoImpl) {
+        this.roomRenovationDetailServiceDaoImpl = roomRenovationDetailServiceDaoImpl;
+    }
+}