|
|
@@ -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);
|
|
|
+ }
|
|
|
+
|
|
|
}
|