Browse Source

优化代码

java110 5 years ago
parent
commit
6db7059c6f
19 changed files with 906 additions and 38 deletions
  1. 90 0
      java110-bean/src/main/java/com/java110/dto/contractRoom/ContractRoomDto.java
  2. 67 0
      java110-bean/src/main/java/com/java110/po/contractRoom/ContractRoomPo.java
  3. 1 0
      java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java
  4. 124 0
      java110-db/src/main/resources/mapper/store/ContractRoomServiceDaoImplMapper.xml
  5. 1 1
      java110-generator/src/main/java/com/java110/code/newBack/BackCoderGeneratorStart.java
  6. 18 26
      java110-generator/src/main/resources/newBack/template_1.json
  7. 53 0
      java110-interface/src/main/java/com/java110/intf/store/IContractRoomInnerServiceSMO.java
  8. 93 11
      service-store/src/main/java/com/java110/store/api/ContractApi.java
  9. 17 0
      service-store/src/main/java/com/java110/store/bmo/contractRoom/IDeleteContractRoomBMO.java
  10. 16 0
      service-store/src/main/java/com/java110/store/bmo/contractRoom/IGetContractRoomBMO.java
  11. 17 0
      service-store/src/main/java/com/java110/store/bmo/contractRoom/ISaveContractRoomBMO.java
  12. 17 0
      service-store/src/main/java/com/java110/store/bmo/contractRoom/IUpdateContractRoomBMO.java
  13. 34 0
      service-store/src/main/java/com/java110/store/bmo/contractRoom/impl/DeleteContractRoomBMOImpl.java
  14. 44 0
      service-store/src/main/java/com/java110/store/bmo/contractRoom/impl/GetContractRoomBMOImpl.java
  15. 38 0
      service-store/src/main/java/com/java110/store/bmo/contractRoom/impl/SaveContractRoomBMOImpl.java
  16. 34 0
      service-store/src/main/java/com/java110/store/bmo/contractRoom/impl/UpdateContractRoomBMOImpl.java
  17. 61 0
      service-store/src/main/java/com/java110/store/dao/IContractRoomServiceDao.java
  18. 98 0
      service-store/src/main/java/com/java110/store/dao/impl/ContractRoomServiceDaoImpl.java
  19. 83 0
      service-store/src/main/java/com/java110/store/smo/impl/ContractRoomInnerServiceSMOImpl.java

+ 90 - 0
java110-bean/src/main/java/com/java110/dto/contractRoom/ContractRoomDto.java

@@ -0,0 +1,90 @@
+package com.java110.dto.contractRoom;
+
+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 ContractRoomDto extends PageDto implements Serializable {
+
+    private String crId;
+private String ownerName;
+private String contractId;
+private String ownerId;
+private String storeId;
+private String roomId;
+private String roomName;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getCrId() {
+        return crId;
+    }
+public void setCrId(String crId) {
+        this.crId = crId;
+    }
+public String getOwnerName() {
+        return ownerName;
+    }
+public void setOwnerName(String ownerName) {
+        this.ownerName = ownerName;
+    }
+public String getContractId() {
+        return contractId;
+    }
+public void setContractId(String contractId) {
+        this.contractId = contractId;
+    }
+public String getOwnerId() {
+        return ownerId;
+    }
+public void setOwnerId(String ownerId) {
+        this.ownerId = ownerId;
+    }
+public String getStoreId() {
+        return storeId;
+    }
+public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+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 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;
+    }
+}

+ 67 - 0
java110-bean/src/main/java/com/java110/po/contractRoom/ContractRoomPo.java

@@ -0,0 +1,67 @@
+package com.java110.po.contractRoom;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ContractRoomPo implements Serializable {
+
+    private String crId;
+private String ownerName;
+private String contractId;
+private String statusCd = "0";
+private String ownerId;
+private String storeId;
+private String roomId;
+private String roomName;
+public String getCrId() {
+        return crId;
+    }
+public void setCrId(String crId) {
+        this.crId = crId;
+    }
+public String getOwnerName() {
+        return ownerName;
+    }
+public void setOwnerName(String ownerName) {
+        this.ownerName = ownerName;
+    }
+public String getContractId() {
+        return contractId;
+    }
+public void setContractId(String contractId) {
+        this.contractId = contractId;
+    }
+public String getStatusCd() {
+        return statusCd;
+    }
+public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+public String getOwnerId() {
+        return ownerId;
+    }
+public void setOwnerId(String ownerId) {
+        this.ownerId = ownerId;
+    }
+public String getStoreId() {
+        return storeId;
+    }
+public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+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;
+    }
+
+
+
+}

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

@@ -194,6 +194,7 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_shId = "25";
     public static final String CODE_PREFIX_allocationStorehouseId = "26";
     public static final String CODE_PREFIX_usId = "27";
+    public static final String CODE_PREFIX_crId = "28";
 
 
     /**

+ 124 - 0
java110-db/src/main/resources/mapper/store/ContractRoomServiceDaoImplMapper.xml

@@ -0,0 +1,124 @@
+<?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="contractRoomServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存合同房屋信息 add by wuxw 2018-07-03 -->
+    <insert id="saveContractRoomInfo" parameterType="Map">
+        insert into contract_room(
+cr_id,owner_name,contract_id,owner_id,store_id,room_id,room_name
+) values (
+#{crId},#{ownerName},#{contractId},#{ownerId},#{storeId},#{roomId},#{roomName}
+)
+    </insert>
+
+
+
+    <!-- 查询合同房屋信息 add by wuxw 2018-07-03 -->
+    <select id="getContractRoomInfo" parameterType="Map" resultType="Map">
+        select  t.cr_id,t.cr_id crId,t.owner_name,t.owner_name ownerName,t.contract_id,t.contract_id contractId,t.status_cd,t.status_cd statusCd,t.owner_id,t.owner_id ownerId,t.store_id,t.store_id storeId,t.room_id,t.room_id roomId,t.room_name,t.room_name roomName 
+from contract_room t 
+where 1 =1 
+<if test="crId !=null and crId != ''">
+   and t.cr_id= #{crId}
+</if> 
+<if test="ownerName !=null and ownerName != ''">
+   and t.owner_name= #{ownerName}
+</if> 
+<if test="contractId !=null and contractId != ''">
+   and t.contract_id= #{contractId}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="ownerId !=null and ownerId != ''">
+   and t.owner_id= #{ownerId}
+</if> 
+<if test="storeId !=null and storeId != ''">
+   and t.store_id= #{storeId}
+</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> 
+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="updateContractRoomInfo" parameterType="Map">
+        update  contract_room t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="ownerName !=null and ownerName != ''">
+, t.owner_name= #{ownerName}
+</if> 
+<if test="contractId !=null and contractId != ''">
+, t.contract_id= #{contractId}
+</if> 
+<if test="ownerId !=null and ownerId != ''">
+, t.owner_id= #{ownerId}
+</if> 
+<if test="storeId !=null and storeId != ''">
+, t.store_id= #{storeId}
+</if> 
+<if test="roomId !=null and roomId != ''">
+, t.room_id= #{roomId}
+</if> 
+<if test="roomName !=null and roomName != ''">
+, t.room_name= #{roomName}
+</if> 
+ where 1=1 <if test="crId !=null and crId != ''">
+and t.cr_id= #{crId}
+</if> 
+
+    </update>
+
+    <!-- 查询合同房屋数量 add by wuxw 2018-07-03 -->
+     <select id="queryContractRoomsCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from contract_room t 
+where 1 =1 
+<if test="crId !=null and crId != ''">
+   and t.cr_id= #{crId}
+</if> 
+<if test="ownerName !=null and ownerName != ''">
+   and t.owner_name= #{ownerName}
+</if> 
+<if test="contractId !=null and contractId != ''">
+   and t.contract_id= #{contractId}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="ownerId !=null and ownerId != ''">
+   and t.owner_id= #{ownerId}
+</if> 
+<if test="storeId !=null and storeId != ''">
+   and t.store_id= #{storeId}
+</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> 
+
+
+     </select>
+
+</mapper>

+ 1 - 1
java110-generator/src/main/java/com/java110/code/newBack/BackCoderGeneratorStart.java

@@ -29,7 +29,7 @@ public class BackCoderGeneratorStart extends BaseGenerator {
     public static void main(String[] args) throws Exception {
 
         //加载配置
-        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newBack/template_contractFile.json").getFile());
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/newBack/template_1.json").getFile());
 
         JSONObject dataJson = JSONObject.parseObject(sb.toString());
 

+ 18 - 26
java110-generator/src/main/resources/newBack/template_1.json

@@ -1,38 +1,30 @@
 {
   "autoMove": true,
-  "id": "visitId",
-  "name": "repairReturnVisit",
-  "desc": "报修回访",
-  "shareParam": "communityId",
-  "shareColumn": "community_id",
-  "shareName": "community",
-  "tableName": "r_repair_return_visit",
+  "id": "crId",
+  "name": "contractRoom",
+  "desc": "合同房屋",
+  "shareParam": "storeId",
+  "shareColumn": "store_id",
+  "shareName": "store",
+  "tableName": "contract_room",
   "param": {
-    "visitId": "visit_id",
-    "repairId": "repair_id",
-    "communityId": "community_id",
-    "visitPersonId": "visit_person_id",
-    "visitPersonName": "visit_person_name",
-    "visitType": "visit_type",
-    "context": "context",
+    "crId": "cr_id",
+    "contractId": "contract_id",
+    "roomId": "room_id",
+    "roomName": "room_name",
+    "ownerId": "owner_id",
+    "ownerName": "owner_name",
+    "storeId": "store_id",
     "statusCd": "status_cd"
   },
   "required": [
     {
-      "code": "repairId",
-      "msg": "报修单不能为空"
+      "code": "contractId",
+      "msg": "合同不能为空"
     },
     {
-      "code": "visitPersonId",
-      "msg": "回访人不能为空"
-    },
-    {
-      "code": "communityId",
-      "msg": "小区不能为空"
-    },
-    {
-      "code": "context",
-      "msg": "回访内容不能为空"
+      "code": "roomId",
+      "msg": "房屋不能为空"
     }
   ]
 }

+ 53 - 0
java110-interface/src/main/java/com/java110/intf/store/IContractRoomInnerServiceSMO.java

@@ -0,0 +1,53 @@
+package com.java110.intf;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.contractRoom.ContractRoomDto;
+import com.java110.po.contractRoom.ContractRoomPo;
+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 IContractRoomInnerServiceSMO
+ * @Description 合同房屋接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "store-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/contractRoomApi")
+public interface IContractRoomInnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveContractRoom", method = RequestMethod.POST)
+    public int saveContractRoom(@RequestBody ContractRoomPo contractRoomPo);
+
+    @RequestMapping(value = "/updateContractRoom", method = RequestMethod.POST)
+    public int updateContractRoom(@RequestBody  ContractRoomPo contractRoomPo);
+
+    @RequestMapping(value = "/deleteContractRoom", method = RequestMethod.POST)
+    public int deleteContractRoom(@RequestBody  ContractRoomPo contractRoomPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param contractRoomDto 数据对象分享
+     * @return ContractRoomDto 对象数据
+     */
+    @RequestMapping(value = "/queryContractRooms", method = RequestMethod.POST)
+    List<ContractRoomDto> queryContractRooms(@RequestBody ContractRoomDto contractRoomDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param contractRoomDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryContractRoomsCount", method = RequestMethod.POST)
+    int queryContractRoomsCount(@RequestBody ContractRoomDto contractRoomDto);
+}

+ 93 - 11
service-store/src/main/java/com/java110/store/api/ContractApi.java

@@ -4,15 +4,13 @@ package com.java110.store.api;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.factory.GenerateCodeFactory;
-
-import com.alibaba.fastjson.JSONObject;
-
 import com.java110.dto.contract.ContractDto;
 import com.java110.dto.contractAttr.ContractAttrDto;
 import com.java110.dto.contractChangePlan.ContractChangePlanDto;
 import com.java110.dto.contractChangePlanDetail.ContractChangePlanDetailDto;
 import com.java110.dto.contractChangePlanDetailAttr.ContractChangePlanDetailAttrDto;
 import com.java110.dto.contractCollectionPlan.ContractCollectionPlanDto;
+import com.java110.dto.contractRoom.ContractRoomDto;
 import com.java110.dto.contractType.ContractTypeDto;
 import com.java110.dto.contractTypeSpec.ContractTypeSpecDto;
 import com.java110.dto.contractTypeTemplate.ContractTypeTemplateDto;
@@ -23,17 +21,11 @@ import com.java110.po.contractChangePlan.ContractChangePlanPo;
 import com.java110.po.contractChangePlanDetail.ContractChangePlanDetailPo;
 import com.java110.po.contractChangePlanDetailAttr.ContractChangePlanDetailAttrPo;
 import com.java110.po.contractCollectionPlan.ContractCollectionPlanPo;
-
 import com.java110.po.contractFile.ContractFilePo;
+import com.java110.po.contractRoom.ContractRoomPo;
 import com.java110.po.contractType.ContractTypePo;
 import com.java110.po.contractTypeSpec.ContractTypeSpecPo;
 import com.java110.po.contractTypeTemplate.ContractTypeTemplatePo;
-import com.java110.po.purchase.PurchaseApplyDetailPo;
-
-import com.java110.po.contractType.ContractTypePo;
-import com.java110.po.contractTypeSpec.ContractTypeSpecPo;
-import com.java110.po.contractTypeTemplate.ContractTypeTemplatePo;
-
 import com.java110.store.bmo.contract.IDeleteContractBMO;
 import com.java110.store.bmo.contract.IGetContractBMO;
 import com.java110.store.bmo.contract.ISaveContractBMO;
@@ -58,6 +50,10 @@ import com.java110.store.bmo.contractCollectionPlan.IDeleteContractCollectionPla
 import com.java110.store.bmo.contractCollectionPlan.IGetContractCollectionPlanBMO;
 import com.java110.store.bmo.contractCollectionPlan.ISaveContractCollectionPlanBMO;
 import com.java110.store.bmo.contractCollectionPlan.IUpdateContractCollectionPlanBMO;
+import com.java110.store.bmo.contractRoom.IDeleteContractRoomBMO;
+import com.java110.store.bmo.contractRoom.IGetContractRoomBMO;
+import com.java110.store.bmo.contractRoom.ISaveContractRoomBMO;
+import com.java110.store.bmo.contractRoom.IUpdateContractRoomBMO;
 import com.java110.store.bmo.contractType.IDeleteContractTypeBMO;
 import com.java110.store.bmo.contractType.IGetContractTypeBMO;
 import com.java110.store.bmo.contractType.ISaveContractTypeBMO;
@@ -78,7 +74,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-
 @RestController
 @RequestMapping(value = "/contract")
 public class ContractApi {
@@ -179,6 +174,16 @@ public class ContractApi {
     @Autowired
     private IGetContractCollectionPlanBMO getContractCollectionPlanBMOImpl;
 
+    @Autowired
+    private ISaveContractRoomBMO saveContractRoomBMOImpl;
+    @Autowired
+    private IUpdateContractRoomBMO updateContractRoomBMOImpl;
+    @Autowired
+    private IDeleteContractRoomBMO deleteContractRoomBMOImpl;
+
+    @Autowired
+    private IGetContractRoomBMO getContractRoomBMOImpl;
+
     /**
      * 微信保存消息模板
      *
@@ -1249,4 +1254,81 @@ public class ContractApi {
     }
 
 
+    /**
+     * 微信保存消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /contractRoom/saveContractRoom
+     * @path /app/contractRoom/saveContractRoom
+     */
+    @RequestMapping(value = "/saveContractRoom", method = RequestMethod.POST)
+    public ResponseEntity<String> saveContractRoom(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "contractId", "请求报文中未包含contractId");
+        Assert.hasKeyAndValue(reqJson, "roomId", "请求报文中未包含roomId");
+
+
+        ContractRoomPo contractRoomPo = BeanConvertUtil.covertBean(reqJson, ContractRoomPo.class);
+        return saveContractRoomBMOImpl.save(contractRoomPo);
+    }
+
+    /**
+     * 微信修改消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /contractRoom/updateContractRoom
+     * @path /app/contractRoom/updateContractRoom
+     */
+    @RequestMapping(value = "/updateContractRoom", method = RequestMethod.POST)
+    public ResponseEntity<String> updateContractRoom(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "contractId", "请求报文中未包含contractId");
+        Assert.hasKeyAndValue(reqJson, "roomId", "请求报文中未包含roomId");
+        Assert.hasKeyAndValue(reqJson, "crId", "crId不能为空");
+
+
+        ContractRoomPo contractRoomPo = BeanConvertUtil.covertBean(reqJson, ContractRoomPo.class);
+        return updateContractRoomBMOImpl.update(contractRoomPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /contractRoom/deleteContractRoom
+     * @path /app/contractRoom/deleteContractRoom
+     */
+    @RequestMapping(value = "/deleteContractRoom", method = RequestMethod.POST)
+    public ResponseEntity<String> deleteContractRoom(@RequestBody JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+
+        Assert.hasKeyAndValue(reqJson, "crId", "crId不能为空");
+
+
+        ContractRoomPo contractRoomPo = BeanConvertUtil.covertBean(reqJson, ContractRoomPo.class);
+        return deleteContractRoomBMOImpl.delete(contractRoomPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param storeId 小区ID
+     * @return
+     * @serviceCode /contractRoom/queryContractRoom
+     * @path /app/contractRoom/queryContractRoom
+     */
+    @RequestMapping(value = "/queryContractRoom", method = RequestMethod.GET)
+    public ResponseEntity<String> queryContractRoom(@RequestHeader(value = "store-id") String storeId,
+                                                    @RequestParam(value = "page") int page,
+                                                    @RequestParam(value = "row") int row) {
+        ContractRoomDto contractRoomDto = new ContractRoomDto();
+        contractRoomDto.setPage(page);
+        contractRoomDto.setRow(row);
+        contractRoomDto.setStoreId(storeId);
+        return getContractRoomBMOImpl.get(contractRoomDto);
+    }
+
 }

+ 17 - 0
service-store/src/main/java/com/java110/store/bmo/contractRoom/IDeleteContractRoomBMO.java

@@ -0,0 +1,17 @@
+package com.java110.store.bmo.contractRoom;
+import com.java110.po.contractRoom.ContractRoomPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IDeleteContractRoomBMO {
+
+
+    /**
+     * 修改合同房屋
+     * add by wuxw
+     * @param contractRoomPo
+     * @return
+     */
+    ResponseEntity<String> delete(ContractRoomPo contractRoomPo);
+
+
+}

+ 16 - 0
service-store/src/main/java/com/java110/store/bmo/contractRoom/IGetContractRoomBMO.java

@@ -0,0 +1,16 @@
+package com.java110.store.bmo.contractRoom;
+import com.java110.dto.contractRoom.ContractRoomDto;
+import org.springframework.http.ResponseEntity;
+public interface IGetContractRoomBMO {
+
+
+    /**
+     * 查询合同房屋
+     * add by wuxw
+     * @param  contractRoomDto
+     * @return
+     */
+    ResponseEntity<String> get(ContractRoomDto contractRoomDto);
+
+
+}

+ 17 - 0
service-store/src/main/java/com/java110/store/bmo/contractRoom/ISaveContractRoomBMO.java

@@ -0,0 +1,17 @@
+package com.java110.store.bmo.contractRoom;
+
+import com.java110.po.contractRoom.ContractRoomPo;
+import org.springframework.http.ResponseEntity;
+public interface ISaveContractRoomBMO {
+
+
+    /**
+     * 添加合同房屋
+     * add by wuxw
+     * @param contractRoomPo
+     * @return
+     */
+    ResponseEntity<String> save(ContractRoomPo contractRoomPo);
+
+
+}

+ 17 - 0
service-store/src/main/java/com/java110/store/bmo/contractRoom/IUpdateContractRoomBMO.java

@@ -0,0 +1,17 @@
+package com.java110.store.bmo.contractRoom;
+import com.java110.po.contractRoom.ContractRoomPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IUpdateContractRoomBMO {
+
+
+    /**
+     * 修改合同房屋
+     * add by wuxw
+     * @param contractRoomPo
+     * @return
+     */
+    ResponseEntity<String> update(ContractRoomPo contractRoomPo);
+
+
+}

+ 34 - 0
service-store/src/main/java/com/java110/store/bmo/contractRoom/impl/DeleteContractRoomBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.store.bmo.contractRoom.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.intf.IContractRoomInnerServiceSMO;
+import com.java110.po.contractRoom.ContractRoomPo;
+import com.java110.store.bmo.contractRoom.IDeleteContractRoomBMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("deleteContractRoomBMOImpl")
+public class DeleteContractRoomBMOImpl implements IDeleteContractRoomBMO {
+
+    @Autowired
+    private IContractRoomInnerServiceSMO contractRoomInnerServiceSMOImpl;
+
+    /**
+     * @param contractRoomPo 数据
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> delete(ContractRoomPo contractRoomPo) {
+
+        int flag = contractRoomInnerServiceSMOImpl.deleteContractRoom(contractRoomPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

+ 44 - 0
service-store/src/main/java/com/java110/store/bmo/contractRoom/impl/GetContractRoomBMOImpl.java

@@ -0,0 +1,44 @@
+package com.java110.store.bmo.contractRoom.impl;
+
+import com.java110.dto.contractRoom.ContractRoomDto;
+import com.java110.intf.IContractRoomInnerServiceSMO;
+import com.java110.store.bmo.contractRoom.IGetContractRoomBMO;
+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("getContractRoomBMOImpl")
+public class GetContractRoomBMOImpl implements IGetContractRoomBMO {
+
+    @Autowired
+    private IContractRoomInnerServiceSMO contractRoomInnerServiceSMOImpl;
+
+    /**
+     * @param contractRoomDto
+     * @return 订单服务能够接受的报文
+     */
+    public ResponseEntity<String> get(ContractRoomDto contractRoomDto) {
+
+
+        int count = contractRoomInnerServiceSMOImpl.queryContractRoomsCount(contractRoomDto);
+
+        List<ContractRoomDto> contractRoomDtos = null;
+        if (count > 0) {
+            contractRoomDtos = contractRoomInnerServiceSMOImpl.queryContractRooms(contractRoomDto);
+        } else {
+            contractRoomDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) contractRoomDto.getRow()), count, contractRoomDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
+}

+ 38 - 0
service-store/src/main/java/com/java110/store/bmo/contractRoom/impl/SaveContractRoomBMOImpl.java

@@ -0,0 +1,38 @@
+package com.java110.store.bmo.contractRoom.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.IContractRoomInnerServiceSMO;
+import com.java110.po.contractRoom.ContractRoomPo;
+import com.java110.store.bmo.contractRoom.ISaveContractRoomBMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("saveContractRoomBMOImpl")
+public class SaveContractRoomBMOImpl implements ISaveContractRoomBMO {
+
+    @Autowired
+    private IContractRoomInnerServiceSMO contractRoomInnerServiceSMOImpl;
+
+    /**
+     * 添加小区信息
+     *
+     * @param contractRoomPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> save(ContractRoomPo contractRoomPo) {
+
+        contractRoomPo.setCrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_crId));
+        int flag = contractRoomInnerServiceSMOImpl.saveContractRoom(contractRoomPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

+ 34 - 0
service-store/src/main/java/com/java110/store/bmo/contractRoom/impl/UpdateContractRoomBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.store.bmo.contractRoom.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.intf.IContractRoomInnerServiceSMO;
+import com.java110.po.contractRoom.ContractRoomPo;
+import com.java110.store.bmo.contractRoom.IUpdateContractRoomBMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("updateContractRoomBMOImpl")
+public class UpdateContractRoomBMOImpl implements IUpdateContractRoomBMO {
+
+    @Autowired
+    private IContractRoomInnerServiceSMO contractRoomInnerServiceSMOImpl;
+
+    /**
+     * @param contractRoomPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> update(ContractRoomPo contractRoomPo) {
+
+        int flag = contractRoomInnerServiceSMOImpl.updateContractRoom(contractRoomPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

+ 61 - 0
service-store/src/main/java/com/java110/store/dao/IContractRoomServiceDao.java

@@ -0,0 +1,61 @@
+package com.java110.store.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 IContractRoomServiceDao {
+
+
+    /**
+     * 保存 合同房屋信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void saveContractRoomInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询合同房屋信息(instance过程)
+     * 根据bId 查询合同房屋信息
+     * @param info bId 信息
+     * @return 合同房屋信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getContractRoomInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改合同房屋信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updateContractRoomInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询合同房屋总数
+     *
+     * @param info 合同房屋信息
+     * @return 合同房屋数量
+     */
+    int queryContractRoomsCount(Map info);
+
+}

+ 98 - 0
service-store/src/main/java/com/java110/store/dao/impl/ContractRoomServiceDaoImpl.java

@@ -0,0 +1,98 @@
+package com.java110.store.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.store.dao.IContractRoomServiceDao;
+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("contractRoomServiceDaoImpl")
+//@Transactional
+public class ContractRoomServiceDaoImpl extends BaseServiceDao implements IContractRoomServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(ContractRoomServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存合同房屋信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveContractRoomInfo(Map info) throws DAOException {
+        logger.debug("保存合同房屋信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("contractRoomServiceDaoImpl.saveContractRoomInfo",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> getContractRoomInfo(Map info) throws DAOException {
+        logger.debug("查询合同房屋信息 入参 info : {}",info);
+
+        List<Map> businessContractRoomInfos = sqlSessionTemplate.selectList("contractRoomServiceDaoImpl.getContractRoomInfo",info);
+
+        return businessContractRoomInfos;
+    }
+
+
+    /**
+     * 修改合同房屋信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updateContractRoomInfo(Map info) throws DAOException {
+        logger.debug("修改合同房屋信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("contractRoomServiceDaoImpl.updateContractRoomInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改合同房屋信息Instance数据失败:"+ JSONObject.toJSONString(info));
+        }
+    }
+
+     /**
+     * 查询合同房屋数量
+     * @param info 合同房屋信息
+     * @return 合同房屋数量
+     */
+    @Override
+    public int queryContractRoomsCount(Map info) {
+        logger.debug("查询合同房屋数据 入参 info : {}",info);
+
+        List<Map> businessContractRoomInfos = sqlSessionTemplate.selectList("contractRoomServiceDaoImpl.queryContractRoomsCount", info);
+        if (businessContractRoomInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessContractRoomInfos.get(0).get("count").toString());
+    }
+
+
+}

+ 83 - 0
service-store/src/main/java/com/java110/store/smo/impl/ContractRoomInnerServiceSMOImpl.java

@@ -0,0 +1,83 @@
+package com.java110.store.smo.impl;
+
+
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.contractRoom.ContractRoomDto;
+import com.java110.intf.IContractRoomInnerServiceSMO;
+import com.java110.po.contractRoom.ContractRoomPo;
+import com.java110.store.dao.IContractRoomServiceDao;
+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 ContractRoomInnerServiceSMOImpl extends BaseServiceSMO implements IContractRoomInnerServiceSMO {
+
+    @Autowired
+    private IContractRoomServiceDao contractRoomServiceDaoImpl;
+
+
+    @Override
+    public int saveContractRoom(@RequestBody ContractRoomPo contractRoomPo) {
+        int saveFlag = 1;
+        contractRoomServiceDaoImpl.saveContractRoomInfo(BeanConvertUtil.beanCovertMap(contractRoomPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int updateContractRoom(@RequestBody ContractRoomPo contractRoomPo) {
+        int saveFlag = 1;
+        contractRoomServiceDaoImpl.updateContractRoomInfo(BeanConvertUtil.beanCovertMap(contractRoomPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int deleteContractRoom(@RequestBody ContractRoomPo contractRoomPo) {
+        int saveFlag = 1;
+        contractRoomPo.setStatusCd("1");
+        contractRoomServiceDaoImpl.updateContractRoomInfo(BeanConvertUtil.beanCovertMap(contractRoomPo));
+        return saveFlag;
+    }
+
+    @Override
+    public List<ContractRoomDto> queryContractRooms(@RequestBody ContractRoomDto contractRoomDto) {
+
+        //校验是否传了 分页信息
+
+        int page = contractRoomDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            contractRoomDto.setPage((page - 1) * contractRoomDto.getRow());
+        }
+
+        List<ContractRoomDto> contractRooms = BeanConvertUtil.covertBeanList(contractRoomServiceDaoImpl.getContractRoomInfo(BeanConvertUtil.beanCovertMap(contractRoomDto)), ContractRoomDto.class);
+
+        return contractRooms;
+    }
+
+
+    @Override
+    public int queryContractRoomsCount(@RequestBody ContractRoomDto contractRoomDto) {
+        return contractRoomServiceDaoImpl.queryContractRoomsCount(BeanConvertUtil.beanCovertMap(contractRoomDto));
+    }
+
+    public IContractRoomServiceDao getContractRoomServiceDaoImpl() {
+        return contractRoomServiceDaoImpl;
+    }
+
+    public void setContractRoomServiceDaoImpl(IContractRoomServiceDao contractRoomServiceDaoImpl) {
+        this.contractRoomServiceDaoImpl = contractRoomServiceDaoImpl;
+    }
+}