水电抄表功能优化

service-api/src/main/java/com/java110/api/listener/machine/DeleteMachineAuthListener.java

@@ -1,49 +0,0 @@
-package com.java110.api.listener.machine;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.machineAuth.IMachineAuthBMO;
-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.ServiceCodeMachineAuthConstant;
-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("deleteMachineAuthListener")
-public class DeleteMachineAuthListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private IMachineAuthBMO machineAuthBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
-        Assert.hasKeyAndValue(reqJson, "authId", "authId不能为空");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        machineAuthBMOImpl.deleteMachineAuth(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeMachineAuthConstant.DELETE_MACHINEAUTH;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-}

service-api/src/main/java/com/java110/api/listener/machine/ListMachineAuthsListener.java

@@ -1,82 +0,0 @@
-package com.java110.api.listener.machine;
-
-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.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.intf.common.IMachineAuthInnerServiceSMO;
-import com.java110.dto.machineAuth.MachineAuthDto;
-import com.java110.utils.constant.ServiceCodeMachineAuthConstant;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-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("listMachineAuthsListener")
-public class ListMachineAuthsListener extends AbstractServiceApiListener {
-
-    @Autowired
-    private IMachineAuthInnerServiceSMO machineAuthInnerServiceSMOImpl;
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeMachineAuthConstant.LIST_MACHINEAUTHS;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IMachineAuthInnerServiceSMO getMachineAuthInnerServiceSMOImpl() {
-        return machineAuthInnerServiceSMOImpl;
-    }
-
-    public void setMachineAuthInnerServiceSMOImpl(IMachineAuthInnerServiceSMO machineAuthInnerServiceSMOImpl) {
-        this.machineAuthInnerServiceSMOImpl = machineAuthInnerServiceSMOImpl;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        super.validatePageInfo(reqJson);
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        MachineAuthDto machineAuthDto = BeanConvertUtil.covertBean(reqJson, MachineAuthDto.class);
-
-        int count = machineAuthInnerServiceSMOImpl.queryMachineAuthsCount(machineAuthDto);
-
-        List<MachineAuthDto> machineAuthDtos = null;
-
-        if (count > 0) {
-            machineAuthDtos = machineAuthInnerServiceSMOImpl.queryMachineAuths(machineAuthDto);
-        } else {
-            machineAuthDtos = new ArrayList<>();
-        }
-
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, machineAuthDtos);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-        context.setResponseEntity(responseEntity);
-
-    }
-}

service-api/src/main/java/com/java110/api/listener/machine/SaveMachineAuthListener.java

@@ -1,51 +0,0 @@
-package com.java110.api.listener.machine;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.machineAuth.IMachineAuthBMO;
-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.ServiceCodeMachineAuthConstant;
-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("saveMachineAuthListener")
-public class SaveMachineAuthListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private IMachineAuthBMO machineAuthBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
-        Assert.hasKeyAndValue(reqJson, "machineId", "请求报文中未包含machineId");
-        Assert.hasKeyAndValue(reqJson, "personId", "请求报文中未包含personId");
-        Assert.hasKeyAndValue(reqJson, "personName", "请求报文中未包含personName");
-        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
-        Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含endTime");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-        machineAuthBMOImpl.addMachineAuth(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeMachineAuthConstant.ADD_MACHINEAUTH;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-}

service-api/src/main/java/com/java110/api/listener/machine/UpdateMachineAuthListener.java

@@ -1,53 +0,0 @@
-package com.java110.api.listener.machine;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.machineAuth.IMachineAuthBMO;
-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.ServiceCodeMachineAuthConstant;
-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("updateMachineAuthListener")
-public class UpdateMachineAuthListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private IMachineAuthBMO machineAuthBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "authId", "authId不能为空");
-        Assert.hasKeyAndValue(reqJson, "machineId", "请求报文中未包含machineId");
-        Assert.hasKeyAndValue(reqJson, "personId", "请求报文中未包含personId");
-        Assert.hasKeyAndValue(reqJson, "personName", "请求报文中未包含personName");
-        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
-        Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含endTime");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        machineAuthBMOImpl.updateMachineAuth(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeMachineAuthConstant.UPDATE_MACHINEAUTH;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-}

service-api/src/main/java/com/java110/api/listener/machineRecord/DeleteMachineRecordListener.java

@@ -1,53 +0,0 @@
-package com.java110.api.listener.machineRecord;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.machineRecord.IMachineRecordBMO;
-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.ServiceCodeMachineRecordConstant;
-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("deleteMachineRecordListener")
-public class DeleteMachineRecordListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private IMachineRecordBMO machineRecordBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
-        Assert.hasKeyAndValue(reqJson, "machineRecordId", "开门记录ID不能为空");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        machineRecordBMOImpl.deleteMachineRecord(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeMachineRecordConstant.DELETE_MACHINERECORD;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-}

service-api/src/main/java/com/java110/api/listener/machineRecord/SaveMachineRecordListener.java

@@ -1,90 +0,0 @@
-package com.java110.api.listener.machineRecord;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.machineRecord.IMachineRecordBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.intf.common.IFileInnerServiceSMO;
-import com.java110.dto.file.FileDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeMachineRecordConstant;
-import com.java110.utils.util.Assert;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-import java.util.Map;
-
-/**
- * 保存小区侦听
- * add by wuxw 2019-06-30
- */
-@Java110Listener("saveMachineRecordListener")
-public class SaveMachineRecordListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private IFileInnerServiceSMO fileInnerServiceSMOImpl;
-
-    @Autowired
-    private IMachineRecordBMO machineRecordBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
-        Assert.hasKeyAndValue(reqJson, "machineCode", "必填，请填写设备编码");
-        Assert.hasKeyAndValue(reqJson, "machineId", "必填，请填写设备版本号");
-        Assert.hasKeyAndValue(reqJson, "name", "必填，请选择用户名称");
-        Assert.hasKeyAndValue(reqJson, "openTypeCd", "必填，请选择开门方式");
-        Assert.hasKeyAndValue(reqJson, "tel", "必填，请填写用户手机号");
-        Assert.hasKeyAndValue(reqJson, "idCard", "必填，请填写身份证");
-
-        Map<String, String> headers = event.getDataFlowContext().getRequestHeaders();
-        Assert.hasKeyAndValue(headers, "communityid", "必填，请填写小区ID");
-
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        Map<String, String> headers = event.getDataFlowContext().getRequestHeaders();
-        String communityId = headers.get("communityid");
-
-        machineRecordBMOImpl.addMachineRecord(reqJson, context);
-
-        if (reqJson.containsKey("photo") && !StringUtils.isEmpty(reqJson.getString("photo"))) {
-            FileDto fileDto = new FileDto();
-            fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
-            fileDto.setFileName(fileDto.getFileId());
-            fileDto.setContext(reqJson.getString("photo"));
-            fileDto.setSuffix("jpeg");
-            fileDto.setCommunityId(communityId);
-            String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
-            reqJson.put("photoId", fileDto.getFileId());
-            reqJson.put("fileSaveName", fileName);
-
-            machineRecordBMOImpl.addPhoto(reqJson, context);
-
-        }
-
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeMachineRecordConstant.ADD_MACHINERECORD;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-}

service-api/src/main/java/com/java110/api/listener/parkingArea/DeleteParkingAreaAttrListener.java

@@ -1,49 +0,0 @@
-package com.java110.api.listener.parkingArea;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.parkingAreaAttr.IParkingAreaAttrBMO;
-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.ServiceCodeParkingAreaAttrConstant;
-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("deleteParkingAreaAttrListener")
-public class DeleteParkingAreaAttrListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private IParkingAreaAttrBMO parkingAreaAttrBMOImpl;
-
-    @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) {
-
-        parkingAreaAttrBMOImpl.deleteParkingAreaAttr(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeParkingAreaAttrConstant.DELETE_PARKINGAREAATTR;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-}

service-api/src/main/java/com/java110/api/listener/parkingArea/ListParkingAreaAttrsListener.java

@@ -1,82 +0,0 @@
-package com.java110.api.listener.parkingArea;
-
-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.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.dto.parkingAreaAttr.ParkingAreaAttrDto;
-import com.java110.intf.community.IParkingAreaAttrInnerServiceSMO;
-import com.java110.utils.constant.ServiceCodeParkingAreaAttrConstant;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-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("listParkingAreaAttrsListener")
-public class ListParkingAreaAttrsListener extends AbstractServiceApiListener {
-
-    @Autowired
-    private IParkingAreaAttrInnerServiceSMO parkingAreaAttrInnerServiceSMOImpl;
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeParkingAreaAttrConstant.LIST_PARKINGAREAATTRS;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IParkingAreaAttrInnerServiceSMO getParkingAreaAttrInnerServiceSMOImpl() {
-        return parkingAreaAttrInnerServiceSMOImpl;
-    }
-
-    public void setParkingAreaAttrInnerServiceSMOImpl(IParkingAreaAttrInnerServiceSMO parkingAreaAttrInnerServiceSMOImpl) {
-        this.parkingAreaAttrInnerServiceSMOImpl = parkingAreaAttrInnerServiceSMOImpl;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        super.validatePageInfo(reqJson);
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        ParkingAreaAttrDto parkingAreaAttrDto = BeanConvertUtil.covertBean(reqJson, ParkingAreaAttrDto.class);
-
-        int count = parkingAreaAttrInnerServiceSMOImpl.queryParkingAreaAttrsCount(parkingAreaAttrDto);
-
-        List<ParkingAreaAttrDto> parkingAreaAttrDtos = null;
-
-        if (count > 0) {
-            parkingAreaAttrDtos = parkingAreaAttrInnerServiceSMOImpl.queryParkingAreaAttrs(parkingAreaAttrDto);
-        } else {
-            parkingAreaAttrDtos = new ArrayList<>();
-        }
-
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, parkingAreaAttrDtos);
-
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
-        context.setResponseEntity(responseEntity);
-
-    }
-}

service-api/src/main/java/com/java110/api/listener/parkingArea/SaveParkingAreaAttrListener.java

@@ -1,47 +0,0 @@
-package com.java110.api.listener.parkingArea;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.parkingAreaAttr.IParkingAreaAttrBMO;
-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.ServiceCodeParkingAreaAttrConstant;
-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("saveParkingAreaAttrListener")
-public class SaveParkingAreaAttrListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private IParkingAreaAttrBMO parkingAreaAttrBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
-
-        Assert.hasKeyAndValue(reqJson, "specCd", "请求报文中未包含specCd");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-        parkingAreaAttrBMOImpl.addParkingAreaAttr(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeParkingAreaAttrConstant.ADD_PARKINGAREAATTR;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-}

service-api/src/main/java/com/java110/api/listener/parkingArea/UpdateParkingAreaAttrListener.java

@@ -1,48 +0,0 @@
-package com.java110.api.listener.parkingArea;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.parkingAreaAttr.IParkingAreaAttrBMO;
-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.ServiceCodeParkingAreaAttrConstant;
-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("updateParkingAreaAttrListener")
-public class UpdateParkingAreaAttrListener extends AbstractServiceApiPlusListener {
-
-    @Autowired
-    private IParkingAreaAttrBMO parkingAreaAttrBMOImpl;
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-
-        Assert.hasKeyAndValue(reqJson, "attrId", "attrId不能为空");
-        Assert.hasKeyAndValue(reqJson, "specCd", "请求报文中未包含specCd");
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        parkingAreaAttrBMOImpl.updateParkingAreaAttr(reqJson, context);
-    }
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeParkingAreaAttrConstant.UPDATE_PARKINGAREAATTR;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-}

service-api/src/main/java/com/java110/api/listener/machineRecord/ListMachineRecordsListener.java

@@ -1,70 +1,38 @@
-package com.java110.api.listener.machineRecord;
+package com.java110.common.cmd.machineRecord;
 
 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.common.IMachineRecordInnerServiceSMO;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.machine.MachineRecordDto;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.utils.constant.ServiceCodeMachineRecordConstant;
+import com.java110.intf.common.IMachineRecordInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.machineRecord.ApiMachineRecordDataVo;
 import com.java110.vo.api.machineRecord.ApiMachineRecordVo;
 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("listMachineRecordsListener")
-public class ListMachineRecordsListener extends AbstractServiceApiListener {
+@Java110Cmd(serviceCode = "machineRecord.listMachineRecords")
+public class ListMachineRecordsCmd extends Cmd {
 
     @Autowired
     private IMachineRecordInnerServiceSMO machineRecordInnerServiceSMOImpl;
 
     @Override
-    public String getServiceCode() {
-        return ServiceCodeMachineRecordConstant.LIST_MACHINERECORDS;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.GET;
-    }
-
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-
-    public IMachineRecordInnerServiceSMO getMachineRecordInnerServiceSMOImpl() {
-        return machineRecordInnerServiceSMOImpl;
-    }
-
-    public void setMachineRecordInnerServiceSMOImpl(IMachineRecordInnerServiceSMO machineRecordInnerServiceSMOImpl) {
-        this.machineRecordInnerServiceSMOImpl = machineRecordInnerServiceSMOImpl;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         super.validatePageInfo(reqJson);
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区信息");
-
     }
 
     @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         MachineRecordDto machineRecordDto = BeanConvertUtil.covertBean(reqJson, MachineRecordDto.class);
 
         int count = machineRecordInnerServiceSMOImpl.queryMachineRecordsCount(machineRecordDto);
@@ -86,6 +54,5 @@ public class ListMachineRecordsListener extends AbstractServiceApiListener {
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiMachineRecordVo), HttpStatus.OK);
 
         context.setResponseEntity(responseEntity);
-
     }
 }

service-common/src/main/java/com/java110/common/cmd/machineRecord/SaveMachineRecordCmd.java

@@ -0,0 +1,93 @@
+package com.java110.common.cmd.machineRecord;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.file.FileDto;
+import com.java110.intf.common.IFileInnerServiceSMO;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.common.IMachineRecordV1InnerServiceSMO;
+import com.java110.po.file.FileRelPo;
+import com.java110.po.machine.MachineRecordPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Map;
+
+@Java110Cmd(serviceCode = "machineRecord.saveMachineRecord")
+public class SaveMachineRecordCmd extends Cmd {
+
+    @Autowired
+    private IFileInnerServiceSMO fileInnerServiceSMOImpl;
+
+    @Autowired
+    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
+    @Autowired
+    private IMachineRecordV1InnerServiceSMO machineRecordV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
+
+        Assert.hasKeyAndValue(reqJson, "machineCode", "必填，请填写设备编码");
+        Assert.hasKeyAndValue(reqJson, "machineId", "必填，请填写设备版本号");
+        Assert.hasKeyAndValue(reqJson, "name", "必填，请选择用户名称");
+        Assert.hasKeyAndValue(reqJson, "openTypeCd", "必填，请选择开门方式");
+        Assert.hasKeyAndValue(reqJson, "tel", "必填，请填写用户手机号");
+        Assert.hasKeyAndValue(reqJson, "idCard", "必填，请填写身份证");
+
+        Map<String, String> headers = context.getReqHeaders();
+        Assert.hasKeyAndValue(headers, "communityid", "必填，请填写小区ID");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        Map<String, String> headers = context.getReqHeaders();
+        String communityId = headers.get("communityid");
+
+        int flag = 0;
+
+        String machineRecordId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineRecordId);
+        reqJson.put("machineRecordId", machineRecordId);
+        JSONObject businessMachineRecord = new JSONObject();
+        businessMachineRecord.putAll(reqJson);
+        businessMachineRecord.put("machineRecordId", machineRecordId);
+        MachineRecordPo machineRecordPo = BeanConvertUtil.covertBean(businessMachineRecord, MachineRecordPo.class);
+        flag = machineRecordV1InnerServiceSMOImpl.saveMachineRecord(machineRecordPo);
+        if (flag < 1) {
+            throw new CmdException("保存记录异常");
+        }
+        if (reqJson.containsKey("photo") && !StringUtils.isEmpty(reqJson.getString("photo"))) {
+            FileDto fileDto = new FileDto();
+            fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
+            fileDto.setFileName(fileDto.getFileId());
+            fileDto.setContext(reqJson.getString("photo"));
+            fileDto.setSuffix("jpeg");
+            fileDto.setCommunityId(communityId);
+            String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
+            reqJson.put("photoId", fileDto.getFileId());
+            reqJson.put("fileSaveName", fileName);
+
+            JSONObject businessUnit = new JSONObject();
+            businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
+            businessUnit.put("relTypeCd", "60000");
+            businessUnit.put("saveWay", "table");
+            businessUnit.put("objId", reqJson.getString("machineRecordId"));
+            businessUnit.put("fileRealName", reqJson.getString("photoId"));
+            businessUnit.put("fileSaveName", reqJson.getString("fileSaveName"));
+            FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
+            flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
+
+            if (flag < 1) {
+                throw new CmdException("保存图片异常");
+            }
+        }
+    }
+}