Przeglądaj źródła

房屋装修 功能开发中

java110 5 lat temu
rodzic
commit
eb5e611647
18 zmienionych plików z 1074 dodań i 19 usunięć
  1. 125 0
      java110-bean/src/main/java/com/java110/dto/roomRenovation/RoomRenovationDto.java
  2. 102 0
      java110-bean/src/main/java/com/java110/po/roomRenovation/RoomRenovationPo.java
  3. 1 0
      java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java
  4. 169 0
      java110-db/src/main/resources/mapper/community/RoomRenovationServiceDaoImplMapper.xml
  5. 46 19
      java110-generator/src/main/resources/newBack/template_1.json
  6. 53 0
      java110-interface/src/main/java/com/java110/intf/community/IRoomRenovationInnerServiceSMO.java
  7. 119 0
      service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
  8. 17 0
      service-community/src/main/java/com/java110/community/bmo/roomRenovation/IDeleteRoomRenovationBMO.java
  9. 16 0
      service-community/src/main/java/com/java110/community/bmo/roomRenovation/IGetRoomRenovationBMO.java
  10. 17 0
      service-community/src/main/java/com/java110/community/bmo/roomRenovation/ISaveRoomRenovationBMO.java
  11. 17 0
      service-community/src/main/java/com/java110/community/bmo/roomRenovation/IUpdateRoomRenovationBMO.java
  12. 34 0
      service-community/src/main/java/com/java110/community/bmo/roomRenovation/impl/DeleteRoomRenovationBMOImpl.java
  13. 44 0
      service-community/src/main/java/com/java110/community/bmo/roomRenovation/impl/GetRoomRenovationBMOImpl.java
  14. 38 0
      service-community/src/main/java/com/java110/community/bmo/roomRenovation/impl/SaveRoomRenovationBMOImpl.java
  15. 34 0
      service-community/src/main/java/com/java110/community/bmo/roomRenovation/impl/UpdateRoomRenovationBMOImpl.java
  16. 61 0
      service-community/src/main/java/com/java110/community/dao/IRoomRenovationServiceDao.java
  17. 98 0
      service-community/src/main/java/com/java110/community/dao/impl/RoomRenovationServiceDaoImpl.java
  18. 83 0
      service-community/src/main/java/com/java110/community/smo/impl/RoomRenovationInnerServiceSMOImpl.java

+ 125 - 0
java110-bean/src/main/java/com/java110/dto/roomRenovation/RoomRenovationDto.java

@@ -0,0 +1,125 @@
+package com.java110.dto.roomRenovation;
+
+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 RoomRenovationDto extends PageDto implements Serializable {
+
+    private String remark;
+private String isViolation;
+private String rId;
+private String roomId;
+private String roomName;
+private String personName;
+private String violationDesc;
+private String startTime;
+private String endTime;
+private String state;
+private String communityId;
+private String personTel;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getRemark() {
+        return remark;
+    }
+public void setRemark(String remark) {
+        this.remark = remark;
+    }
+public String getIsViolation() {
+        return isViolation;
+    }
+public void setIsViolation(String isViolation) {
+        this.isViolation = isViolation;
+    }
+public String getRId() {
+        return rId;
+    }
+public void setRId(String rId) {
+        this.rId = rId;
+    }
+public String getRoomId() {
+        return roomId;
+    }
+public void setRoomId(String roomId) {
+        this.roomId = roomId;
+    }
+public String getRoomName() {
+        return roomName;
+    }
+public void setRoomName(String roomName) {
+        this.roomName = roomName;
+    }
+public String getPersonName() {
+        return personName;
+    }
+public void setPersonName(String personName) {
+        this.personName = personName;
+    }
+public String getViolationDesc() {
+        return violationDesc;
+    }
+public void setViolationDesc(String violationDesc) {
+        this.violationDesc = violationDesc;
+    }
+public String getStartTime() {
+        return startTime;
+    }
+public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+public String getEndTime() {
+        return endTime;
+    }
+public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+public String getState() {
+        return state;
+    }
+public void setState(String state) {
+        this.state = state;
+    }
+public String getCommunityId() {
+        return communityId;
+    }
+public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+public String getPersonTel() {
+        return personTel;
+    }
+public void setPersonTel(String personTel) {
+        this.personTel = personTel;
+    }
+
+
+    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;
+    }
+}

+ 102 - 0
java110-bean/src/main/java/com/java110/po/roomRenovation/RoomRenovationPo.java

@@ -0,0 +1,102 @@
+package com.java110.po.roomRenovation;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class RoomRenovationPo implements Serializable {
+
+    private String statusCd = "0";
+private String remark;
+private String isViolation;
+private String rId;
+private String roomId;
+private String roomName;
+private String personName;
+private String violationDesc;
+private String startTime;
+private String endTime;
+private String state;
+private String communityId;
+private String personTel;
+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 getIsViolation() {
+        return isViolation;
+    }
+public void setIsViolation(String isViolation) {
+        this.isViolation = isViolation;
+    }
+public String getRId() {
+        return rId;
+    }
+public void setRId(String rId) {
+        this.rId = rId;
+    }
+public String getRoomId() {
+        return roomId;
+    }
+public void setRoomId(String roomId) {
+        this.roomId = roomId;
+    }
+public String getRoomName() {
+        return roomName;
+    }
+public void setRoomName(String roomName) {
+        this.roomName = roomName;
+    }
+public String getPersonName() {
+        return personName;
+    }
+public void setPersonName(String personName) {
+        this.personName = personName;
+    }
+public String getViolationDesc() {
+        return violationDesc;
+    }
+public void setViolationDesc(String violationDesc) {
+        this.violationDesc = violationDesc;
+    }
+public String getStartTime() {
+        return startTime;
+    }
+public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+public String getEndTime() {
+        return endTime;
+    }
+public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+public String getState() {
+        return state;
+    }
+public void setState(String state) {
+        this.state = state;
+    }
+public String getCommunityId() {
+        return communityId;
+    }
+public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+public String getPersonTel() {
+        return personTel;
+    }
+public void setPersonTel(String personTel) {
+        this.personTel = personTel;
+    }
+
+
+
+}

+ 1 - 0
java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -179,6 +179,7 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_ardId = "14";
     public static final String CODE_PREFIX_applyType = "15";
     public static final String CODE_PREFIX_classesId = "16";
+    public static final String CODE_PREFIX_rId = "17";
 
 
     /**

+ 169 - 0
java110-db/src/main/resources/mapper/community/RoomRenovationServiceDaoImplMapper.xml

@@ -0,0 +1,169 @@
+<?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="roomRenovationServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存装修申请信息 add by wuxw 2018-07-03 -->
+    <insert id="saveRoomRenovationInfo" parameterType="Map">
+        insert into room_renovation(
+remark,is_violation,r_id,room_id,room_name,person_name,violation_desc,start_time,end_time,state,community_id,person_tel
+) values (
+#{remark},#{isViolation},#{rId},#{roomId},#{roomName},#{personName},#{violationDesc},#{startTime},#{endTime},#{state},#{communityId},#{personTel}
+)
+    </insert>
+
+
+
+    <!-- 查询装修申请信息 add by wuxw 2018-07-03 -->
+    <select id="getRoomRenovationInfo" parameterType="Map" resultType="Map">
+        select  t.status_cd,t.status_cd statusCd,t.remark,t.is_violation,t.is_violation isViolation,t.r_id,t.r_id rId,t.room_id,t.room_id roomId,t.room_name,t.room_name roomName,t.person_name,t.person_name personName,t.violation_desc,t.violation_desc violationDesc,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.state,t.community_id,t.community_id communityId,t.person_tel,t.person_tel personTel 
+from room_renovation t 
+where 1 =1 
+<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="isViolation !=null and isViolation != ''">
+   and t.is_violation= #{isViolation}
+</if> 
+<if test="rId !=null and rId != ''">
+   and t.r_id= #{rId}
+</if> 
+<if test="roomId !=null and roomId != ''">
+   and t.room_id= #{roomId}
+</if> 
+<if test="roomName !=null and roomName != ''">
+   and t.room_name= #{roomName}
+</if> 
+<if test="personName !=null and personName != ''">
+   and t.person_name= #{personName}
+</if> 
+<if test="violationDesc !=null and violationDesc != ''">
+   and t.violation_desc= #{violationDesc}
+</if> 
+<if test="startTime !=null and startTime != ''">
+   and t.start_time= #{startTime}
+</if> 
+<if test="endTime !=null and endTime != ''">
+   and t.end_time= #{endTime}
+</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="personTel !=null and personTel != ''">
+   and t.person_tel= #{personTel}
+</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="updateRoomRenovationInfo" parameterType="Map">
+        update  room_renovation 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="isViolation !=null and isViolation != ''">
+, t.is_violation= #{isViolation}
+</if> 
+<if test="roomId !=null and roomId != ''">
+, t.room_id= #{roomId}
+</if> 
+<if test="roomName !=null and roomName != ''">
+, t.room_name= #{roomName}
+</if> 
+<if test="personName !=null and personName != ''">
+, t.person_name= #{personName}
+</if> 
+<if test="violationDesc !=null and violationDesc != ''">
+, t.violation_desc= #{violationDesc}
+</if> 
+<if test="startTime !=null and startTime != ''">
+, t.start_time= #{startTime}
+</if> 
+<if test="endTime !=null and endTime != ''">
+, t.end_time= #{endTime}
+</if> 
+<if test="state !=null and state != ''">
+, t.state= #{state}
+</if> 
+<if test="communityId !=null and communityId != ''">
+, t.community_id= #{communityId}
+</if> 
+<if test="personTel !=null and personTel != ''">
+, t.person_tel= #{personTel}
+</if> 
+ where 1=1 <if test="rId !=null and rId != ''">
+and t.r_id= #{rId}
+</if> 
+
+    </update>
+
+    <!-- 查询装修申请数量 add by wuxw 2018-07-03 -->
+     <select id="queryRoomRenovationsCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from room_renovation t 
+where 1 =1 
+<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="isViolation !=null and isViolation != ''">
+   and t.is_violation= #{isViolation}
+</if> 
+<if test="rId !=null and rId != ''">
+   and t.r_id= #{rId}
+</if> 
+<if test="roomId !=null and roomId != ''">
+   and t.room_id= #{roomId}
+</if> 
+<if test="roomName !=null and roomName != ''">
+   and t.room_name= #{roomName}
+</if> 
+<if test="personName !=null and personName != ''">
+   and t.person_name= #{personName}
+</if> 
+<if test="violationDesc !=null and violationDesc != ''">
+   and t.violation_desc= #{violationDesc}
+</if> 
+<if test="startTime !=null and startTime != ''">
+   and t.start_time= #{startTime}
+</if> 
+<if test="endTime !=null and endTime != ''">
+   and t.end_time= #{endTime}
+</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="personTel !=null and personTel != ''">
+   and t.person_tel= #{personTel}
+</if> 
+
+
+     </select>
+
+</mapper>

+ 46 - 19
java110-generator/src/main/resources/newBack/template_1.json

@@ -1,32 +1,59 @@
 {
   "autoMove": true,
-  "id": "attrId",
-  "name": "attendanceClassesAttr",
-  "desc": "考勤班组属性",
-  "shareParam": "storeId",
-  "shareColumn": "store_id",
-  "shareName": "common",
-  "tableName": "contract_attr",
+  "id": "rId",
+  "name": "roomRenovation",
+  "desc": "装修申请",
+  "shareParam": "communityId",
+  "shareColumn": "community_id",
+  "shareName": "community",
+  "tableName": "room_renovation",
   "param": {
-    "storeId": "store_id",
-    "contractId": "contract_id",
-    "attrId": "attr_id",
-    "specCd": "spec_cd",
-    "value": "value",
-    "statusCd": "status_cd"
+    "rId": "r_id",
+    "roomId": "room_id",
+    "roomName": "room_name",
+    "communityId": "community_id",
+    "statusCd": "status_cd",
+    "startTime": "start_time",
+    "endTime": "end_time",
+    "personName": "person_name",
+    "personTel": "person_tel",
+    "state": "state",
+    "isViolation": "is_violation",
+    "violationDesc": "violation_desc",
+    "remark": "remark"
   },
   "required": [
     {
-      "code": "contractId",
-      "msg": "合同ID不能为空"
+      "code": "roomId",
+      "msg": "房屋不能为空"
     },
     {
-      "code": "storeId",
-      "msg": "商户ID不能为空"
+      "code": "roomName",
+      "msg": "房屋不能为空"
     },
     {
-      "code": "specCd",
-      "msg": "用户规格不能为空"
+      "code": "communityId",
+      "msg": "小区不能为空"
+    },
+    {
+      "code": "startTime",
+      "msg": "装修时间不能为空"
+    },
+    {
+      "code": "endTime",
+      "msg": "结束时间不能为空"
+    },
+    {
+      "code": "personName",
+      "msg": "联系人不能为空"
+    },
+    {
+      "code": "personTel",
+      "msg": "联系电话不能为空"
+    },
+    {
+      "code": "isViolation",
+      "msg": "是否违规不能为空"
     }
   ]
 }

+ 53 - 0
java110-interface/src/main/java/com/java110/intf/community/IRoomRenovationInnerServiceSMO.java

@@ -0,0 +1,53 @@
+package com.java110.intf;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.roomRenovation.RoomRenovationDto;
+import com.java110.po.roomRenovation.RoomRenovationPo;
+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 IRoomRenovationInnerServiceSMO
+ * @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("/roomRenovationApi")
+public interface IRoomRenovationInnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveRoomRenovation", method = RequestMethod.POST)
+    public int saveRoomRenovation(@RequestBody RoomRenovationPo roomRenovationPo);
+
+    @RequestMapping(value = "/updateRoomRenovation", method = RequestMethod.POST)
+    public int updateRoomRenovation(@RequestBody  RoomRenovationPo roomRenovationPo);
+
+    @RequestMapping(value = "/deleteRoomRenovation", method = RequestMethod.POST)
+    public int deleteRoomRenovation(@RequestBody  RoomRenovationPo roomRenovationPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param roomRenovationDto 数据对象分享
+     * @return RoomRenovationDto 对象数据
+     */
+    @RequestMapping(value = "/queryRoomRenovations", method = RequestMethod.POST)
+    List<RoomRenovationDto> queryRoomRenovations(@RequestBody RoomRenovationDto roomRenovationDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param roomRenovationDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryRoomRenovationsCount", method = RequestMethod.POST)
+    int queryRoomRenovationsCount(@RequestBody RoomRenovationDto roomRenovationDto);
+}

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

@@ -0,0 +1,119 @@
+package com.java110.community.api;
+
+import com.alibaba.fastjson.JSONObject;
+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.dto.roomRenovation.RoomRenovationDto;
+import com.java110.po.roomRenovation.RoomRenovationPo;
+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.*;
+
+
+@RestController
+@RequestMapping(value = "/roomRenovation")
+public class RoomRenovationApi {
+
+    @Autowired
+    private ISaveRoomRenovationBMO saveRoomRenovationBMOImpl;
+    @Autowired
+    private IUpdateRoomRenovationBMO updateRoomRenovationBMOImpl;
+    @Autowired
+    private IDeleteRoomRenovationBMO deleteRoomRenovationBMOImpl;
+
+    @Autowired
+    private IGetRoomRenovationBMO getRoomRenovationBMOImpl;
+
+    /**
+     * 微信保存消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /roomRenovation/saveRoomRenovation
+     * @path /app/roomRenovation/saveRoomRenovation
+     */
+    @RequestMapping(value = "/saveRoomRenovation", method = RequestMethod.POST)
+    public ResponseEntity<String> saveRoomRenovation(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "roomId", "请求报文中未包含roomId");
+        Assert.hasKeyAndValue(reqJson, "roomName", "请求报文中未包含roomName");
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
+        Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含endTime");
+        Assert.hasKeyAndValue(reqJson, "personName", "请求报文中未包含personName");
+        Assert.hasKeyAndValue(reqJson, "personTel", "请求报文中未包含personTel");
+        Assert.hasKeyAndValue(reqJson, "isViolation", "请求报文中未包含isViolation");
+
+
+        RoomRenovationPo roomRenovationPo = BeanConvertUtil.covertBean(reqJson, RoomRenovationPo.class);
+        return saveRoomRenovationBMOImpl.save(roomRenovationPo);
+    }
+
+    /**
+     * 微信修改消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /roomRenovation/updateRoomRenovation
+     * @path /app/roomRenovation/updateRoomRenovation
+     */
+    @RequestMapping(value = "/updateRoomRenovation", method = RequestMethod.POST)
+    public ResponseEntity<String> updateRoomRenovation(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "roomId", "请求报文中未包含roomId");
+        Assert.hasKeyAndValue(reqJson, "roomName", "请求报文中未包含roomName");
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
+        Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含endTime");
+        Assert.hasKeyAndValue(reqJson, "personName", "请求报文中未包含personName");
+        Assert.hasKeyAndValue(reqJson, "personTel", "请求报文中未包含personTel");
+        Assert.hasKeyAndValue(reqJson, "isViolation", "请求报文中未包含isViolation");
+        Assert.hasKeyAndValue(reqJson, "rId", "rId不能为空");
+
+
+        RoomRenovationPo roomRenovationPo = BeanConvertUtil.covertBean(reqJson, RoomRenovationPo.class);
+        return updateRoomRenovationBMOImpl.update(roomRenovationPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /roomRenovation/deleteRoomRenovation
+     * @path /app/roomRenovation/deleteRoomRenovation
+     */
+    @RequestMapping(value = "/deleteRoomRenovation", method = RequestMethod.POST)
+    public ResponseEntity<String> deleteRoomRenovation(@RequestBody JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+
+        Assert.hasKeyAndValue(reqJson, "rId", "rId不能为空");
+
+
+        RoomRenovationPo roomRenovationPo = BeanConvertUtil.covertBean(reqJson, RoomRenovationPo.class);
+        return deleteRoomRenovationBMOImpl.delete(roomRenovationPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param communityId 小区ID
+     * @return
+     * @serviceCode /roomRenovation/queryRoomRenovation
+     * @path /app/roomRenovation/queryRoomRenovation
+     */
+    @RequestMapping(value = "/queryRoomRenovation", method = RequestMethod.GET)
+    public ResponseEntity<String> queryRoomRenovation(@RequestParam(value = "communityId") String communityId,
+                                                      @RequestParam(value = "page") int page,
+                                                      @RequestParam(value = "row") int row) {
+        RoomRenovationDto roomRenovationDto = new RoomRenovationDto();
+        roomRenovationDto.setPage(page);
+        roomRenovationDto.setRow(row);
+        roomRenovationDto.setCommunityId(communityId);
+        return getRoomRenovationBMOImpl.get(roomRenovationDto);
+    }
+}

+ 17 - 0
service-community/src/main/java/com/java110/community/bmo/roomRenovation/IDeleteRoomRenovationBMO.java

@@ -0,0 +1,17 @@
+package com.java110.community.bmo.roomRenovation;
+import com.java110.po.roomRenovation.RoomRenovationPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IDeleteRoomRenovationBMO {
+
+
+    /**
+     * 修改装修申请
+     * add by wuxw
+     * @param roomRenovationPo
+     * @return
+     */
+    ResponseEntity<String> delete(RoomRenovationPo roomRenovationPo);
+
+
+}

+ 16 - 0
service-community/src/main/java/com/java110/community/bmo/roomRenovation/IGetRoomRenovationBMO.java

@@ -0,0 +1,16 @@
+package com.java110.community.bmo.roomRenovation;
+import com.java110.dto.roomRenovation.RoomRenovationDto;
+import org.springframework.http.ResponseEntity;
+public interface IGetRoomRenovationBMO {
+
+
+    /**
+     * 查询装修申请
+     * add by wuxw
+     * @param  roomRenovationDto
+     * @return
+     */
+    ResponseEntity<String> get(RoomRenovationDto roomRenovationDto);
+
+
+}

+ 17 - 0
service-community/src/main/java/com/java110/community/bmo/roomRenovation/ISaveRoomRenovationBMO.java

@@ -0,0 +1,17 @@
+package com.java110.community.bmo.roomRenovation;
+
+import com.java110.po.roomRenovation.RoomRenovationPo;
+import org.springframework.http.ResponseEntity;
+public interface ISaveRoomRenovationBMO {
+
+
+    /**
+     * 添加装修申请
+     * add by wuxw
+     * @param roomRenovationPo
+     * @return
+     */
+    ResponseEntity<String> save(RoomRenovationPo roomRenovationPo);
+
+
+}

+ 17 - 0
service-community/src/main/java/com/java110/community/bmo/roomRenovation/IUpdateRoomRenovationBMO.java

@@ -0,0 +1,17 @@
+package com.java110.community.bmo.roomRenovation;
+import com.java110.po.roomRenovation.RoomRenovationPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IUpdateRoomRenovationBMO {
+
+
+    /**
+     * 修改装修申请
+     * add by wuxw
+     * @param roomRenovationPo
+     * @return
+     */
+    ResponseEntity<String> update(RoomRenovationPo roomRenovationPo);
+
+
+}

+ 34 - 0
service-community/src/main/java/com/java110/community/bmo/roomRenovation/impl/DeleteRoomRenovationBMOImpl.java

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

+ 44 - 0
service-community/src/main/java/com/java110/community/bmo/roomRenovation/impl/GetRoomRenovationBMOImpl.java

@@ -0,0 +1,44 @@
+package com.java110.community.bmo.roomRenovation.impl;
+
+import com.java110.community.bmo.roomRenovation.IGetRoomRenovationBMO;
+import com.java110.dto.roomRenovation.RoomRenovationDto;
+import com.java110.intf.IRoomRenovationInnerServiceSMO;
+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("getRoomRenovationBMOImpl")
+public class GetRoomRenovationBMOImpl implements IGetRoomRenovationBMO {
+
+    @Autowired
+    private IRoomRenovationInnerServiceSMO roomRenovationInnerServiceSMOImpl;
+
+    /**
+     * @param roomRenovationDto
+     * @return 订单服务能够接受的报文
+     */
+    public ResponseEntity<String> get(RoomRenovationDto roomRenovationDto) {
+
+
+        int count = roomRenovationInnerServiceSMOImpl.queryRoomRenovationsCount(roomRenovationDto);
+
+        List<RoomRenovationDto> roomRenovationDtos = null;
+        if (count > 0) {
+            roomRenovationDtos = roomRenovationInnerServiceSMOImpl.queryRoomRenovations(roomRenovationDto);
+        } else {
+            roomRenovationDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) roomRenovationDto.getRow()), count, roomRenovationDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
+}

+ 38 - 0
service-community/src/main/java/com/java110/community/bmo/roomRenovation/impl/SaveRoomRenovationBMOImpl.java

@@ -0,0 +1,38 @@
+package com.java110.community.bmo.roomRenovation.impl;
+
+import com.java110.community.bmo.roomRenovation.ISaveRoomRenovationBMO;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.IRoomRenovationInnerServiceSMO;
+import com.java110.po.roomRenovation.RoomRenovationPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("saveRoomRenovationBMOImpl")
+public class SaveRoomRenovationBMOImpl implements ISaveRoomRenovationBMO {
+
+    @Autowired
+    private IRoomRenovationInnerServiceSMO roomRenovationInnerServiceSMOImpl;
+
+    /**
+     * 添加小区信息
+     *
+     * @param roomRenovationPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> save(RoomRenovationPo roomRenovationPo) {
+
+        roomRenovationPo.setRId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_rId));
+        int flag = roomRenovationInnerServiceSMOImpl.saveRoomRenovation(roomRenovationPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

+ 34 - 0
service-community/src/main/java/com/java110/community/bmo/roomRenovation/impl/UpdateRoomRenovationBMOImpl.java

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

+ 61 - 0
service-community/src/main/java/com/java110/community/dao/IRoomRenovationServiceDao.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 IRoomRenovationServiceDao {
+
+
+    /**
+     * 保存 装修申请信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void saveRoomRenovationInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询装修申请信息(instance过程)
+     * 根据bId 查询装修申请信息
+     * @param info bId 信息
+     * @return 装修申请信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getRoomRenovationInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改装修申请信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updateRoomRenovationInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询装修申请总数
+     *
+     * @param info 装修申请信息
+     * @return 装修申请数量
+     */
+    int queryRoomRenovationsCount(Map info);
+
+}

+ 98 - 0
service-community/src/main/java/com/java110/community/dao/impl/RoomRenovationServiceDaoImpl.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.IRoomRenovationServiceDao;
+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("roomRenovationServiceDaoImpl")
+//@Transactional
+public class RoomRenovationServiceDaoImpl extends BaseServiceDao implements IRoomRenovationServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(RoomRenovationServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存装修申请信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveRoomRenovationInfo(Map info) throws DAOException {
+        logger.debug("保存装修申请信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("roomRenovationServiceDaoImpl.saveRoomRenovationInfo",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> getRoomRenovationInfo(Map info) throws DAOException {
+        logger.debug("查询装修申请信息 入参 info : {}",info);
+
+        List<Map> businessRoomRenovationInfos = sqlSessionTemplate.selectList("roomRenovationServiceDaoImpl.getRoomRenovationInfo",info);
+
+        return businessRoomRenovationInfos;
+    }
+
+
+    /**
+     * 修改装修申请信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updateRoomRenovationInfo(Map info) throws DAOException {
+        logger.debug("修改装修申请信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("roomRenovationServiceDaoImpl.updateRoomRenovationInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改装修申请信息Instance数据失败:"+ JSONObject.toJSONString(info));
+        }
+    }
+
+     /**
+     * 查询装修申请数量
+     * @param info 装修申请信息
+     * @return 装修申请数量
+     */
+    @Override
+    public int queryRoomRenovationsCount(Map info) {
+        logger.debug("查询装修申请数据 入参 info : {}",info);
+
+        List<Map> businessRoomRenovationInfos = sqlSessionTemplate.selectList("roomRenovationServiceDaoImpl.queryRoomRenovationsCount", info);
+        if (businessRoomRenovationInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessRoomRenovationInfos.get(0).get("count").toString());
+    }
+
+
+}

+ 83 - 0
service-community/src/main/java/com/java110/community/smo/impl/RoomRenovationInnerServiceSMOImpl.java

@@ -0,0 +1,83 @@
+package com.java110.community.smo.impl;
+
+
+import com.java110.community.dao.IRoomRenovationServiceDao;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.roomRenovation.RoomRenovationDto;
+import com.java110.intf.IRoomRenovationInnerServiceSMO;
+import com.java110.po.roomRenovation.RoomRenovationPo;
+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 RoomRenovationInnerServiceSMOImpl extends BaseServiceSMO implements IRoomRenovationInnerServiceSMO {
+
+    @Autowired
+    private IRoomRenovationServiceDao roomRenovationServiceDaoImpl;
+
+
+    @Override
+    public int saveRoomRenovation(@RequestBody RoomRenovationPo roomRenovationPo) {
+        int saveFlag = 1;
+        roomRenovationServiceDaoImpl.saveRoomRenovationInfo(BeanConvertUtil.beanCovertMap(roomRenovationPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int updateRoomRenovation(@RequestBody RoomRenovationPo roomRenovationPo) {
+        int saveFlag = 1;
+        roomRenovationServiceDaoImpl.updateRoomRenovationInfo(BeanConvertUtil.beanCovertMap(roomRenovationPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int deleteRoomRenovation(@RequestBody RoomRenovationPo roomRenovationPo) {
+        int saveFlag = 1;
+        roomRenovationPo.setStatusCd("1");
+        roomRenovationServiceDaoImpl.updateRoomRenovationInfo(BeanConvertUtil.beanCovertMap(roomRenovationPo));
+        return saveFlag;
+    }
+
+    @Override
+    public List<RoomRenovationDto> queryRoomRenovations(@RequestBody RoomRenovationDto roomRenovationDto) {
+
+        //校验是否传了 分页信息
+
+        int page = roomRenovationDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            roomRenovationDto.setPage((page - 1) * roomRenovationDto.getRow());
+        }
+
+        List<RoomRenovationDto> roomRenovations = BeanConvertUtil.covertBeanList(roomRenovationServiceDaoImpl.getRoomRenovationInfo(BeanConvertUtil.beanCovertMap(roomRenovationDto)), RoomRenovationDto.class);
+
+        return roomRenovations;
+    }
+
+
+    @Override
+    public int queryRoomRenovationsCount(@RequestBody RoomRenovationDto roomRenovationDto) {
+        return roomRenovationServiceDaoImpl.queryRoomRenovationsCount(BeanConvertUtil.beanCovertMap(roomRenovationDto));
+    }
+
+    public IRoomRenovationServiceDao getRoomRenovationServiceDaoImpl() {
+        return roomRenovationServiceDaoImpl;
+    }
+
+    public void setRoomRenovationServiceDaoImpl(IRoomRenovationServiceDao roomRenovationServiceDaoImpl) {
+        this.roomRenovationServiceDaoImpl = roomRenovationServiceDaoImpl;
+    }
+}