优化巡检功能

WebService/src/main/java/com/java110/web/components/inspectionRoute/AddInspectionRoutePointComponent.java

@@ -0,0 +1,53 @@
+package com.java110.web.components.inspectionRoute;
+
+import com.java110.core.context.IPageData;
+import com.java110.web.smo.inspectionPoint.IListInspectionPointsSMO;
+import com.java110.web.smo.inspectionRoute.IAddInspectionRoutePointSMO;
+import com.java110.web.smo.inspectionRoute.IAddInspectionRouteSMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+/**
+ * 添加巡检路线巡检点组件
+ */
+@Component("addInspectionRoutePoint")
+public class AddInspectionRoutePointComponent {
+
+    @Autowired
+    private IAddInspectionRoutePointSMO addInspectionRoutePointSMO;
+
+
+    @Autowired
+    private IListInspectionPointsSMO listInspectionPointsSMOImpl;
+
+    /**
+     * 添加巡检路线数据
+     * @param pd 页面数据封装
+     * @return ResponseEntity 对象
+     */
+    public ResponseEntity<String> save(IPageData pd){
+        return addInspectionRoutePointSMO.saveInspectionRoutePoint(pd);
+    }
+
+    public ResponseEntity<String> list(IPageData pd){
+        return listInspectionPointsSMOImpl.listInspectionPoints(pd);
+    }
+
+
+    public IAddInspectionRoutePointSMO getAddInspectionRoutePointSMO() {
+        return addInspectionRoutePointSMO;
+    }
+
+    public void setAddInspectionRoutePointSMO(IAddInspectionRoutePointSMO addInspectionRoutePointSMO) {
+        this.addInspectionRoutePointSMO = addInspectionRoutePointSMO;
+    }
+
+    public IListInspectionPointsSMO getListInspectionPointsSMOImpl() {
+        return listInspectionPointsSMOImpl;
+    }
+
+    public void setListInspectionPointsSMOImpl(IListInspectionPointsSMO listInspectionPointsSMOImpl) {
+        this.listInspectionPointsSMOImpl = listInspectionPointsSMOImpl;
+    }
+}

WebService/src/main/java/com/java110/web/components/inspectionRoute/DeleteInspectionRoutePointComponent.java

@@ -0,0 +1,36 @@
+package com.java110.web.components.inspectionRoute;
+
+import com.java110.core.context.IPageData;
+import com.java110.web.smo.inspectionRoute.IDeleteInspectionRoutePointSMO;
+import com.java110.web.smo.inspectionRoute.IDeleteInspectionRouteSMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+/**
+ * 添加巡检路线组件
+ */
+@Component("deleteInspectionRoutePoint")
+public class DeleteInspectionRoutePointComponent {
+
+    @Autowired
+    private IDeleteInspectionRoutePointSMO deleteInspectionRoutePointSMOImpl;
+
+    /**
+     * 添加巡检路线数据
+     *
+     * @param pd 页面数据封装
+     * @return ResponseEntity 对象
+     */
+    public ResponseEntity<String> delete(IPageData pd) {
+        return deleteInspectionRoutePointSMOImpl.deleteInspectionRoutePoint(pd);
+    }
+
+    public IDeleteInspectionRoutePointSMO getDeleteInspectionRoutePointSMOImpl() {
+        return deleteInspectionRoutePointSMOImpl;
+    }
+
+    public void setDeleteInspectionRoutePointSMOImpl(IDeleteInspectionRoutePointSMO deleteInspectionRoutePointSMOImpl) {
+        this.deleteInspectionRoutePointSMOImpl = deleteInspectionRoutePointSMOImpl;
+    }
+}

WebService/src/main/java/com/java110/web/components/inspectionRoute/InspectionRoutePointManageComponent.java

@@ -0,0 +1,41 @@
+package com.java110.web.components.inspectionRoute;
+
+
+import com.java110.core.context.IPageData;
+import com.java110.web.smo.inspectionRoute.IListInspectionRoutePointsSMO;
+import com.java110.web.smo.inspectionRoute.IListInspectionRoutesSMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 巡检路线组件管理类
+ *
+ * add by wuxw
+ *
+ * 2019-06-29
+ */
+@Component("inspectionRoutePointManage")
+public class InspectionRoutePointManageComponent {
+
+    @Autowired
+    private IListInspectionRoutePointsSMO listInspectionRoutePointsSMOImpl;
+
+    /**
+     * 查询巡检路线列表
+     * @param pd 页面数据封装
+     * @return 返回 ResponseEntity 对象
+     */
+    public ResponseEntity<String> list(IPageData pd){
+        return listInspectionRoutePointsSMOImpl.listInspectionRoutePoint(pd);
+    }
+
+    public IListInspectionRoutePointsSMO getListInspectionRoutePointsSMOImpl() {
+        return listInspectionRoutePointsSMOImpl;
+    }
+
+    public void setListInspectionRoutePointsSMOImpl(IListInspectionRoutePointsSMO listInspectionRoutePointsSMOImpl) {
+        this.listInspectionRoutePointsSMOImpl = listInspectionRoutePointsSMOImpl;
+    }
+}

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

@@ -0,0 +1,63 @@
+package com.java110.web.smo.inspectionRoute.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.component.AbstractComponentSMO;
+import com.java110.core.context.IPageData;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.util.Assert;
+import com.java110.web.smo.inspectionRoute.IDeleteInspectionRoutePointSMO;
+import com.java110.web.smo.inspectionRoute.IDeleteInspectionRouteSMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * 添加小区服务实现类
+ * delete by wuxw 2019-06-30
+ */
+@Service("deleteInspectionRoutePointSMOImpl")
+public class DeleteInspectionRoutePointSMOImpl extends AbstractComponentSMO implements IDeleteInspectionRoutePointSMO {
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Override
+    protected void validate(IPageData pd, JSONObject paramIn) {
+
+        //super.validatePageInfo(pd);
+
+        //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
+        Assert.hasKeyAndValue(paramIn, "irmRelId", "路线巡检点关系ID不能为空");
+        Assert.hasKeyAndValue(paramIn, "communityId", "小区ID不能为空");
+
+
+        //super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_INSPECTIONROUTE);
+
+    }
+
+    @Override
+    protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
+        ResponseEntity<String> responseEntity = null;
+        super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+
+        responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
+                ServiceConstant.SERVICE_API_URL + "/api/inspectionRoute.deleteInspectionRoutePoint",
+                HttpMethod.POST);
+        return responseEntity;
+    }
+
+    @Override
+    public ResponseEntity<String> deleteInspectionRoutePoint(IPageData pd) {
+        return super.businessProcess(pd);
+    }
+
+    public RestTemplate getRestTemplate() {
+        return restTemplate;
+    }
+
+    public void setRestTemplate(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
+}

WebService/src/main/resources/components/inspectionRoutePackage/add-inspectionRoutePoint/addInspectionRoutePoint.html

@@ -0,0 +1,73 @@
+<div id="addInspectionPointModel" class="modal fade" tabindex="-1" role="dialog"
+     aria-labelledby="addInspectionPointModelLabel"
+     aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h3 class="modal-title" id="addInspectionPointModelLabel">添加巡检点</h3>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class=" row">
+                    <div class="col-lg-12">
+                        <div class="ibox ">
+                            <div class="row">
+
+                                <div class="col-sm-7 m-b-xs">
+                                </div>
+                                <div class="col-sm-5">
+                                    <div class="input-group">
+                                        <input placeholder="输入小区名称" type="text"
+                                               v-model="addInspectionPointInfo.inspectionName"
+                                               class="form-control form-control-sm">
+                                        <span class="input-group-append">
+                                                <button type="button" class="btn btn-sm btn-primary"
+                                                        v-on:click="queryInspectionPoints()">查询</button>
+                                            </span>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="table-responsive" style="margin-top:15px">
+                                <table class="table table-striped">
+                                    <thead>
+                                    <tr>
+                                        <th class="text-center">
+                                            <input type="checkbox"  class="i-checks " @click="checkAll($event)" id="quan">
+                                        </th>
+                                        <th class="text-center">巡检点ID</th>
+                                        <th class="text-center">巡检点名称</th>
+
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <tr v-for="inspectionPoint in addInspectionPointInfo.inspectionPoints">
+                                        <td class="text-center">
+                                            <input type="checkbox" class="i-checks checkItem" v-bind:value="inspectionPoint.inspectionId" v-model="addInspectionPointInfo.selectInspectionPoints" >
+                                        </td>
+                                        <td class="text-center">{{inspectionPoint.inspectionId}}</td>
+                                        <td class="text-center">{{inspectionPoint.inspectionName}}</td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <!-- 分页 -->
+                                <vc:create namespace="addInspectionRoutePoint" name="paginationPlus"></vc:create>
+                                <div class="ibox-content" v-if="addInspectionRoutePointInfo.inspectionPoints.length > 0">
+
+                                    <button class="btn btn-primary float-right" type="button" v-on:click="addInspectionRoutePoint()"><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>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

WebService/src/main/resources/components/inspectionRoutePackage/add-inspectionRoutePoint/addInspectionRoutePoint.js

@@ -0,0 +1,137 @@
+(function(vc){
+    vc.extends({
+        propTypes: {
+           emitListener:vc.propTypes.string,
+           emitFunction:vc.propTypes.string
+        },
+        data:{
+            addInspectionRoutePointInfo:{
+                inspectionRouteId:'',
+                inspectionPoints:[],
+                inspectionName:'',
+                selectInspectionPoints:[]
+            }
+        },
+        watch: { // 监视双向绑定的数据数组
+            checkData: {
+                handler(){ // 数据数组有变化将触发此函数
+                    if(vc.component.addInspectionRoutePointInfo.selectInspectionPoints.length == vc.component.addInspectionRoutePointInfo.inspectionPoints.length){
+                        document.querySelector('#quan').checked = true;
+                    }else {
+                        document.querySelector('#quan').checked = false;
+                    }
+                },
+                deep: true // 深度监视
+            }
+        },
+        _initMethod:function(){
+        },
+        _initEvent:function(){
+            vc.on('addInspectionRoutePoint','openAddInspectionRoutePointModal',function(_param){
+                vc.component._refreshInspectionPointsInfo();
+                $('#addInspectionRoutePointModel').modal('show');
+                vc.copyObject(_param,vc.component.addInspectionRoutePointInfo);
+                vc.component._loadAllCommunityInfo(1,10,'');
+            });
+
+            vc.on('addInspectionRoutePoint','paginationPlus', 'page_event', function (_currentPage) {
+                vc.component._listInspectionRoutePoints(_currentPage, DEFAULT_ROWS);
+            });
+        },
+        methods:{
+            _loadInspectionPointInfo:function(_page,_row,_name){
+                var param = {
+                    params:{
+                        page:_page,
+                        row:_row,
+                        name:_name,
+                        inspectionRouteId:vc.component.addInspectionRoutePointInfo.inspectionRouteId,
+                        communityId:vc.getCurrentCommunity().communityId
+                    }
+                };
+
+                //发送get请求
+               vc.http.get('addInspectionRoutePoint',
+                            'list',
+                             param,
+                             function(json){
+                                var _inspectionPointInfo = JSON.parse(json);
+                                vc.component.addInspectionRoutePointInfo.inspectionPoints = _inspectionPointInfo.inspectionPoints;
+                                vc.emit('addInspectionRoutePoint','paginationPlus', 'init', {
+                                    total: _inspectionPointInfo.records,
+                                    currentPage: _page
+                                });
+                             },function(){
+                                console.log('请求失败处理');
+                             }
+                           );
+            },
+            addInspectionRoutePoint:function(_org){
+                var _selectInspectionPoints = vc.component.addInspectionRoutePointInfo.selectInspectionPoints;
+                var _tmpCommunitys = vc.component.addInspectionRoutePointInfo.inspectionPoints;
+                if(_selectInspectionPoints.length <1){
+                    vc.toast("请选择隶属小区");
+                    return ;
+                }
+                var _inspectionPoints = [];
+                for(var _selectIndex = 0 ;_selectIndex <_selectInspectionPoints.length ;_selectIndex ++){
+                    for(var _communityIndex =0; _communityIndex < _tmpCommunitys.length;_communityIndex++){
+                        if(_selectInspectionPoints[_selectIndex] == _tmpCommunitys[_communityIndex].communityId){
+                            _inspectionPoints.push({
+                                communityId:_tmpCommunitys[_communityIndex].communityId,
+                                communityName:_tmpCommunitys[_communityIndex].name
+                            });
+                        }
+                    }
+                }
+                var _objData = {
+                    orgId:vc.component.addInspectionRoutePointInfo.orgId,
+                    orgName:vc.component.addInspectionRoutePointInfo.orgName,
+                    inspectionPoints:_inspectionPoints
+                }
+                vc.http.post('addInspectionRoutePoint',
+                    'save',
+                    JSON.stringify(_objData),
+                    {
+                        emulateJSON: true
+                    },
+                 function(json,res){
+                    $('#addInspectionRoutePointModel').modal('hide');
+                    if(res.status == 200){
+                        vc.emit($props.emitListener,$props.emitFunction,{
+                        });
+                        return ;
+                    }
+                    vc.toast(json);
+                 },function(){
+                    console.log('请求失败处理');
+                 }
+               );
+                $('#addInspectionRoutePointModel').modal('hide');
+            },
+            queryInspectionPoints:function(){
+                vc.component._loadInspectionPointInfo(1,10,vc.component.addInspectionRoutePointInfo.inspectionName);
+            },
+            _refreshInspectionPointsInfo:function(){
+                vc.component.addInspectionRoutePointInfo={
+                    inspectionPoints:[],
+                    inspectionName:'',
+                    selectInspectionPoints:[]
+                };
+            },
+            checkAll:function(e){
+                    var checkObj = document.querySelectorAll('.checkItem'); // 获取所有checkbox项
+                    if(e.target.checked){ // 判定全选checkbox的勾选状态
+                        for(var i=0;i<checkObj.length;i++){
+                            if(!checkObj[i].checked){ // 将未勾选的checkbox选项push到绑定数组中
+                                vc.component.addInspectionRoutePointInfo.selectInspectionPoints.push(checkObj[i].value);
+                            }
+                        }
+                    }else { // 如果是去掉全选则清空checkbox选项绑定数组
+                        vc.component.addInspectionRoutePointInfo.selectInspectionPoints = [];
+                    }
+            }
+        }
+
+    });
+})(window.vc);

WebService/src/main/resources/components/inspectionRoutePackage/delete-inspectionRoutePoint/deleteInspectionRoutePoint.html

@@ -0,0 +1,19 @@
+<div class="modal fade" id="deleteInspectionRoutePointModel" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="exampleModalLabel">请确认您的操作!</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <tr align="center"><th>确定删除巡检点</th></tr>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal" v-on:click="closeDeleteInspectionRoutePointModel()">点错了</button>
+                <button type="button" class="btn btn-primary" v-on:click="deleteInspectionRoutePoint()">确认删除</button>
+            </div>
+        </div>
+    </div>
+</div>

WebService/src/main/resources/components/inspectionRoutePackage/delete-inspectionRoutePoint/deleteInspectionRoutePoint.js

@@ -0,0 +1,52 @@
+(function(vc,vm){
+
+    vc.extends({
+        data:{
+            deleteInspectionRoutePointInfo:{
+
+            }
+        },
+         _initMethod:function(){
+
+         },
+         _initEvent:function(){
+             vc.on('deleteInspectionRoutePoint','openDeleteInspectionRoutePointModal',function(_params){
+
+                vc.component.deleteInspectionRoutePointInfo = _params;
+                $('#deleteInspectionRoutePointModel').modal('show');
+
+            });
+        },
+        methods:{
+            deleteInspectionRoutePoint:function(){
+                vc.component.deleteInspectionRoutePointInfo.communityId=vc.getCurrentCommunity().communityId;
+                vc.http.post(
+                    'deleteInspectionRoutePoint',
+                    'delete',
+                    JSON.stringify(vc.component.deleteInspectionRoutePointInfo),
+                    {
+                        emulateJSON:true
+                     },
+                     function(json,res){
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if(res.status == 200){
+                            //关闭model
+                            $('#deleteInspectionRoutePointModel').modal('hide');
+                            vc.emit('inspectionRoutePointManage','listInspectionRoutePoint',{});
+                            return ;
+                        }
+                        vc.message(json);
+                     },
+                     function(errInfo,error){
+                        console.log('请求失败处理');
+                        vc.message(json);
+
+                     });
+            },
+            closeDeleteInspectionRoutePointModel:function(){
+                $('#deleteInspectionRoutePointModel').modal('hide');
+            }
+        }
+    });
+
+})(window.vc,window.vc.component);

WebService/src/main/resources/components/inspectionRoutePackage/inspectionRoutePoint-manage/inspectionRoutePointManage.html

@@ -9,7 +9,7 @@
                         返回
                     </button>
                     <button type="button" class="btn btn-primary btn-sm"
-                            v-on:click="_openAddInspectionRouteModal()">
+                            v-on:click="_openAddInspectionRoutePointModal()">
                         <i class="glyphicon glyphicon-plus"></i>
                         添加
                     </button>
@@ -60,4 +60,9 @@
             </div>
         </div>
     </div>
+    <vc:create name="deleteInspectionRoutePoint"></vc:create>
+    <vc:create name="addInspectionRoutePoint"
+               emitListener="inspectionRoutePointManage"
+               emitFunction="notify"
+    ></vc:create>
 </div>

WebService/src/main/resources/components/inspectionRoutePackage/inspectionRoutePoint-manage/inspectionRoutePointManage.js

@@ -18,6 +18,9 @@
             //vc.component._listInspectionRoutePoints(DEFAULT_PAGE, DEFAULT_ROWS);
         },
         _initEvent:function(){
+            vc.on('inspectionRoutePointManage','notify',function(_param){
+                  vc.component._listInspectionRoutePoints(DEFAULT_PAGE, DEFAULT_ROWS);
+            });
             
             vc.on('inspectionRoutePointManage','listInspectionPoint',function(_param){
                   if(!_param.hasOwnProperty('inspectionRouteId')){
@@ -60,11 +63,13 @@
                              }
                            );
             },
-            _openAddInspectionRouteModal:function(){
-                vc.emit('addInspectionRoutePointRel','openAddInspectionPointModal',{});
+            _openAddInspectionRoutePointModal:function(){
+                vc.emit('addInspectionRoutePoint','openAddInspectionRoutePointModal',{
+                    inspectionRouteId:vc.component.inspectionRoutePointManageInfo.inspectionRouteId
+                });
             },
-            _openDeleteInspectionRouteModel:function(_inspectionPoint){
-                vc.emit('deleteInspectionRoutePointRel','openDeleteInspectionPointModal',_inspectionPoint);
+            _openDeleteInspectionPointModel:function(_inspectionPoint){
+                vc.emit('deleteInspectionRoutePoint','openDeleteInspectionRoutePointModal',_inspectionPoint);
             },
             _goBack:function(){
                 vc.emit('inspectionRouteManage','goBack',{});

java110-bean/src/main/java/com/java110/dto/inspectionPoint/InspectionDto.java

@@ -26,6 +26,7 @@ public class InspectionDto extends PageDto implements Serializable {
     private String locationObjName;
     private String machineId;
     private String communityId;
+    private String inspectionRouteId;
 
 
     private Date createTime;
@@ -137,4 +138,13 @@ public class InspectionDto extends PageDto implements Serializable {
     public void setLocationObjName(String locationObjName) {
         this.locationObjName = locationObjName;
     }
+
+
+    public String getInspectionRouteId() {
+        return inspectionRouteId;
+    }
+
+    public void setInspectionRouteId(String inspectionRouteId) {
+        this.inspectionRouteId = inspectionRouteId;
+    }
 }

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

@@ -87,6 +87,11 @@
         from inspection_point t
         inner join machine m on t.machine_id = m.machine_id and m.status_cd = 0
         inner join t_dict d on d.status_cd = m.location_type_cd
+        <if test="inspectionRouteId != null  and  inspectionRouteId != ''">
+            left join inspection_route_point_rel c on t.inspection_id = c.inspection_id
+            and t.status_cd = '0'
+            and t.inspection_route_id is null
+        </if>
         where 1 =1
         <if test="inspectionId !=null and inspectionId != ''">
             and t.inspection_id= #{inspectionId}
@@ -150,6 +155,11 @@
     <select id="queryInspectionsCount" parameterType="Map" resultType="Map">
         select count(1) count
         from inspection_point t
+        <if test="inspectionRouteId != null  and  inspectionRouteId != ''">
+            left join inspection_route_point_rel c on t.inspection_id = c.inspection_id
+            and t.status_cd = '0'
+            and t.inspection_route_id is null
+        </if>
         where 1 =1
         <if test="inspectionId !=null and inspectionId != ''">
             and t.inspection_id= #{inspectionId}