优化设备未包含小区ID查询bug

wuxw

2019-11-21 620d850d08121f3ca8a2e3e921e94eeff4d85595

优化设备未包含小区ID查询bug

 Api/src/main/java/com/java110/api/listener/machine/ListMachinesListener.java

@@ -8,6 +8,7 @@
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeMachineConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.api.machine.ApiMachineDataVo;
import com.java110.vo.api.machine.ApiMachineVo;
@@ -56,7 +57,10 @@

    @Override
    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {

        super.validatePageInfo(reqJson);

        Assert.jsonObjectHaveKey(reqJson,"communityId","请求报文中未包含小区信息");
    }

    @Override

 AppFrontService/src/main/java/com/java110/app/properties/WechatAuthProperties.java

@@ -6,8 +6,8 @@
import org.springframework.stereotype.Component;

@Component
@ConfigurationProperties(prefix = "java110")
@PropertySource("classpath:java110.auth.wechat.properties")
@ConfigurationProperties(prefix = "java110.auth.wechat")
@PropertySource("classpath:wechatAuth.properties")
public class WechatAuthProperties {

    private String sessionHost;

 WebService/src/main/java/com/java110/web/smo/machine/impl/ListMachinesSMOImpl.java

@@ -7,6 +7,7 @@
import com.java110.utils.constant.PrivilegeCodeConstant;
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.web.smo.machine.IListMachinesSMO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,7 @@
    protected void validate(IPageData pd, JSONObject paramIn) {

        super.validatePageInfo(pd);
        Assert.jsonObjectHaveKey(paramIn, "communityId", "请求报文中未包含小区信息");

        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_MACHINE);
    }

 WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.js

@@ -1,88 +1,89 @@
/**
    入驻小区
**/
(function(vc){
 入驻小区
 **/
(function (vc) {
    var DEFAULT_PAGE = 1;
    var DEFAULT_ROWS = 10;
    vc.extends({
        data:{
            machineManageInfo:{
                machines:[],
                total:0,
                records:1,
                moreCondition:false,
                machineName:'',
                conditions:{
                    machineCode:'',
machineTypeCd:'',
machineName:'',
machineIp:'',
machineMac:'',
        data: {
            machineManageInfo: {
                machines: [],
                total: 0,
                records: 1,
                moreCondition: false,
                machineName: '',
                conditions: {
                    machineCode: '',
                    machineTypeCd: '',
                    machineName: '',
                    machineIp: '',
                    machineMac: '',
                    communityId:vc.getCurrentCommunity().communityId

                }
            }
        },
        _initMethod:function(){
        _initMethod: function () {
            vc.component._listMachines(DEFAULT_PAGE, DEFAULT_ROWS);
        },
        _initEvent:function(){
            
            vc.on('machineManage','listMachine',function(_param){
                  vc.component._listMachines(DEFAULT_PAGE, DEFAULT_ROWS);
        _initEvent: function () {

            vc.on('machineManage', 'listMachine', function (_param) {
                vc.component._listMachines(DEFAULT_PAGE, DEFAULT_ROWS);
            });
             vc.on('pagination','page_event',function(_currentPage){
                vc.component._listMachines(_currentPage,DEFAULT_ROWS);
            vc.on('pagination', 'page_event', function (_currentPage) {
                vc.component._listMachines(_currentPage, DEFAULT_ROWS);
            });
        },
        methods:{
            _listMachines:function(_page, _rows){
        methods: {
            _listMachines: function (_page, _rows) {

                vc.component.machineManageInfo.conditions.page = _page;
                vc.component.machineManageInfo.conditions.row = _rows;
                var param = {
                    params:vc.component.machineManageInfo.conditions
               };
                    params: vc.component.machineManageInfo.conditions
                };

               //发送get请求
               vc.http.get('machineManage',
                            'list',
                             param,
                             function(json,res){
                                var _machineManageInfo=JSON.parse(json);
                                vc.component.machineManageInfo.total = _machineManageInfo.total;
                                vc.component.machineManageInfo.records = _machineManageInfo.records;
                                vc.component.machineManageInfo.machines = _machineManageInfo.machines;
                                vc.emit('pagination','init',{
                                     total:vc.component.machineManageInfo.records,
                                     currentPage:_page
                                 });
                             },function(errInfo,error){
                                console.log('请求失败处理');
                             }
                           );
                //发送get请求
                vc.http.get('machineManage',
                    'list',
                    param,
                    function (json, res) {
                        var _machineManageInfo = JSON.parse(json);
                        vc.component.machineManageInfo.total = _machineManageInfo.total;
                        vc.component.machineManageInfo.records = _machineManageInfo.records;
                        vc.component.machineManageInfo.machines = _machineManageInfo.machines;
                        vc.emit('pagination', 'init', {
                            total: vc.component.machineManageInfo.records,
                            currentPage: _page
                        });
                    }, function (errInfo, error) {
                        console.log('请求失败处理');
                    }
                );
            },
            _openAddMachineModal:function(){
                vc.emit('addMachine','openAddMachineModal',{});
            _openAddMachineModal: function () {
                vc.emit('addMachine', 'openAddMachineModal', {});
            },
            _openEditMachineModel:function(_machine){
                vc.emit('editMachine','openEditMachineModal',_machine);
            _openEditMachineModel: function (_machine) {
                vc.emit('editMachine', 'openEditMachineModal', _machine);
            },
            _openDeleteMachineModel:function(_machine){
                vc.emit('deleteMachine','openDeleteMachineModal',_machine);
            _openDeleteMachineModel: function (_machine) {
                vc.emit('deleteMachine', 'openDeleteMachineModal', _machine);
            },
            _queryMachineMethod:function(){
            _queryMachineMethod: function () {
                vc.component._listMachines(DEFAULT_PAGE, DEFAULT_ROWS);

            },
            _moreCondition:function(){
                if(vc.component.machineManageInfo.moreCondition){
            _moreCondition: function () {
                if (vc.component.machineManageInfo.moreCondition) {
                    vc.component.machineManageInfo.moreCondition = false;
                }else{
                } else {
                    vc.component.machineManageInfo.moreCondition = true;
                }
            }

             

        }
    });
})(window.vc);

 WebService/src/main/resources/components/ownerPackage/edit-owner/editOwner.js

@@ -31,7 +31,7 @@
            });
        },
        methods:{
            editOwnerValidate(){
            editOwnerValidate:function(){
                return vc.validate.validate({
                    editOwnerInfo:vc.component.editOwnerInfo
                },{