优化门禁功能

service-api/src/main/java/com/java110/api/listener/store/DeleteStoreAttrListener.java

@@ -1,51 +0,0 @@
-package com.java110.api.listener.store;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.store.IStoreAttrBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeStoreAttrConstant;
-import com.java110.utils.util.Assert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-/**
- * 保存小区侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("deleteStoreAttrListener")
-public class DeleteStoreAttrListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private IStoreAttrBMO storeAttrBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "attrId", "attrId不能为空");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        storeAttrBMOImpl.deleteStoreAttr(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeStoreAttrConstant.DELETE_STOREATTR;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-}

service-api/src/main/java/com/java110/api/listener/store/ListStoreAttrsListener.java

@@ -1,88 +0,0 @@
-package com.java110.api.listener.store;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.intf.store.IStoreAttrInnerServiceSMO;
-import com.java110.dto.store.StoreAttrDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeStoreAttrConstant;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.api.storeAttr.ApiStoreAttrDataVo;
-import com.java110.vo.api.storeAttr.ApiStoreAttrVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * 查询小区侦听类
- */
-@Java110Listener("listStoreAttrsListener")
-public class ListStoreAttrsListener extends AbstractServiceApiListener {
-
-    @Autowired
-    private IStoreAttrInnerServiceSMO storeAttrInnerServiceSMOImpl;
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeStoreAttrConstant.LIST_STOREATTRS;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IStoreAttrInnerServiceSMO getStoreAttrInnerServiceSMOImpl() {
-        return storeAttrInnerServiceSMOImpl;
-    }
-
-    public void setStoreAttrInnerServiceSMOImpl(IStoreAttrInnerServiceSMO storeAttrInnerServiceSMOImpl) {
-        this.storeAttrInnerServiceSMOImpl = storeAttrInnerServiceSMOImpl;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        super.validatePageInfo(reqJson);
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        StoreAttrDto storeAttrDto = BeanConvertUtil.covertBean(reqJson, StoreAttrDto.class);
-
-        int count = storeAttrInnerServiceSMOImpl.queryStoreAttrsCount(storeAttrDto);
-
-        List<ApiStoreAttrDataVo> storeAttrs = null;
-
-        if (count > 0) {
-            storeAttrs = BeanConvertUtil.covertBeanList(storeAttrInnerServiceSMOImpl.queryStoreAttrs(storeAttrDto), ApiStoreAttrDataVo.class);
-        } else {
-            storeAttrs = new ArrayList<>();
-        }
-
-        ApiStoreAttrVo apiStoreAttrVo = new ApiStoreAttrVo();
-
-        apiStoreAttrVo.setTotal(count);
-        apiStoreAttrVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
-        apiStoreAttrVo.setStoreAttrs(storeAttrs);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiStoreAttrVo), HttpStatus.OK);
-
-        context.setResponseEntity(responseEntity);
-
-    }
-}

service-api/src/main/java/com/java110/api/listener/store/SaveStoreAttrListener.java

@@ -1,56 +0,0 @@
-package com.java110.api.listener.store;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.store.IStoreAttrBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeStoreAttrConstant;
-import com.java110.utils.util.Assert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-/**
- * 保存小区侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("saveStoreAttrListener")
-public class SaveStoreAttrListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private IStoreAttrBMO storeAttrBMOImpl;
-
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
-        Assert.hasKeyAndValue(reqJson, "attrId", "请求报文中未包含attrId");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        storeAttrBMOImpl.addStoreAttr(reqJson, context);
-
-
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeStoreAttrConstant.ADD_STOREATTR;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-}

service-common/src/main/java/com/java110/common/cmd/machine/UpdateMachineCmd.java

@@ -77,7 +77,6 @@ public class UpdateMachineCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "direction", "必填，请选择设备方向");
         Assert.hasKeyAndValue(reqJson, "authCode", "必填，请填写鉴权编码");
         Assert.hasKeyAndValue(reqJson, "locationTypeCd", "必填，请选择位置类型");
-        Assert.hasKeyAndValue(reqJson, "locationObjId", "必填，请填写位置对象ID");
 
         Assert.judgeAttrValue(reqJson);