优化state 为空的情况

Api/src/main/java/com/java110/api/listener/applicationKey/SaveApplicationKeyListener.java

@@ -114,6 +114,7 @@ public class SaveApplicationKeyListener extends AbstractServiceApiListener {
         businessApplicationKey.putAll(paramInJson);
         businessApplicationKey.put("machineId", machineDtos.get(0).getMachineId());
         businessApplicationKey.put("applicationKeyId", "-1");
+        businessApplicationKey.put("state", "10002");
         //计算 应收金额
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessApplicationKey", businessApplicationKey);
         return business;

Api/src/main/java/com/java110/api/listener/applicationKey/UpdateApplicationKeyListener.java

@@ -3,7 +3,9 @@ package com.java110.api.listener.applicationKey;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.listener.AbstractServiceApiListener;
+import com.java110.core.smo.hardwareAdapation.IApplicationKeyInnerServiceSMO;
 import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
+import com.java110.dto.hardwareAdapation.ApplicationKeyDto;
 import com.java110.dto.hardwareAdapation.MachineDto;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.CommonConstant;
@@ -30,6 +32,10 @@ public class UpdateApplicationKeyListener extends AbstractServiceApiListener {
 
     @Autowired
     private IMachineInnerServiceSMO machineInnerServiceSMOImpl;
+
+    @Autowired
+    private IApplicationKeyInnerServiceSMO applicationKeyInnerServiceSMOImpl;
+
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
 
@@ -100,6 +106,11 @@ public class UpdateApplicationKeyListener extends AbstractServiceApiListener {
         machineDto.setLocationTypeCd(paramInJson.getString("locationTypeCd"));
         List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
         Assert.listOnlyOne(machineDtos, "该位置还没有相应的门禁设备");
+        ApplicationKeyDto applicationKeyDto = new ApplicationKeyDto();
+        applicationKeyDto.setApplicationKeyId(paramInJson.getString("applicationKeyId"));
+        applicationKeyDto.setCommunityId(paramInJson.getString("communityId"));
+        List<ApplicationKeyDto> applicationKeyDtos = applicationKeyInnerServiceSMOImpl.queryApplicationKeys(applicationKeyDto);
+        Assert.listOnlyOne(applicationKeyDtos, "未找到申请记录或找到多条记录");
 
         JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
         business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_APPLICATION_KEY);
@@ -108,6 +119,7 @@ public class UpdateApplicationKeyListener extends AbstractServiceApiListener {
         JSONObject businessApplicationKey = new JSONObject();
         businessApplicationKey.putAll(paramInJson);
         businessApplicationKey.put("machineId", machineDtos.get(0).getMachineId());
+        businessApplicationKey.put("state", applicationKeyDtos.get(0).getState());
         //计算 应收金额
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessApplicationKey", businessApplicationKey);
         return business;
@@ -120,4 +132,12 @@ public class UpdateApplicationKeyListener extends AbstractServiceApiListener {
     public void setMachineInnerServiceSMOImpl(IMachineInnerServiceSMO machineInnerServiceSMOImpl) {
         this.machineInnerServiceSMOImpl = machineInnerServiceSMOImpl;
     }
+
+    public IApplicationKeyInnerServiceSMO getApplicationKeyInnerServiceSMOImpl() {
+        return applicationKeyInnerServiceSMOImpl;
+    }
+
+    public void setApplicationKeyInnerServiceSMOImpl(IApplicationKeyInnerServiceSMO applicationKeyInnerServiceSMOImpl) {
+        this.applicationKeyInnerServiceSMOImpl = applicationKeyInnerServiceSMOImpl;
+    }
 }

java110-bean/src/main/java/com/java110/dto/hardwareAdapation/ApplicationKeyDto.java

@@ -26,6 +26,7 @@ public class ApplicationKeyDto extends PageDto implements Serializable {
     private String startTime;
     private String state;
     private String age;
+    private String communityId;
 
 
     private Date createTime;
@@ -137,4 +138,12 @@ public class ApplicationKeyDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/applicationKey/ApiApplicationKeyDataVo.java

@@ -6,69 +6,86 @@ import java.util.Date;
 public class ApiApplicationKeyDataVo implements Serializable {
 
     private String applicationKeyId;
-private String name;
-private String tel;
-private String typeCd;
-private String sex;
-private String age;
-private String idCard;
-private String startTime;
-private String endTime;
-public String getApplicationKeyId() {
+    private String name;
+    private String tel;
+    private String typeCd;
+    private String sex;
+    private String age;
+    private String idCard;
+    private String startTime;
+    private String endTime;
+
+    public String getApplicationKeyId() {
         return applicationKeyId;
     }
-public void setApplicationKeyId(String applicationKeyId) {
+
+    public void setApplicationKeyId(String applicationKeyId) {
         this.applicationKeyId = applicationKeyId;
     }
-public String getName() {
+
+    public String getName() {
         return name;
     }
-public void setName(String name) {
+
+    public void setName(String name) {
         this.name = name;
     }
-public String getTel() {
+
+    public String getTel() {
         return tel;
     }
-public void setTel(String tel) {
+
+    public void setTel(String tel) {
         this.tel = tel;
     }
-public String getTypeCd() {
+
+    public String getTypeCd() {
         return typeCd;
     }
-public void setTypeCd(String typeCd) {
+
+    public void setTypeCd(String typeCd) {
         this.typeCd = typeCd;
     }
-public String getSex() {
+
+    public String getSex() {
         return sex;
     }
-public void setSex(String sex) {
+
+    public void setSex(String sex) {
         this.sex = sex;
     }
-public String getAge() {
+
+    public String getAge() {
         return age;
     }
-public void setAge(String age) {
+
+    public void setAge(String age) {
         this.age = age;
     }
-public String getIdCard() {
+
+    public String getIdCard() {
         return idCard;
     }
-public void setIdCard(String idCard) {
+
+    public void setIdCard(String idCard) {
         this.idCard = idCard;
     }
-public String getStartTime() {
+
+    public String getStartTime() {
         return startTime;
     }
-public void setStartTime(String startTime) {
+
+    public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
-public String getEndTime() {
+
+    public String getEndTime() {
         return endTime;
     }
-public void setEndTime(String endTime) {
+
+    public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
 
 
-
 }