调整巡检线路 巡检点关系

Api/src/main/java/com/java110/api/listener/inspectionRoute/DeleteInspectionRoutePointListener.java

@@ -29,7 +29,7 @@ public class DeleteInspectionRoutePointListener extends AbstractServiceApiListen
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
         //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
 
-        Assert.hasKeyAndValue(reqJson, "irmRelId", "路线巡检点关系ID不能为空");
+        Assert.hasKeyAndValue(reqJson, "irpRelId", "路线巡检点关系ID不能为空");
         Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
 
     }

Api/src/main/java/com/java110/api/listener/inspectionRoute/SaveInspectionRoutePointListener.java

@@ -97,7 +97,7 @@ public class SaveInspectionRoutePointListener extends AbstractServiceApiListener
         business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
         JSONObject businessInspectionRoute = new JSONObject();
         businessInspectionRoute.putAll(paramInJson);
-        businessInspectionRoute.put("irmRelId", "-" + index);
+        businessInspectionRoute.put("irpRelId", "-" + index);
         //计算 应收金额
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessInspectionRoutePointRel", businessInspectionRoute);
         return business;

CommunityService/src/main/java/com/java110/community/listener/inspectionRoute/AbstractInspectionRoutePointRelBusinessServiceDataFlowListener.java

@@ -40,7 +40,7 @@ public abstract class AbstractInspectionRoutePointRelBusinessServiceDataFlowList
         businessInspectionRoutePointRelInfo.put("inspectionId", businessInspectionRoutePointRelInfo.get("inspection_id"));
         businessInspectionRoutePointRelInfo.put("operate", businessInspectionRoutePointRelInfo.get("operate"));
         businessInspectionRoutePointRelInfo.put("inspectionRouteId", businessInspectionRoutePointRelInfo.get("inspection_route_id"));
-        businessInspectionRoutePointRelInfo.put("irmRelId", businessInspectionRoutePointRelInfo.get("irm_rel_id"));
+        businessInspectionRoutePointRelInfo.put("irpRelId", businessInspectionRoutePointRelInfo.get("irp_rel_id"));
         businessInspectionRoutePointRelInfo.put("remark", businessInspectionRoutePointRelInfo.get("remark"));
         businessInspectionRoutePointRelInfo.put("communityId", businessInspectionRoutePointRelInfo.get("community_id"));
         businessInspectionRoutePointRelInfo.remove("bId");
@@ -56,7 +56,7 @@ public abstract class AbstractInspectionRoutePointRelBusinessServiceDataFlowList
     protected void autoSaveDelBusinessInspectionRoutePointRel(Business business, JSONObject businessInspectionRoutePointRel) {
 //自动插入DEL
         Map info = new HashMap();
-        info.put("irmRelId", businessInspectionRoutePointRel.getString("irmRelId"));
+        info.put("irpRelId", businessInspectionRoutePointRel.getString("irpRelId"));
         info.put("statusCd", StatusConstant.STATUS_CD_VALID);
         List<Map> currentInspectionRoutePointRelInfos = getInspectionRoutePointRelServiceDaoImpl().getInspectionRoutePointRelInfo(info);
         if (currentInspectionRoutePointRelInfos == null || currentInspectionRoutePointRelInfos.size() != 1) {
@@ -70,7 +70,7 @@ public abstract class AbstractInspectionRoutePointRelBusinessServiceDataFlowList
         currentInspectionRoutePointRelInfo.put("inspectionId", currentInspectionRoutePointRelInfo.get("inspection_id"));
         currentInspectionRoutePointRelInfo.put("operate", currentInspectionRoutePointRelInfo.get("operate"));
         currentInspectionRoutePointRelInfo.put("inspectionRouteId", currentInspectionRoutePointRelInfo.get("inspection_route_id"));
-        currentInspectionRoutePointRelInfo.put("irmRelId", currentInspectionRoutePointRelInfo.get("irm_rel_id"));
+        currentInspectionRoutePointRelInfo.put("irpRelId", currentInspectionRoutePointRelInfo.get("irp_rel_id"));
         currentInspectionRoutePointRelInfo.put("remark", currentInspectionRoutePointRelInfo.get("remark"));
         currentInspectionRoutePointRelInfo.put("communityId", currentInspectionRoutePointRelInfo.get("community_id"));
 

CommunityService/src/main/java/com/java110/community/listener/inspectionRoute/DeleteInspectionRoutePointRelInfoListener.java

@@ -78,7 +78,7 @@ public class DeleteInspectionRoutePointRelInfoListener extends AbstractInspectio
                     JSONObject businessInspectionRoutePointRel = businessInspectionRoutePointRels.getJSONObject(_inspectionRoutePointRelIndex);
                     doBusinessInspectionRoutePointRel(business, businessInspectionRoutePointRel);
                     if (_obj instanceof JSONObject) {
-                        dataFlowContext.addParamOut("irmRelId", businessInspectionRoutePointRel.getString("irmRelId"));
+                        dataFlowContext.addParamOut("irpRelId", businessInspectionRoutePointRel.getString("irpRelId"));
                     }
                 }
             }
@@ -110,7 +110,7 @@ public class DeleteInspectionRoutePointRelInfoListener extends AbstractInspectio
                 Map businessInspectionRoutePointRelInfo = businessInspectionRoutePointRelInfos.get(_inspectionRoutePointRelIndex);
                 flushBusinessInspectionRoutePointRelInfo(businessInspectionRoutePointRelInfo, StatusConstant.STATUS_CD_INVALID);
                 inspectionRoutePointRelServiceDaoImpl.updateInspectionRoutePointRelInfoInstance(businessInspectionRoutePointRelInfo);
-                dataFlowContext.addParamOut("irmRelId", businessInspectionRoutePointRelInfo.get("irm_rel_id"));
+                dataFlowContext.addParamOut("irpRelId", businessInspectionRoutePointRelInfo.get("irp_rel_id"));
             }
         }
 
@@ -161,10 +161,10 @@ public class DeleteInspectionRoutePointRelInfoListener extends AbstractInspectio
      */
     private void doBusinessInspectionRoutePointRel(Business business, JSONObject businessInspectionRoutePointRel) {
 
-        Assert.jsonObjectHaveKey(businessInspectionRoutePointRel, "irmRelId", "businessInspectionRoutePointRel 节点下没有包含 irmRelId 节点");
+        Assert.jsonObjectHaveKey(businessInspectionRoutePointRel, "irpRelId", "businessInspectionRoutePointRel 节点下没有包含 irpRelId 节点");
 
-        if (businessInspectionRoutePointRel.getString("irmRelId").startsWith("-")) {
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "irmRelId 错误，不能自动生成（必须已经存在的irmRelId）" + businessInspectionRoutePointRel);
+        if (businessInspectionRoutePointRel.getString("irpRelId").startsWith("-")) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "irpRelId 错误，不能自动生成（必须已经存在的irpRelId）" + businessInspectionRoutePointRel);
         }
         //自动插入DEL
         autoSaveDelBusinessInspectionRoutePointRel(business, businessInspectionRoutePointRel);

CommunityService/src/main/java/com/java110/community/listener/inspectionRoute/SaveInspectionRoutePointRelInfoListener.java

@@ -68,7 +68,7 @@ public class SaveInspectionRoutePointRelInfoListener extends AbstractInspectionR
                 JSONObject businessInspectionRoutePointRel = businessInspectionRoutePointRels.getJSONObject(bInspectionRoutePointRelIndex);
                 doBusinessInspectionRoutePointRel(business, businessInspectionRoutePointRel);
                 if (bObj instanceof JSONObject) {
-                    dataFlowContext.addParamOut("irmRelId", businessInspectionRoutePointRel.getString("irmRelId"));
+                    dataFlowContext.addParamOut("irpRelId", businessInspectionRoutePointRel.getString("irpRelId"));
                 }
             }
         }
@@ -94,7 +94,7 @@ public class SaveInspectionRoutePointRelInfoListener extends AbstractInspectionR
             reFreshShareColumn(info, businessInspectionRoutePointRelInfo.get(0));
             inspectionRoutePointRelServiceDaoImpl.saveInspectionRoutePointRelInfoInstance(info);
             if (businessInspectionRoutePointRelInfo.size() == 1) {
-                dataFlowContext.addParamOut("irmRelId", businessInspectionRoutePointRelInfo.get(0).get("irm_rel_id"));
+                dataFlowContext.addParamOut("irpRelId", businessInspectionRoutePointRelInfo.get(0).get("irpRelId"));
             }
         }
     }
@@ -152,13 +152,13 @@ public class SaveInspectionRoutePointRelInfoListener extends AbstractInspectionR
      */
     private void doBusinessInspectionRoutePointRel(Business business, JSONObject businessInspectionRoutePointRel) {
 
-        Assert.jsonObjectHaveKey(businessInspectionRoutePointRel, "irmRelId", "businessInspectionRoutePointRel 节点下没有包含 irmRelId 节点");
+        Assert.jsonObjectHaveKey(businessInspectionRoutePointRel, "irpRelId", "businessInspectionRoutePointRel 节点下没有包含 irpRelId 节点");
 
-        if (businessInspectionRoutePointRel.getString("irmRelId").startsWith("-")) {
+        if (businessInspectionRoutePointRel.getString("irpRelId").startsWith("-")) {
             //刷新缓存
             //flushInspectionRoutePointRelId(business.getDatas());
 
-            businessInspectionRoutePointRel.put("irmRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_irmRelId));
+            businessInspectionRoutePointRel.put("irpRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_irpRelId));
 
         }
 

FrontService/src/main/java/com/java110/front/smo/inspectionRoute/impl/DeleteInspectionRoutePointSMOImpl.java

@@ -28,7 +28,7 @@ public class DeleteInspectionRoutePointSMOImpl extends AbstractComponentSMO impl
         //super.validatePageInfo(pd);
 
         //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
-        Assert.hasKeyAndValue(paramIn, "irmRelId", "路线巡检点关系ID不能为空");
+        Assert.hasKeyAndValue(paramIn, "irpRelId", "路线巡检点关系ID不能为空");
         Assert.hasKeyAndValue(paramIn, "communityId", "小区ID不能为空");
 
 

java110-bean/src/main/java/com/java110/dto/inspectionRoute/InspectionRoutePointRelDto.java

@@ -17,7 +17,7 @@ public class InspectionRoutePointRelDto extends PageDto implements Serializable
 
     private String inspectionId;
     private String inspectionRouteId;
-    private String irmRelId;
+    private String irpRelId;
     private String remark;
     private String communityId;
 
@@ -43,12 +43,12 @@ public class InspectionRoutePointRelDto extends PageDto implements Serializable
         this.inspectionRouteId = inspectionRouteId;
     }
 
-    public String getIrmRelId() {
-        return irmRelId;
+    public String getIrpRelId() {
+        return irpRelId;
     }
 
-    public void setIrmRelId(String irmRelId) {
-        this.irmRelId = irmRelId;
+    public void setIrpRelId(String irpRelId) {
+        this.irpRelId = irpRelId;
     }
 
     public String getRemark() {

java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -117,7 +117,7 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_inoutId = "12";
     public static final String CODE_PREFIX_inspectionId = "13";
     public static final String CODE_PREFIX_inspectionRouteId = "50";
-    public static final String CODE_PREFIX_irmRelId = "51";
+    public static final String CODE_PREFIX_irpRelId = "51";
     public static final String CODE_PREFIX_inspectionPlanId = "14";
     public static final String CODE_PREFIX_applyOrderId = "15";
 

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

@@ -7,9 +7,9 @@
     <!-- 保存巡检路线巡检点关系信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessInspectionRoutePointRelInfo" parameterType="Map">
         insert into business_inspection_route_point_rel(
-        inspection_id,operate,inspection_route_id,irm_rel_id,remark,community_id,b_id
+        inspection_id,operate,inspection_route_id,irp_rel_id,remark,community_id,b_id
         ) values (
-        #{inspectionId},#{operate},#{inspectionRouteId},#{irmRelId},#{remark},#{communityId},#{bId}
+        #{inspectionId},#{operate},#{inspectionRouteId},#{irpRelId},#{remark},#{communityId},#{bId}
         )
     </insert>
 
@@ -17,7 +17,7 @@
     <!-- 查询巡检路线巡检点关系信息（Business） add by wuxw 2018-07-03 -->
     <select id="getBusinessInspectionRoutePointRelInfo" parameterType="Map" resultType="Map">
         select t.inspection_id,t.inspection_id inspectionId,t.operate,t.inspection_route_id,t.inspection_route_id
-        inspectionRouteId,t.irm_rel_id,t.irm_rel_id irmRelId,t.remark,t.community_id,t.community_id
+        inspectionRouteId,t.irp_rel_id,t.irp_rel_id irpRelId,t.remark,t.community_id,t.community_id
         communityId,t.b_id,t.b_id bId
         from business_inspection_route_point_rel t
         where 1 =1
@@ -30,8 +30,8 @@
         <if test="inspectionRouteId !=null and inspectionRouteId != ''">
             and t.inspection_route_id= #{inspectionRouteId}
         </if>
-        <if test="irmRelId !=null and irmRelId != ''">
-            and t.irm_rel_id= #{irmRelId}
+        <if test="irpRelId !=null and irpRelId != ''">
+            and t.irp_rel_id= #{irpRelId}
         </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
@@ -49,8 +49,8 @@
     <!-- 保存巡检路线巡检点关系信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveInspectionRoutePointRelInfoInstance" parameterType="Map">
         insert into inspection_route_point_rel(
-        inspection_id,inspection_route_id,irm_rel_id,remark,status_cd,community_id,b_id
-        ) select t.inspection_id,t.inspection_route_id,t.irm_rel_id,t.remark,'0',t.community_id,t.b_id from
+        inspection_id,inspection_route_id,irp_rel_id,remark,status_cd,community_id,b_id
+        ) select t.inspection_id,t.inspection_route_id,t.irp_rel_id,t.remark,'0',t.community_id,t.b_id from
         business_inspection_route_point_rel t where 1=1
         <if test="inspectionId !=null and inspectionId != ''">
             and t.inspection_id= #{inspectionId}
@@ -59,8 +59,8 @@
         <if test="inspectionRouteId !=null and inspectionRouteId != ''">
             and t.inspection_route_id= #{inspectionRouteId}
         </if>
-        <if test="irmRelId !=null and irmRelId != ''">
-            and t.irm_rel_id= #{irmRelId}
+        <if test="irpRelId !=null and irpRelId != ''">
+            and t.irp_rel_id= #{irpRelId}
         </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
@@ -78,7 +78,7 @@
     <!-- 查询巡检路线巡检点关系信息 add by wuxw 2018-07-03 -->
     <select id="getInspectionRoutePointRelInfo" parameterType="Map" resultType="Map">
         select t.inspection_id,t.inspection_id inspectionId,t.inspection_route_id,t.inspection_route_id
-        inspectionRouteId,t.irm_rel_id,t.irm_rel_id irmRelId,t.remark,t.status_cd,t.status_cd
+        inspectionRouteId,t.irp_rel_id,t.irp_rel_id irpRelId,t.remark,t.status_cd,t.status_cd
         statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
         ip.inspection_id inspectionId,ip.machine_id machineId,ip.remark,
         ip.inspection_name inspectionName
@@ -92,8 +92,8 @@
         <if test="inspectionRouteId !=null and inspectionRouteId != ''">
             and t.inspection_route_id= #{inspectionRouteId}
         </if>
-        <if test="irmRelId !=null and irmRelId != ''">
-            and t.irm_rel_id= #{irmRelId}
+        <if test="irpRelId !=null and irpRelId != ''">
+            and t.irp_rel_id= #{irpRelId}
         </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
@@ -135,8 +135,8 @@
             , t.community_id= #{communityId}
         </if>
         where 1=1
-        <if test="irmRelId !=null and irmRelId != ''">
-            and t.irm_rel_id= #{irmRelId}
+        <if test="irpRelId !=null and irpRelId != ''">
+            and t.irp_rel_id= #{irpRelId}
         </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
@@ -157,8 +157,8 @@
         <if test="inspectionRouteId !=null and inspectionRouteId != ''">
             and t.inspection_route_id= #{inspectionRouteId}
         </if>
-        <if test="irmRelId !=null and irmRelId != ''">
-            and t.irm_rel_id= #{irmRelId}
+        <if test="irpRelId !=null and irpRelId != ''">
+            and t.irp_rel_id= #{irpRelId}
         </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}