优化设备未包含小区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

@@ -18,6 +18,7 @@
machineName:'',
machineIp:'',
machineMac:'',
                    communityId:vc.getCurrentCommunity().communityId

                }
            }

 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
                },{