优化巡检路线功能

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

@@ -25,7 +25,8 @@ public class DeleteInspectionRouteListener extends AbstractServiceApiListener {
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
         //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
 
-        Assert.hasKeyAndValue(reqJson, "configId", "inspectionRouteId不能为空");
+        Assert.hasKeyAndValue(reqJson, "inspectionRouteId", "路线ID不能为空");
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
 
     }
 

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

@@ -2,6 +2,7 @@ package com.java110.api.listener.inspectionRoute;
 
 import com.java110.api.listener.AbstractServiceApiListener;
 import com.java110.utils.constant.ServiceCodeInspectionRouteConstant;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
@@ -57,6 +58,8 @@ public class ListInspectionRoutesListener extends AbstractServiceApiListener {
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+
     }
 
     @Override

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

@@ -26,12 +26,9 @@ public class SaveInspectionRouteListener extends AbstractServiceApiListener {
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
         //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
         Assert.hasKeyAndValue(reqJson, "routeName", "必填，请填写路线名称，字数100个以内");
-        Assert.hasKeyAndValue(reqJson, "inspectionName", "必填，请选择巡点名称");
-        Assert.hasKeyAndValue(reqJson, "machineQuantity", "无需填写，系统自动生成");
-        Assert.hasKeyAndValue(reqJson, "checkQuantity", "必填，请输入巡检路线的检查项数量");
-
+        Assert.hasKeyAndValue(reqJson, "seq", "必填，请选择巡点名称");
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
     }
 
     @Override

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

@@ -25,11 +25,10 @@ public class UpdateInspectionRouteListener extends AbstractServiceApiListener {
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
 
-        Assert.hasKeyAndValue(reqJson, "configId", "inspectionRouteId不能为空");
+        Assert.hasKeyAndValue(reqJson, "inspectionRouteId", "路线ID不能为空");
         Assert.hasKeyAndValue(reqJson, "routeName", "必填，请填写路线名称，字数100个以内");
-        Assert.hasKeyAndValue(reqJson, "inspectionName", "必填，请选择巡点名称");
-        Assert.hasKeyAndValue(reqJson, "machineQuantity", "无需填写，系统自动生成");
-        Assert.hasKeyAndValue(reqJson, "checkQuantity", "必填，请输入巡检路线的检查项数量");
+        Assert.hasKeyAndValue(reqJson, "seq", "必填，请选择巡点名称");
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
 
     }
 

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

@@ -39,9 +39,8 @@ public abstract class AbstractInspectionRouteBusinessServiceDataFlowListener ext
     protected void flushBusinessInspectionRouteInfo(Map businessInspectionRouteInfo, String statusCd) {
         businessInspectionRouteInfo.put("newBId", businessInspectionRouteInfo.get("b_id"));
         businessInspectionRouteInfo.put("operate", businessInspectionRouteInfo.get("operate"));
-        businessInspectionRouteInfo.put("inspectionRouteId", businessInspectionRouteInfo.get("inspection_routeId"));
-        businessInspectionRouteInfo.put("checkQuantity", businessInspectionRouteInfo.get("check_quantity"));
-        businessInspectionRouteInfo.put("machineQuantity", businessInspectionRouteInfo.get("machine_quantity"));
+        businessInspectionRouteInfo.put("inspectionRouteId", businessInspectionRouteInfo.get("inspection_route_id"));
+        businessInspectionRouteInfo.put("seq", businessInspectionRouteInfo.get("seq"));
         businessInspectionRouteInfo.put("remark", businessInspectionRouteInfo.get("remark"));
         businessInspectionRouteInfo.put("communityId", businessInspectionRouteInfo.get("community_id"));
         businessInspectionRouteInfo.put("routeName", businessInspectionRouteInfo.get("Route_name"));
@@ -71,8 +70,7 @@ public abstract class AbstractInspectionRouteBusinessServiceDataFlowListener ext
 
         currentInspectionRouteInfo.put("operate", currentInspectionRouteInfo.get("operate"));
         currentInspectionRouteInfo.put("inspectionRouteId", currentInspectionRouteInfo.get("inspection_routeId"));
-        currentInspectionRouteInfo.put("checkQuantity", currentInspectionRouteInfo.get("check_quantity"));
-        currentInspectionRouteInfo.put("machineQuantity", currentInspectionRouteInfo.get("machine_quantity"));
+        currentInspectionRouteInfo.put("seq", currentInspectionRouteInfo.get("seq"));
         currentInspectionRouteInfo.put("remark", currentInspectionRouteInfo.get("remark"));
         currentInspectionRouteInfo.put("communityId", currentInspectionRouteInfo.get("community_id"));
         currentInspectionRouteInfo.put("routeName", currentInspectionRouteInfo.get("Route_name"));

WebService/src/main/java/com/java110/web/smo/inspectionRoute/impl/AddInspectionRouteSMOImpl.java

@@ -29,9 +29,8 @@ public class AddInspectionRouteSMOImpl extends AbstractComponentSMO implements I
 
         //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
         Assert.hasKeyAndValue(paramIn, "routeName", "必填，请填写路线名称，字数100个以内");
-        Assert.hasKeyAndValue(paramIn, "inspectionName", "必填，请选择巡点名称");
-        Assert.hasKeyAndValue(paramIn, "machineQuantity", "无需填写，系统自动生成");
-        Assert.hasKeyAndValue(paramIn, "checkQuantity", "必填，请输入巡检路线的检查项数量");
+        Assert.hasKeyAndValue(paramIn, "seq", "必填，请选择巡点名称");
+        Assert.hasKeyAndValue(paramIn, "communityId", "小区ID不能为空");
 
 
         //super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_INSPECTIONROUTE);

WebService/src/main/java/com/java110/web/smo/inspectionRoute/impl/DeleteInspectionRouteSMOImpl.java

@@ -29,7 +29,8 @@ public class DeleteInspectionRouteSMOImpl extends AbstractComponentSMO implement
         //super.validatePageInfo(pd);
 
         //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
-        Assert.hasKeyAndValue(paramIn, "configId", "inspectionRouteId不能为空");
+        Assert.hasKeyAndValue(paramIn, "inspectionRouteId", "路线ID不能为空");
+        Assert.hasKeyAndValue(paramIn, "communityId", "小区ID不能为空");
 
 
         //super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_INSPECTIONROUTE);

WebService/src/main/java/com/java110/web/smo/inspectionRoute/impl/EditInspectionRouteSMOImpl.java

@@ -27,11 +27,10 @@ public class EditInspectionRouteSMOImpl extends AbstractComponentSMO implements
 
         //super.validatePageInfo(pd);
 
-        Assert.hasKeyAndValue(paramIn, "configId", "inspectionRouteId不能为空");
+        Assert.hasKeyAndValue(paramIn, "inspectionRouteId", "路线ID不能为空");
         Assert.hasKeyAndValue(paramIn, "routeName", "必填，请填写路线名称，字数100个以内");
-        Assert.hasKeyAndValue(paramIn, "inspectionName", "必填，请选择巡点名称");
-        Assert.hasKeyAndValue(paramIn, "machineQuantity", "无需填写，系统自动生成");
-        Assert.hasKeyAndValue(paramIn, "checkQuantity", "必填，请输入巡检路线的检查项数量");
+        Assert.hasKeyAndValue(paramIn, "seq", "必填，请选择巡点名称");
+        Assert.hasKeyAndValue(paramIn, "communityId", "小区ID不能为空");
 
 
         //super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST__INSPECTIONROUTE);

WebService/src/main/java/com/java110/web/smo/inspectionRoute/impl/ListInspectionRoutesSMOImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.core.component.AbstractComponentSMO;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.exception.SMOException;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.context.IPageData;
 import com.java110.entity.component.ComponentValidateResult;
@@ -34,6 +35,7 @@ public class ListInspectionRoutesSMOImpl extends AbstractComponentSMO implements
     protected void validate(IPageData pd, JSONObject paramIn) {
 
         super.validatePageInfo(pd);
+        Assert.hasKeyAndValue(paramIn, "communityId", "小区ID不能为空");
 
         //super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_INSPECTIONROUTE);
     }

WebService/src/main/resources/components/inspectionPointPackage/add-inspectionPoint/addInspectionPoint.html

@@ -7,19 +7,6 @@
                 <div class="ibox-content">
                     <div>
                         <div>
-                            <!--<div class="form-group row">
-                                <label class="col-sm-2 col-form-label">楼名称</label>
-                                <div class="col-sm-10"><input v-model="addFloorInfo.name" type="text" placeholder="必填，请填写名称" class="form-control"></div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">楼编号</label>
-                                <div class="col-sm-10"><input v-model="addFloorInfo.floorNum" type="email" placeholder="必填，请填写编号" class="form-control"></div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">备注</label>
-                                <div class="col-sm-10"><input v-model="addFloorInfo.remark" type="tel" placeholder="可填，请填写备注" class="form-control"></div>
-                            </div>-->
-
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">巡检点名称</label>
                                 <div class="col-sm-10">

WebService/src/main/resources/components/inspectionRoutePackage/add-inspectionRoute/addInspectionRoute.html

@@ -1,4 +1,5 @@
-<div id = "addInspectionRouteModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="addInspectionRouteModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
@@ -6,57 +7,36 @@
                 <div class="ibox-content">
                     <div>
                         <div>
-                            <!--<div class="form-group row">
-                                <label class="col-sm-2 col-form-label">楼名称</label>
-                                <div class="col-sm-10"><input v-model="addFloorInfo.name" type="text" placeholder="必填，请填写名称" class="form-control"></div>
+
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">路线名称</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addInspectionRouteInfo.routeName" type="text"
+                                           placeholder="必填，请填写路线名称" class="form-control">
+                                </div>
                             </div>
                             <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">楼编号</label>
-                                <div class="col-sm-10"><input v-model="addFloorInfo.floorNum" type="email" placeholder="必填，请填写编号" class="form-control"></div>
+                                <label class="col-sm-2 col-form-label">顺序</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addInspectionRouteInfo.seq" type="text"
+                                           placeholder="必填，请填写检查项数量" class="form-control">
+                                </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">备注</label>
-                                <div class="col-sm-10"><input v-model="addFloorInfo.remark" type="tel" placeholder="可填，请填写备注" class="form-control"></div>
-                            </div>-->
-
-                            <div class="form-group row">
-         <label class="col-sm-2 col-form-label">路线名称</label>
-         <div class="col-sm-10">
-           <input v-model="addInspectionRouteInfo.routeName"                   type="text" placeholder="必填，请填写路线名称" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">巡检点</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="addInspectionRouteInfo.inspectionName">
-         <option selected  disabled value="">必填，请选择巡检点</option>
-         <option  value="1000">巡点1</option>
-<option  value="1001">巡点2</option>
-<option  value="1002">巡点3</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">设备数量</label>
-         <div class="col-sm-10">
-           <input v-model="addInspectionRouteInfo.machineQuantity"                   type="text" placeholder="必填，请填写设备数量" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">检查项数量</label>
-         <div class="col-sm-10">
-           <input v-model="addInspectionRouteInfo.checkQuantity"                   type="text" placeholder="必填，请填写检查项数量" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">备注</label>
-         <div class="col-sm-10">
-           <input v-model="addInspectionRouteInfo.remark"                   type="text" placeholder="选填，请填写备注" class="form-control">
-         </div>
-</div>
+                                <div class="col-sm-10">
+                                    <input v-model="addInspectionRouteInfo.remark" type="text" placeholder="选填，请填写备注"
+                                           class="form-control">
+                                </div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="saveInspectionRouteInfo()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button"
+                                        v-on:click="saveInspectionRouteInfo()"><i class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
                             </div>
                         </div>
                     </div>

WebService/src/main/resources/components/inspectionRoutePackage/add-inspectionRoute/addInspectionRoute.js

@@ -1,148 +1,111 @@
-(function(vc){
+(function(vc) {
 
     vc.extends({
         propTypes: {
-               callBackListener:vc.propTypes.string, //父组件名称
-               callBackFunction:vc.propTypes.string //父组件监听方法
+            callBackListener: vc.propTypes.string,
+            //父组件名称
+            callBackFunction: vc.propTypes.string //父组件监听方法
         },
-        data:{
-            addInspectionRouteInfo:{
-                configId:'',
-                routeName:'',
-inspectionName:'',
-machineQuantity:'',
-checkQuantity:'',
-remark:'',
-
+        data: {
+            addInspectionRouteInfo: {
+                routeName: '',
+                seq: '',
+                remark: '',
             }
         },
-         _initMethod:function(){
+        _initMethod: function() {
 
-         },
-         _initEvent:function(){
-            vc.on('addInspectionRoute','openAddInspectionRouteModal',function(){
+},
+        _initEvent: function() {
+            vc.on('addInspectionRoute', 'openAddInspectionRouteModal',
+            function() {
                 $('#addInspectionRouteModel').modal('show');
             });
         },
-        methods:{
-            addInspectionRouteValidate(){
+        methods: {
+            addInspectionRouteValidate() {
                 return vc.validate.validate({
-                    addInspectionRouteInfo:vc.component.addInspectionRouteInfo
-                },{
-                    'addInspectionRouteInfo.routeName':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"路线名称不能为空"
-                        },
- {
-                            limit:"maxin",
-                            param:"1,100",
-                            errInfo:"路线名称字数不能超过100个"
-                        },
-                    ],
-'addInspectionRouteInfo.inspectionName':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"巡检点不能为空"
-                        },
- {
-                            limit:"maxLength",
-                            param:"3000",
-                            errInfo:"1个巡检路线的巡检点上限为100个"
-                        },
-                    ],
-'addInspectionRouteInfo.machineQuantity':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"设备数量不能为空"
-                        },
- {
-                            limit:"num",
-                            param:"",
-                            errInfo:"数量（数字）格式错误"
-                        },
+                    addInspectionRouteInfo: vc.component.addInspectionRouteInfo
+                },
+                {
+                    'addInspectionRouteInfo.routeName': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "路线名称不能为空"
+                    },
+                    {
+                        limit: "maxin",
+                        param: "1,100",
+                        errInfo: "路线名称字数不能超过100个"
+                    },
                     ],
-'addInspectionRouteInfo.checkQuantity':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"检查项数量不能为空"
-                        },
- {
-                            limit:"num",
-                            param:"",
-                            errInfo:"数量（数字）格式错误"
-                        },
+                    'addInspectionRouteInfo.seq': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "顺序不能为空"
+                    },
+                    {
+                        limit: "num",
+                        param: "",
+                        errInfo: "顺序必须是整数"
+                    },
                     ],
-'addInspectionRouteInfo.remark':[
- {
-                            limit:"maxin",
-                            param:"1,200",
-                            errInfo:"收费项目不能超过100位"
-                        },
+                    'addInspectionRouteInfo.remark': [{
+                        limit: "maxin",
+                        param: "1,200",
+                        errInfo: "备注不能超过200位"
+                    },
                     ],
 
-
-
-
                 });
             },
-            saveInspectionRouteInfo:function(){
-                if(!vc.component.addInspectionRouteValidate()){
+            saveInspectionRouteInfo: function() {
+                if (!vc.component.addInspectionRouteValidate()) {
                     vc.toast(vc.validate.errInfo);
 
-                    return ;
+                    return;
                 }
 
                 vc.component.addInspectionRouteInfo.communityId = vc.getCurrentCommunity().communityId;
                 //不提交数据将数据 回调给侦听处理
-                if(vc.notNull($props.callBackListener)){
-                    vc.emit($props.callBackListener,$props.callBackFunction,vc.component.addInspectionRouteInfo);
+                if (vc.notNull($props.callBackListener)) {
+                    vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addInspectionRouteInfo);
                     $('#addInspectionRouteModel').modal('hide');
-                    return ;
+                    return;
                 }
 
-                vc.http.post(
-                    'addInspectionRoute',
-                    'save',
-                    JSON.stringify(vc.component.addInspectionRouteInfo),
-                    {
-                        emulateJSON:true
-                     },
-                     function(json,res){
-                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
-                        if(res.status == 200){
-                            //关闭model
-                            $('#addInspectionRouteModel').modal('hide');
-                            vc.component.clearAddInspectionRouteInfo();
-                            vc.emit('inspectionRouteManage','listInspectionRoute',{});
+                vc.http.post('addInspectionRoute', 'save', JSON.stringify(vc.component.addInspectionRouteInfo), {
+                    emulateJSON: true
+                },
+                function(json, res) {
+                    //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                    if (res.status == 200) {
+                        //关闭model
+                        $('#addInspectionRouteModel').modal('hide');
+                        vc.component.clearAddInspectionRouteInfo();
+                        vc.emit('inspectionRouteManage', 'listInspectionRoute', {});
 
-                            return ;
-                        }
-                        vc.message(json);
+                        return;
+                    }
+                    vc.message(json);
 
-                     },
-                     function(errInfo,error){
-                        console.log('请求失败处理');
+                },
+                function(errInfo, error) {
+                    console.log('请求失败处理');
 
-                        vc.message(errInfo);
+                    vc.message(errInfo);
 
-                     });
+                });
             },
-            clearAddInspectionRouteInfo:function(){
+            clearAddInspectionRouteInfo: function() {
                 vc.component.addInspectionRouteInfo = {
-                                            routeName:'',
-inspectionName:'',
-machineQuantity:'',
-checkQuantity:'',
-remark:'',
+                    routeName: '',
+                    seq: '',
+                    remark: '',
 
-                                        };
+                };
             }
         }
     });
 
-})(window.vc);
+})(window.vc);

WebService/src/main/resources/components/inspectionRoutePackage/edit-inspectionRoute/editInspectionRoute.html

@@ -1,4 +1,5 @@
-<div id = "editInspectionRouteModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="editInspectionRouteModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
@@ -7,43 +8,34 @@
                     <div>
                         <div>
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">路线名称</label>
-         <div class="col-sm-10">
-           <input v-model="editInspectionRouteInfo.routeName"                   type="text" placeholder="必填，请填写路线名称" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">巡检点</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="editInspectionRouteInfo.inspectionName">
-         <option selected  disabled value="">必填，请选择巡检点</option>
-         <option  value="1000">巡点1</option>
-<option  value="1001">巡点2</option>
-<option  value="1002">巡点3</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">设备数量</label>
-         <div class="col-sm-10">
-           <input v-model="editInspectionRouteInfo.machineQuantity"                   type="text" placeholder="必填，请填写设备数量" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">检查项数量</label>
-         <div class="col-sm-10">
-           <input v-model="editInspectionRouteInfo.checkQuantity"                   type="text" placeholder="必填，请填写检查项数量" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">备注</label>
-         <div class="col-sm-10">
-           <input v-model="editInspectionRouteInfo.remark"                   type="text" placeholder="选填，请填写备注" class="form-control">
-         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">路线名称</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editInspectionRouteInfo.routeName" type="text"
+                                           placeholder="必填，请填写路线名称" class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">顺序</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editInspectionRouteInfo.seq" type="text"
+                                           placeholder="必填，请填写设备数量" class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">备注</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editInspectionRouteInfo.remark" type="text" placeholder="选填，请填写备注"
+                                           class="form-control">
+                                </div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="editInspectionRoute()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button"
+                                        v-on:click="editInspectionRoute()"><i class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
                             </div>
                         </div>
                     </div>

WebService/src/main/resources/components/inspectionRoutePackage/edit-inspectionRoute/editInspectionRoute.js

@@ -1,138 +1,103 @@
-(function(vc,vm){
+(function(vc, vm) {
 
     vc.extends({
-        data:{
-            editInspectionRouteInfo:{
-                configId:'',
-routeName:'',
-inspectionName:'',
-machineQuantity:'',
-checkQuantity:'',
-remark:'',
+        data: {
+            editInspectionRouteInfo: {
+                inspectionRouteId: '',
+                routeName: '',
+                seq: '',
+                remark: '',
 
             }
         },
-         _initMethod:function(){
+        _initMethod: function() {
 
-         },
-         _initEvent:function(){
-             vc.on('editInspectionRoute','openEditInspectionRouteModal',function(_params){
+},
+        _initEvent: function() {
+            vc.on('editInspectionRoute', 'openEditInspectionRouteModal',
+            function(_params) {
                 vc.component.refreshEditInspectionRouteInfo();
                 $('#editInspectionRouteModel').modal('show');
-                vc.copyObject(_params, vc.component.editInspectionRouteInfo );
+                vc.copyObject(_params, vc.component.editInspectionRouteInfo);
                 vc.component.editInspectionRouteInfo.communityId = vc.getCurrentCommunity().communityId;
             });
         },
-        methods:{
-            editInspectionRouteValidate:function(){
-                        return vc.validate.validate({
-                            editInspectionRouteInfo:vc.component.editInspectionRouteInfo
-                        },{
-                            'editInspectionRouteInfo.routeName':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"路线名称不能为空"
-                        },
- {
-                            limit:"maxin",
-                            param:"1,100",
-                            errInfo:"路线名称字数不能超过100个"
-                        },
-                    ],
-'editInspectionRouteInfo.inspectionName':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"巡检点不能为空"
-                        },
- {
-                            limit:"maxLength",
-                            param:"3000",
-                            errInfo:"1个巡检路线的巡检点上限为100个"
-                        },
-                    ],
-'editInspectionRouteInfo.machineQuantity':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"设备数量不能为空"
-                        },
- {
-                            limit:"num",
-                            param:"",
-                            errInfo:"数量（数字）格式错误"
-                        },
+        methods: {
+            editInspectionRouteValidate: function() {
+                return vc.validate.validate({
+                    editInspectionRouteInfo: vc.component.editInspectionRouteInfo
+                },
+                {
+                    'editInspectionRouteInfo.routeName': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "路线名称不能为空"
+                    },
+                    {
+                        limit: "maxin",
+                        param: "1,100",
+                        errInfo: "路线名称字数不能超过100个"
+                    },
                     ],
-'editInspectionRouteInfo.checkQuantity':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"检查项数量不能为空"
-                        },
- {
-                            limit:"num",
-                            param:"",
-                            errInfo:"数量（数字）格式错误"
-                        },
+                    'editInspectionRouteInfo.seq': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "顺序不能为空"
+                    },
+                    {
+                        limit: "num",
+                        param: "",
+                        errInfo: "顺序必须是数字"
+                    },
                     ],
-'editInspectionRouteInfo.remark':[
- {
-                            limit:"maxin",
-                            param:"1,200",
-                            errInfo:"收费项目不能超过100位"
-                        },
+                    'editInspectionRouteInfo.remark': [{
+                        limit: "maxin",
+                        param: "1,200",
+                        errInfo: "收费项目不能超过100位"
+                    },
                     ],
-'editInspectionRouteInfo.configId':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"inspectionRouteId不能为空"
-                        }]
+                    'editInspectionRouteInfo.inspectionRouteId': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "路线ID不能为空"
+                    }]
 
-                        });
-             },
-            editInspectionRoute:function(){
-                if(!vc.component.editInspectionRouteValidate()){
+                });
+            },
+            editInspectionRoute: function() {
+                if (!vc.component.editInspectionRouteValidate()) {
                     vc.toast(vc.validate.errInfo);
-                    return ;
+                    return;
                 }
 
-                vc.http.post(
-                    'editInspectionRoute',
-                    'update',
-                    JSON.stringify(vc.component.editInspectionRouteInfo),
-                    {
-                        emulateJSON:true
-                     },
-                     function(json,res){
-                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
-                        if(res.status == 200){
-                            //关闭model
-                            $('#editInspectionRouteModel').modal('hide');
-                             vc.emit('inspectionRouteManage','listInspectionRoute',{});
-                            return ;
-                        }
-                        vc.message(json);
-                     },
-                     function(errInfo,error){
-                        console.log('请求失败处理');
+                vc.http.post('editInspectionRoute', 'update', JSON.stringify(vc.component.editInspectionRouteInfo), {
+                    emulateJSON: true
+                },
+                function(json, res) {
+                    //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                    if (res.status == 200) {
+                        //关闭model
+                        $('#editInspectionRouteModel').modal('hide');
+                        vc.emit('inspectionRouteManage', 'listInspectionRoute', {});
+                        return;
+                    }
+                    vc.message(json);
+                },
+                function(errInfo, error) {
+                    console.log('请求失败处理');
 
-                        vc.message(errInfo);
-                     });
+                    vc.message(errInfo);
+                });
             },
-            refreshEditInspectionRouteInfo:function(){
-                vc.component.editInspectionRouteInfo= {
-                  configId:'',
-routeName:'',
-inspectionName:'',
-machineQuantity:'',
-checkQuantity:'',
-remark:'',
-
+            refreshEditInspectionRouteInfo: function() {
+                vc.component.editInspectionRouteInfo = {
+                    inspectionRouteId: '',
+                    routeName: '',
+                    seq: '',
+                    remark: '',
                 }
             }
         }
     });
 
-})(window.vc,window.vc.component);
+})(window.vc, window.vc.component);

WebService/src/main/resources/components/inspectionRoutePackage/inspectionRoute-manage/inspectionRouteManage.html

@@ -5,25 +5,37 @@
                 <div class="ibox-title">
                     <h5>查询条件</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        
+
                     </div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
-<div class="col-sm-4" >
-<div class="form-group">
-                                <input type="text" placeholder="请输入路线名称" v-model="inspectionRouteManageInfo.conditions.routeName" class=" form-control">
-                            </div>                        </div><div class="col-sm-4" >
-<div class="form-group">
-                                <input type="text" placeholder="请输入巡检点名称" v-model="inspectionRouteManageInfo.conditions.inspectionName" class=" form-control">
-                            </div>                        </div><div class="col-sm-3" >
-<div class="form-group">
-                                <input type="text" placeholder="请输入备注" v-model="inspectionRouteManageInfo.conditions.remark" class=" form-control">
-                            </div>                        </div><div class="col-sm-1">
-                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryInspectionRouteMethod()">
-                                    <i class="glyphicon glyphicon-search"></i> 查询
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入路线名称"
+                                       v-model="inspectionRouteManageInfo.conditions.routeName" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入巡检点名称"
+                                       v-model="inspectionRouteManageInfo.conditions.inspectionName"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入路线ID"
+                                       v-model="inspectionRouteManageInfo.conditions.configId" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-1">
+                            <button type="button" class="btn btn-primary btn-sm"
+                                    v-on:click="_queryInspectionRouteMethod()">
+                                <i class="glyphicon glyphicon-search"></i> 查询
                             </button>
-                        </div></div>
+                        </div>
+                    </div>
 
 
                 </div>
@@ -36,9 +48,10 @@
                 <div class="ibox-title">
                     <h5>巡检路线信息</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddInspectionRouteModal()">
+                        <button type="button" class="btn btn-primary btn-sm"
+                                v-on:click="_openAddInspectionRouteModal()">
                             <i class="glyphicon glyphicon-plus"></i>
-                            添加巡检路线
+                            添加
                         </button>
                     </div>
                 </div>
@@ -49,31 +62,36 @@
                     >
                         <thead>
                         <tr>
-                                                        <th class="text-center">inspectionRouteId</th>
                             <th class="text-center">路线名称</th>
-                            <th class="text-center">巡检点</th>
-                            <th class="text-center">设备数量</th>
-                            <th class="text-center">检查项数量</th>
-                            <th class="text-center">备注</th>
-                            <th class="text-center">操作</th>
-
-
+                            <th class="text-center">线路ID</th>
+                            <th class="text-center">顺序</th>
+                            <th class="text-center">创建时间</th>
+                            <th class="text-right">操作</th>
                         </tr>
                         </thead>
                         <tbody>
                         <tr v-for="inspectionRoute in inspectionRouteManageInfo.inspectionRoutes">
-                                                        <td class="text-center">{{inspectionRoute.configId}}</td>
                             <td class="text-center">{{inspectionRoute.routeName}}</td>
-                            <td class="text-center">{{inspectionRoute.inspectionName}}</td>
-                            <td class="text-center">{{inspectionRoute.machineQuantity}}</td>
-                            <td class="text-center">{{inspectionRoute.checkQuantity}}</td>
-                            <td class="text-center">{{inspectionRoute.remark}}</td>
-                            <td class="text-center"><div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openEditInspectionRouteModel(inspectionRoute)">修改</button>
+                            <td class="text-center">{{inspectionRoute.inspectionRouteId}}</td>
+                            <td class="text-center">{{inspectionRoute.seq}}</td>
+                            <td class="text-center">{{inspectionRoute.createTime}}</td>
+                            <td class="text-right">
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs"
+                                            v-on:click="_openEditInspectionRouteModel(inspectionRoute)">巡检点
+                                    </button>
                                 </div>
                                 <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteInspectionRouteModel(inspectionRoute)">删除</button>
-                                </div></td>
+                                    <button class="btn-white btn btn-xs"
+                                            v-on:click="_openEditInspectionRouteModel(inspectionRoute)">修改
+                                    </button>
+                                </div>
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs"
+                                            v-on:click="_openDeleteInspectionRouteModel(inspectionRoute)">删除
+                                    </button>
+                                </div>
+                            </td>
 
                         </tr>
                         </tbody>
@@ -92,7 +110,6 @@
         </div>
     </div>
 
-    
 
     <vc:create name="addInspectionRoute"
                callBackListener=""

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

@@ -16,20 +16,14 @@ import java.util.Date;
 public class InspectionRouteDto extends PageDto implements Serializable {
 
     private String inspectionRouteId;
-    private String checkQuantity;
-    private String machineQuantity;
-    private String remark;
-    private String communityId;
     private String routeName;
-    //用于批量查询路线
-    private String[] inspectionRouteIds;
-
+    private int seq;
+    private String remark;
 
     private Date createTime;
 
     private String statusCd = "0";
 
-
     public String getInspectionRouteId() {
         return inspectionRouteId;
     }
@@ -38,20 +32,20 @@ public class InspectionRouteDto extends PageDto implements Serializable {
         this.inspectionRouteId = inspectionRouteId;
     }
 
-    public String getCheckQuantity() {
-        return checkQuantity;
+    public String getRouteName() {
+        return routeName;
     }
 
-    public void setCheckQuantity(String checkQuantity) {
-        this.checkQuantity = checkQuantity;
+    public void setRouteName(String routeName) {
+        this.routeName = routeName;
     }
 
-    public String getMachineQuantity() {
-        return machineQuantity;
+    public int getSeq() {
+        return seq;
     }
 
-    public void setMachineQuantity(String machineQuantity) {
-        this.machineQuantity = machineQuantity;
+    public void setSeq(int seq) {
+        this.seq = seq;
     }
 
     public String getRemark() {
@@ -62,23 +56,6 @@ public class InspectionRouteDto extends PageDto implements Serializable {
         this.remark = remark;
     }
 
-    public String getCommunityId() {
-        return communityId;
-    }
-
-    public void setCommunityId(String communityId) {
-        this.communityId = communityId;
-    }
-
-    public String getRouteName() {
-        return routeName;
-    }
-
-    public void setRouteName(String routeName) {
-        this.routeName = routeName;
-    }
-
-
     public Date getCreateTime() {
         return createTime;
     }
@@ -94,12 +71,4 @@ public class InspectionRouteDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-
-    public String[] getInspectionRouteIds() {
-        return inspectionRouteIds;
-    }
-
-    public void setInspectionRouteIds(String[] inspectionRouteIds) {
-        this.inspectionRouteIds = inspectionRouteIds;
-    }
 }

java110-bean/src/main/java/com/java110/vo/api/inspectionRoute/ApiInspectionRouteDataVo.java

@@ -5,20 +5,19 @@ import java.util.Date;
 
 public class ApiInspectionRouteDataVo implements Serializable {
 
-    private String configId;
+    private String inspectionRouteId;
     private String routeName;
-    private String inspectionName;
-    private String machineQuantity;
-    private String checkQuantity;
+    private String seq;
     private String remark;
-    private String inspectionRouteId;
 
-    public String getConfigId() {
-        return configId;
+    private String createTime;
+
+    public String getInspectionRouteId() {
+        return inspectionRouteId;
     }
 
-    public void setConfigId(String configId) {
-        this.configId = configId;
+    public void setInspectionRouteId(String inspectionRouteId) {
+        this.inspectionRouteId = inspectionRouteId;
     }
 
     public String getRouteName() {
@@ -29,28 +28,12 @@ public class ApiInspectionRouteDataVo implements Serializable {
         this.routeName = routeName;
     }
 
-    public String getInspectionName() {
-        return inspectionName;
+    public String getSeq() {
+        return seq;
     }
 
-    public void setInspectionName(String inspectionName) {
-        this.inspectionName = inspectionName;
-    }
-
-    public String getMachineQuantity() {
-        return machineQuantity;
-    }
-
-    public void setMachineQuantity(String machineQuantity) {
-        this.machineQuantity = machineQuantity;
-    }
-
-    public String getCheckQuantity() {
-        return checkQuantity;
-    }
-
-    public void setCheckQuantity(String checkQuantity) {
-        this.checkQuantity = checkQuantity;
+    public void setSeq(String seq) {
+        this.seq = seq;
     }
 
     public String getRemark() {
@@ -61,11 +44,11 @@ public class ApiInspectionRouteDataVo implements Serializable {
         this.remark = remark;
     }
 
-    public String getInspectionRouteId() {
-        return inspectionRouteId;
+    public String getCreateTime() {
+        return createTime;
     }
 
-    public void setInspectionRouteId(String inspectionRouteId) {
-        this.inspectionRouteId = inspectionRouteId;
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
     }
 }

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

@@ -6,18 +6,17 @@
 
     <!-- 保存巡检路线信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessInspectionRouteInfo" parameterType="Map">
-           insert into business_inspection_route(
-operate,inspection_routeId,check_quantity,machine_quantity,remark,community_id,b_id,Route_name
-) values (
-#{operate},#{inspectionRouteId},#{checkQuantity},#{machineQuantity},#{remark},#{communityId},#{bId},#{routeName}
-)
-       </insert>
+        insert into business_inspection_route(
+        operate,inspection_routeId,seq,remark,community_id,b_id,Route_name
+        ) values (
+        #{operate},#{inspectionRouteId},#{seq},#{remark},#{communityId},#{bId},#{routeName}
+        )
+    </insert>
 
 
     <!-- 查询巡检路线信息（Business） add by wuxw 2018-07-03 -->
     <select id="getBusinessInspectionRouteInfo" parameterType="Map" resultType="Map">
-        select t.operate,t.inspection_route_Id,t.inspection_route_Id inspectionRouteId,t.check_quantity,t.check_quantity
-        checkQuantity,t.machine_quantity,t.machine_quantity machineQuantity,t.remark,t.community_id,t.community_id
+        select t.operate,t.inspection_route_Id,t.inspection_route_Id inspectionRouteId,t.seq,t.remark,t.community_id,t.community_id
         communityId,t.b_id,t.b_id bId,t.Route_name,t.Route_name routeName
         from business_inspection_route t
         where 1 =1
@@ -27,11 +26,8 @@ operate,inspection_routeId,check_quantity,machine_quantity,remark,community_id,b
         <if test="inspectionRouteId !=null and inspectionRouteId != ''">
             and t.inspection_route_Id= #{inspectionRouteId}
         </if>
-        <if test="checkQuantity !=null and checkQuantity != ''">
-            and t.check_quantity= #{checkQuantity}
-        </if>
-        <if test="machineQuantity !=null and machineQuantity != ''">
-            and t.machine_quantity= #{machineQuantity}
+        <if test="seq !=null ">
+            and t.seq= #{seq}
         </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
@@ -52,19 +48,16 @@ operate,inspection_routeId,check_quantity,machine_quantity,remark,community_id,b
     <!-- 保存巡检路线信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveInspectionRouteInfoInstance" parameterType="Map">
         insert into inspection_route(
-        inspection_routeId,check_quantity,machine_quantity,remark,status_cd,community_id,b_id,Route_name
+        inspection_routeId,seq,remark,status_cd,community_id,b_id,Route_name
         ) select
-        t.inspection_route_Id,t.check_quantity,t.machine_quantity,t.remark,'0',t.community_id,t.b_id,t.Route_name from
+        t.inspection_route_Id,t.seq,t.remark,'0',t.community_id,t.b_id,t.Route_name from
         business_inspection_route t where 1=1
         and t.operate= 'ADD'
         <if test="inspectionRouteId !=null and inspectionRouteId != ''">
             and t.inspection_route_Id= #{inspectionRouteId}
         </if>
-        <if test="checkQuantity !=null and checkQuantity != ''">
-            and t.check_quantity= #{checkQuantity}
-        </if>
-        <if test="machineQuantity !=null and machineQuantity != ''">
-            and t.machine_quantity= #{machineQuantity}
+        <if test="seq !=null ">
+            and t.seq= #{seq}
         </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
@@ -84,19 +77,15 @@ operate,inspection_routeId,check_quantity,machine_quantity,remark,community_id,b
 
     <!-- 查询巡检路线信息 add by wuxw 2018-07-03 -->
     <select id="getInspectionRouteInfo" parameterType="Map" resultType="Map">
-        select t.inspection_route_Id,t.inspection_route_Id inspectionRouteId,t.check_quantity,t.check_quantity
-        checkQuantity,t.machine_quantity,t.machine_quantity machineQuantity,t.remark,t.status_cd,t.status_cd
+        select t.inspection_route_Id,t.inspection_route_Id inspectionRouteId,t.seq,t.remark,t.status_cd,t.status_cd
         statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.Route_name,t.Route_name routeName
         from inspection_route t
         where 1 =1
         <if test="inspectionRouteId !=null and inspectionRouteId != ''">
             and t.inspection_route_Id= #{inspectionRouteId}
         </if>
-        <if test="checkQuantity !=null and checkQuantity != ''">
-            and t.check_quantity= #{checkQuantity}
-        </if>
-        <if test="machineQuantity !=null and machineQuantity != ''">
-            and t.machine_quantity= #{machineQuantity}
+        <if test="seq !=null ">
+            and t.seq= #{seq}
         </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
@@ -133,11 +122,8 @@ operate,inspection_routeId,check_quantity,machine_quantity,remark,community_id,b
         <if test="newBId != null and newBId != ''">
             ,t.b_id = #{newBId}
         </if>
-        <if test="checkQuantity !=null and checkQuantity != ''">
-            , t.check_quantity= #{checkQuantity}
-        </if>
-        <if test="machineQuantity !=null and machineQuantity != ''">
-            , t.machine_quantity= #{machineQuantity}
+        <if test="seq !=null ">
+            , t.seq= #{seq}
         </if>
         <if test="remark !=null and remark != ''">
             , t.remark= #{remark}
@@ -166,11 +152,8 @@ operate,inspection_routeId,check_quantity,machine_quantity,remark,community_id,b
         <if test="inspectionRouteId !=null and inspectionRouteId != ''">
             and t.inspection_route_Id= #{inspectionRouteId}
         </if>
-        <if test="checkQuantity !=null and checkQuantity != ''">
-            and t.check_quantity= #{checkQuantity}
-        </if>
-        <if test="machineQuantity !=null and machineQuantity != ''">
-            and t.machine_quantity= #{machineQuantity}
+        <if test="seq !=null ">
+            and t.seq= #{seq}
         </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}