加入接口协议

java110-bean/src/main/java/com/java110/dto/itemRelease/ItemReleaseDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.itemRelease;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,17 +16,17 @@ import java.util.Date;
 public class ItemReleaseDto extends PageDto implements Serializable {
 
     private String amount;
-private String applyCompany;
-private String idCard;
-private String passTime;
-private String carNum;
-private String remark;
-private String applyPerson;
-private String irId;
-private String applyTel;
-private String typeId;
-private String state;
-private String communityId;
+    private String applyCompany;
+    private String idCard;
+    private String passTime;
+    private String carNum;
+    private String remark;
+    private String applyPerson;
+    private String irId;
+    private String applyTel;
+    private String typeId;
+    private String state;
+    private String communityId;
 
 
     private Date createTime;
@@ -36,73 +37,96 @@ private String communityId;
     public String getAmount() {
         return amount;
     }
-public void setAmount(String amount) {
+
+    public void setAmount(String amount) {
         this.amount = amount;
     }
-public String getApplyCompany() {
+
+    public String getApplyCompany() {
         return applyCompany;
     }
-public void setApplyCompany(String applyCompany) {
+
+    public void setApplyCompany(String applyCompany) {
         this.applyCompany = applyCompany;
     }
-public String getIdCard() {
+
+    public String getIdCard() {
         return idCard;
     }
-public void setIdCard(String idCard) {
+
+    public void setIdCard(String idCard) {
         this.idCard = idCard;
     }
-public String getPassTime() {
+
+    public String getPassTime() {
         return passTime;
     }
-public void setPassTime(String passTime) {
+
+    public void setPassTime(String passTime) {
         this.passTime = passTime;
     }
-public String getCarNum() {
+
+    public String getCarNum() {
         return carNum;
     }
-public void setCarNum(String carNum) {
+
+    public void setCarNum(String carNum) {
         this.carNum = carNum;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getApplyPerson() {
+
+    public String getApplyPerson() {
         return applyPerson;
     }
-public void setApplyPerson(String applyPerson) {
+
+    public void setApplyPerson(String applyPerson) {
         this.applyPerson = applyPerson;
     }
-public String getIrId() {
+
+    public String getIrId() {
         return irId;
     }
-public void setIrId(String irId) {
+
+    public void setIrId(String irId) {
         this.irId = irId;
     }
-public String getApplyTel() {
+
+    public String getApplyTel() {
         return applyTel;
     }
-public void setApplyTel(String applyTel) {
+
+    public void setApplyTel(String applyTel) {
         this.applyTel = applyTel;
     }
-public String getTypeId() {
+
+    public String getTypeId() {
         return typeId;
     }
-public void setTypeId(String typeId) {
+
+    public void setTypeId(String typeId) {
         this.typeId = typeId;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 

java110-bean/src/main/java/com/java110/dto/itemReleaseRes/ItemReleaseResDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.itemReleaseRes;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,9 +16,9 @@ import java.util.Date;
 public class ItemReleaseResDto extends PageDto implements Serializable {
 
     private String resName;
-private String irId;
-private String communityId;
-private String resId;
+    private String irId;
+    private String communityId;
+    private String resId;
 
 
     private Date createTime;
@@ -28,25 +29,32 @@ private String resId;
     public String getResName() {
         return resName;
     }
-public void setResName(String resName) {
+
+    public void setResName(String resName) {
         this.resName = resName;
     }
-public String getIrId() {
+
+    public String getIrId() {
         return irId;
     }
-public void setIrId(String irId) {
+
+    public void setIrId(String irId) {
         this.irId = irId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getResId() {
+
+    public String getResId() {
         return resId;
     }
-public void setResId(String resId) {
+
+    public void setResId(String resId) {
         this.resId = resId;
     }
 

java110-bean/src/main/java/com/java110/dto/itemReleaseType/ItemReleaseTypeDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.itemReleaseType;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,11 +16,11 @@ import java.util.Date;
 public class ItemReleaseTypeDto extends PageDto implements Serializable {
 
     private String typeName;
-private String typeId;
-private String remark;
-private String communityId;
-private String flowId;
-private String flowName;
+    private String typeId;
+    private String remark;
+    private String communityId;
+    private String flowId;
+    private String flowName;
 
 
     private Date createTime;
@@ -30,37 +31,48 @@ private String flowName;
     public String getTypeName() {
         return typeName;
     }
-public void setTypeName(String typeName) {
+
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
-public String getTypeId() {
+
+    public String getTypeId() {
         return typeId;
     }
-public void setTypeId(String typeId) {
+
+    public void setTypeId(String typeId) {
         this.typeId = typeId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getFlowId() {
+
+    public String getFlowId() {
         return flowId;
     }
-public void setFlowId(String flowId) {
+
+    public void setFlowId(String flowId) {
         this.flowId = flowId;
     }
-public String getFlowName() {
+
+    public String getFlowName() {
         return flowName;
     }
-public void setFlowName(String flowName) {
+
+    public void setFlowName(String flowName) {
         this.flowName = flowName;
     }
 

java110-bean/src/main/java/com/java110/po/itemRelease/ItemReleasePo.java

@@ -17,6 +17,7 @@ package com.java110.po.itemRelease;
 
 import java.io.Serializable;
 import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2023-01-11 15:40:01 mail: 928255095@qq.com
@@ -28,97 +29,122 @@ import java.util.Date;
 public class ItemReleasePo implements Serializable {
 
     private String amount;
-private String applyCompany;
-private String idCard;
-private String passTime;
-private String carNum;
-private String remark;
-private String statusCd = "0";
-private String applyPerson;
-private String irId;
-private String applyTel;
-private String typeId;
-private String state;
-private String communityId;
-public String getAmount() {
+    private String applyCompany;
+    private String idCard;
+    private String passTime;
+    private String carNum;
+    private String remark;
+    private String statusCd = "0";
+    private String applyPerson;
+    private String irId;
+    private String applyTel;
+    private String typeId;
+    private String state;
+    private String communityId;
+
+    public String getAmount() {
         return amount;
     }
-public void setAmount(String amount) {
+
+    public void setAmount(String amount) {
         this.amount = amount;
     }
-public String getApplyCompany() {
+
+    public String getApplyCompany() {
         return applyCompany;
     }
-public void setApplyCompany(String applyCompany) {
+
+    public void setApplyCompany(String applyCompany) {
         this.applyCompany = applyCompany;
     }
-public String getIdCard() {
+
+    public String getIdCard() {
         return idCard;
     }
-public void setIdCard(String idCard) {
+
+    public void setIdCard(String idCard) {
         this.idCard = idCard;
     }
-public String getPassTime() {
+
+    public String getPassTime() {
         return passTime;
     }
-public void setPassTime(String passTime) {
+
+    public void setPassTime(String passTime) {
         this.passTime = passTime;
     }
-public String getCarNum() {
+
+    public String getCarNum() {
         return carNum;
     }
-public void setCarNum(String carNum) {
+
+    public void setCarNum(String carNum) {
         this.carNum = carNum;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getApplyPerson() {
+
+    public String getApplyPerson() {
         return applyPerson;
     }
-public void setApplyPerson(String applyPerson) {
+
+    public void setApplyPerson(String applyPerson) {
         this.applyPerson = applyPerson;
     }
-public String getIrId() {
+
+    public String getIrId() {
         return irId;
     }
-public void setIrId(String irId) {
+
+    public void setIrId(String irId) {
         this.irId = irId;
     }
-public String getApplyTel() {
+
+    public String getApplyTel() {
         return applyTel;
     }
-public void setApplyTel(String applyTel) {
+
+    public void setApplyTel(String applyTel) {
         this.applyTel = applyTel;
     }
-public String getTypeId() {
+
+    public String getTypeId() {
         return typeId;
     }
-public void setTypeId(String typeId) {
+
+    public void setTypeId(String typeId) {
         this.typeId = typeId;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
 
-
 }

service-common/src/main/java/com/java110/common/cmd/itemRelease/DeleteItemReleaseCmd.java

@@ -22,6 +22,7 @@ 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.doc.annotation.*;
 import com.java110.intf.common.IItemReleaseV1InnerServiceSMO;
 import com.java110.po.itemRelease.ItemReleasePo;
 import com.java110.utils.exception.CmdException;
@@ -32,6 +33,32 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Java110CmdDoc(title = "删除物品放行",
+        description = "删除业主申请的物品放行功能",
+        httpMethod = "post",
+        url = "http://{ip}:{port}/app/itemRelease.deleteItemRelease",
+        resource = "commonDoc",
+        author = "吴学文",
+        serviceCode = "itemRelease.deleteItemRelease"
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "irId", length = 30, remark = "放行ID"),
+        @Java110ParamDoc(name = "communityId", length = 30, remark = "放行小区"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="{'irId':'123','communityId':'123'}",
+        resBody="{'code':0,'msg':'成功'}"
+)
+
 /**
  * 类表述：删除
  * 服务编码：itemRelease.deleteItemRelease

service-common/src/main/java/com/java110/common/cmd/itemRelease/DeleteItemReleaseResCmd.java

@@ -1,71 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.common.cmd.itemRelease;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.Cmd;
-import com.java110.core.event.cmd.CmdEvent;
-import com.java110.intf.common.IItemReleaseResV1InnerServiceSMO;
-import com.java110.po.itemReleaseRes.ItemReleaseResPo;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 类表述：删除
- * 服务编码：itemReleaseRes.deleteItemReleaseRes
- * 请求路劲：/app/itemReleaseRes.DeleteItemReleaseRes
- * add by 吴学文 at 2023-01-11 15:49:03 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网：http://www.homecommunity.cn
- * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
- */
-@Java110Cmd(serviceCode = "itemRelease.deleteItemReleaseRes")
-public class DeleteItemReleaseResCmd extends Cmd {
-    private static Logger logger = LoggerFactory.getLogger(DeleteItemReleaseResCmd.class);
-
-    @Autowired
-    private IItemReleaseResV1InnerServiceSMO itemReleaseResV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "resId", "resId不能为空");
-        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-        ItemReleaseResPo itemReleaseResPo = BeanConvertUtil.covertBean(reqJson, ItemReleaseResPo.class);
-        int flag = itemReleaseResV1InnerServiceSMOImpl.deleteItemReleaseRes(itemReleaseResPo);
-
-        if (flag < 1) {
-            throw new CmdException("删除数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-common/src/main/java/com/java110/common/cmd/itemRelease/DeleteItemReleaseTypeCmd.java

@@ -21,6 +21,7 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.doc.annotation.*;
 import com.java110.intf.common.IItemReleaseTypeV1InnerServiceSMO;
 import com.java110.po.itemReleaseType.ItemReleaseTypePo;
 import com.java110.utils.exception.CmdException;
@@ -30,7 +31,31 @@ import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+@Java110CmdDoc(title = "删除物品放行类型",
+        description = "删除物品放行类型，物品放行类型 比如大型物品 小型物品等",
+        httpMethod = "post",
+        url = "http://{ip}:{port}/app/itemRelease.deleteItemReleaseType",
+        resource = "commonDoc",
+        author = "吴学文",
+        serviceCode = "itemRelease.deleteItemReleaseType"
+)
 
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "typeId", length = 30, remark = "放行ID"),
+        @Java110ParamDoc(name = "communityId", length = 30, remark = "放行小区"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="{'typeId':'123','communityId':'123'}",
+        resBody="{'code':0,'msg':'成功'}"
+)
 /**
  * 类表述：删除
  * 服务编码：itemReleaseType.deleteItemReleaseType

service-common/src/main/java/com/java110/common/cmd/itemRelease/ListItemReleaseCmd.java

@@ -22,6 +22,7 @@ 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.doc.annotation.*;
 import com.java110.intf.common.IItemReleaseV1InnerServiceSMO;
 import com.java110.po.itemRelease.ItemReleasePo;
 import com.java110.utils.exception.CmdException;
@@ -37,7 +38,33 @@ import org.springframework.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Java110CmdDoc(title = "查询物品放行",
+        description = "查询物品放行，供物业端使用",
+        httpMethod = "get",
+        url = "http://{ip}:{port}/app/itemRelease.listItemRelease",
+        resource = "commonDoc",
+        author = "吴学文",
+        serviceCode = "itemRelease.listItemRelease"
+)
 
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "communityId", length = 30, remark = "放行小区"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
+                @Java110ParamDoc(name = "data", type = "Array", length = -1, defaultValue = "成功", remark = "数据"),
+                @Java110ParamDoc(parentNodeName = "data", name = "amount", type = "Array", length = -1,  remark = "数量"),
+
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="{'typeId':'123','communityId':'123'}",
+        resBody="{'code':0,'msg':'成功'}"
+)
 /**
  * 类表述：查询
  * 服务编码：itemRelease.listItemRelease

service-common/src/main/java/com/java110/common/cmd/itemRelease/ListItemReleaseResCmd.java

@@ -20,6 +20,7 @@ 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.doc.annotation.*;
 import com.java110.intf.common.IItemReleaseResV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
@@ -34,10 +35,37 @@ import org.springframework.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Java110CmdDoc(title = "查询放行物品",
+        description = "查询放行物品，供物业端使用",
+        httpMethod = "get",
+        url = "http://{ip}:{port}/app/itemRelease.listItemReleaseRes",
+        resource = "commonDoc",
+        author = "吴学文",
+        serviceCode = "itemRelease.listItemReleaseRes"
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "communityId", length = 30, remark = "放行小区"),
+        @Java110ParamDoc(name = "irId", length = 30, remark = "物品放行ID"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
+                @Java110ParamDoc(name = "data", type = "Array", length = -1, defaultValue = "成功", remark = "数据"),
+                @Java110ParamDoc(parentNodeName = "data", name = "resName", type = "String", length = -1,  remark = "物品名称"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="{'irId':'123','communityId':'123'}",
+        resBody="{'code':0,'msg':'成功'}"
+)
 
 /**
  * 类表述：查询
- * 服务编码：itemReleaseRes.listItemReleaseRes
+ * 服务编码：itemRelease.listItemReleaseRes
  * 请求路劲：/app/itemReleaseRes.ListItemReleaseRes
  * add by 吴学文 at 2023-01-11 15:49:03 mail: 928255095@qq.com
  * open source address: https://gitee.com/wuxw7/MicroCommunity
@@ -56,6 +84,7 @@ public class ListItemReleaseResCmd extends Cmd {
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+        Assert.hasKeyAndValue(reqJson, "irId", "请求报文中未包含物品放行ID");
 
     }
 

service-common/src/main/java/com/java110/common/cmd/itemRelease/ListItemReleaseTypeCmd.java

@@ -20,6 +20,7 @@ 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.doc.annotation.*;
 import com.java110.intf.common.IItemReleaseTypeV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
@@ -37,6 +38,32 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
+@Java110CmdDoc(title = "查询放行物品类型",
+        description = "查询放行物品类型，供物业端使用",
+        httpMethod = "get",
+        url = "http://{ip}:{port}/app/itemRelease.listItemReleaseType",
+        resource = "commonDoc",
+        author = "吴学文",
+        serviceCode = "itemRelease.listItemReleaseType"
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "communityId", length = 30, remark = "放行小区"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
+                @Java110ParamDoc(name = "data", type = "Array", length = -1, defaultValue = "成功", remark = "数据"),
+                @Java110ParamDoc(parentNodeName = "data", name = "resName", type = "String", length = -1,  remark = "物品名称"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="http://{ip}:{port}/app/itemRelease.listItemReleaseType?communityId=123123",
+        resBody="{'code':0,'msg':'成功'}"
+)
 /**
  * 类表述：查询
  * 服务编码：itemReleaseType.listItemReleaseType

service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java

@@ -22,6 +22,7 @@ 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.doc.annotation.*;
 import com.java110.intf.common.IItemReleaseV1InnerServiceSMO;
 import com.java110.po.itemRelease.ItemReleasePo;
 import com.java110.utils.exception.CmdException;
@@ -32,6 +33,37 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Java110CmdDoc(title = "申请物品放行",
+        description = "申请物品放行",
+        httpMethod = "post",
+        url = "http://{ip}:{port}/app/itemRelease.saveItemRelease",
+        resource = "commonDoc",
+        author = "吴学文",
+        serviceCode = "itemRelease.saveItemRelease"
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "typeId", length = 30, remark = "放行ID"),
+        @Java110ParamDoc(name = "communityId", length = 30, remark = "放行小区"),
+        @Java110ParamDoc(name = "applyCompany", length = 30, remark = "申请单位"),
+        @Java110ParamDoc(name = "applyPerson", length = 30, remark = "申请人"),
+        @Java110ParamDoc(name = "idCard", length = 30, remark = "身份证"),
+        @Java110ParamDoc(name = "applyTel", length = 30, remark = "申请电话"),
+        @Java110ParamDoc(name = "passTime", length = 30, remark = "通信时间"),
+        @Java110ParamDoc(name = "amount", length = 30, remark = "数量"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="{'typeId':'123','communityId':'123','applyCompany':'123','applyPerson':'123','idCard':'123','applyTel':'123','passTime':'123','amount':'123'}",
+        resBody="{'code':0,'msg':'成功'}"
+)
 /**
  * 类表述：保存
  * 服务编码：itemRelease.saveItemRelease

service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseResCmd.java

@@ -1,77 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.common.cmd.itemRelease;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
-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.intf.common.IItemReleaseResV1InnerServiceSMO;
-import com.java110.po.itemReleaseRes.ItemReleaseResPo;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 类表述：保存
- * 服务编码：itemReleaseRes.saveItemReleaseRes
- * 请求路劲：/app/itemReleaseRes.SaveItemReleaseRes
- * add by 吴学文 at 2023-01-11 15:49:03 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网：http://www.homecommunity.cn
- * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
- */
-@Java110Cmd(serviceCode = "itemRelease.saveItemReleaseRes")
-public class SaveItemReleaseResCmd extends Cmd {
-
-    private static Logger logger = LoggerFactory.getLogger(SaveItemReleaseResCmd.class);
-
-    public static final String CODE_PREFIX_ID = "10";
-
-    @Autowired
-    private IItemReleaseResV1InnerServiceSMO itemReleaseResV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "irId", "请求报文中未包含irId");
-        Assert.hasKeyAndValue(reqJson, "resName", "请求报文中未包含resName");
-        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-        ItemReleaseResPo itemReleaseResPo = BeanConvertUtil.covertBean(reqJson, ItemReleaseResPo.class);
-        itemReleaseResPo.setResId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
-        int flag = itemReleaseResV1InnerServiceSMOImpl.saveItemReleaseRes(itemReleaseResPo);
-
-        if (flag < 1) {
-            throw new CmdException("保存数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseTypeCmd.java

@@ -22,6 +22,7 @@ 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.doc.annotation.*;
 import com.java110.intf.common.IItemReleaseTypeV1InnerServiceSMO;
 import com.java110.po.itemReleaseType.ItemReleaseTypePo;
 import com.java110.utils.exception.CmdException;
@@ -32,6 +33,33 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
+
+@Java110CmdDoc(title = "保存物品放行类型",
+        description = "保存物品放行类型",
+        httpMethod = "post",
+        url = "http://{ip}:{port}/app/itemRelease.saveItemReleaseType",
+        resource = "commonDoc",
+        author = "吴学文",
+        serviceCode = "itemRelease.saveItemReleaseType"
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "communityId", length = 30, remark = "放行小区"),
+        @Java110ParamDoc(name = "typeName", length = 30, remark = "类型名称"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="{'typeName':'123','communityId':'123'}",
+        resBody="{'code':0,'msg':'成功'}"
+)
 /**
  * 类表述：保存
  * 服务编码：itemReleaseType.saveItemReleaseType

service-common/src/main/java/com/java110/common/cmd/itemRelease/UpdateItemReleaseCmd.java

@@ -22,6 +22,7 @@ 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.doc.annotation.*;
 import com.java110.intf.common.IItemReleaseV1InnerServiceSMO;
 import com.java110.po.itemRelease.ItemReleasePo;
 import com.java110.utils.exception.CmdException;
@@ -33,6 +34,38 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
+
+@Java110CmdDoc(title = "修改物品放行",
+        description = "修改物品放行",
+        httpMethod = "post",
+        url = "http://{ip}:{port}/app/itemRelease.updateItemRelease",
+        resource = "commonDoc",
+        author = "吴学文",
+        serviceCode = "itemRelease.updateItemRelease"
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "communityId", length = 30, remark = "放行小区"),
+        @Java110ParamDoc(name = "irId", length = 30, remark = "放行ID"),
+        @Java110ParamDoc(name = "applyCompany", length = 30, remark = "申请单位"),
+        @Java110ParamDoc(name = "applyPerson", length = 30, remark = "申请人"),
+        @Java110ParamDoc(name = "idCard", length = 30, remark = "身份证"),
+        @Java110ParamDoc(name = "applyTel", length = 30, remark = "申请电话"),
+        @Java110ParamDoc(name = "passTime", length = 30, remark = "通信时间"),
+        @Java110ParamDoc(name = "amount", length = 30, remark = "数量"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="{'irId':'123','typeId':'123','communityId':'123','applyCompany':'123','applyPerson':'123','idCard':'123','applyTel':'123','passTime':'123','amount':'123'}",
+        resBody="{'code':0,'msg':'成功'}"
+)
 /**
  * 类表述：更新
  * 服务编码：itemRelease.updateItemRelease

service-common/src/main/java/com/java110/common/cmd/itemRelease/UpdateItemReleaseResCmd.java

@@ -1,74 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.common.cmd.itemRelease;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.Cmd;
-import com.java110.core.event.cmd.CmdEvent;
-import com.java110.intf.common.IItemReleaseResV1InnerServiceSMO;
-import com.java110.po.itemReleaseRes.ItemReleaseResPo;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * 类表述：更新
- * 服务编码：itemReleaseRes.updateItemReleaseRes
- * 请求路劲：/app/itemReleaseRes.UpdateItemReleaseRes
- * add by 吴学文 at 2023-01-11 15:49:03 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网：http://www.homecommunity.cn
- * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
- */
-@Java110Cmd(serviceCode = "itemRelease.updateItemReleaseRes")
-public class UpdateItemReleaseResCmd extends Cmd {
-
-    private static Logger logger = LoggerFactory.getLogger(UpdateItemReleaseResCmd.class);
-
-
-    @Autowired
-    private IItemReleaseResV1InnerServiceSMO itemReleaseResV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "resId", "resId不能为空");
-        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-        ItemReleaseResPo itemReleaseResPo = BeanConvertUtil.covertBean(reqJson, ItemReleaseResPo.class);
-        int flag = itemReleaseResV1InnerServiceSMOImpl.updateItemReleaseRes(itemReleaseResPo);
-
-        if (flag < 1) {
-            throw new CmdException("更新数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-common/src/main/java/com/java110/common/cmd/itemRelease/UpdateItemReleaseTypeCmd.java

@@ -21,6 +21,7 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.doc.annotation.*;
 import com.java110.intf.common.IItemReleaseTypeV1InnerServiceSMO;
 import com.java110.po.itemReleaseType.ItemReleaseTypePo;
 import com.java110.utils.exception.CmdException;
@@ -32,6 +33,32 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
+@Java110CmdDoc(title = "修改物品放行类型",
+        description = "修改物品放行类型",
+        httpMethod = "post",
+        url = "http://{ip}:{port}/app/itemRelease.updateItemReleaseType",
+        resource = "commonDoc",
+        author = "吴学文",
+        serviceCode = "itemRelease.updateItemReleaseType"
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "communityId", length = 30, remark = "放行小区"),
+        @Java110ParamDoc(name = "typeName", length = 30, remark = "类型名称"),
+        @Java110ParamDoc(name = "typeId", length = 30, remark = "放行ID"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="{'typeName':'123','typeId':'123','communityId':'123'}",
+        resBody="{'code':0,'msg':'成功'}"
+)
 /**
  * 类表述：更新
  * 服务编码：itemReleaseType.updateItemReleaseType

service-common/src/main/java/com/java110/common/cmd/itemRelease/package-info.java

@@ -0,0 +1,13 @@
+/**
+ * 需求
+ * 物品放行模块
+ * 说明：在业主端提交物品放行申请。园区物业管理部门收到物品放行申请，根据设定流程进行审批，安排物业人员进行处理，完成物品放行申请流程。
+ * 如遇大件物品或大批量物品申请，则需要特定权限的人进行审批和查验方可放行。
+ * 现状:该功能需新开发
+ * 需求：
+ * 1.	PC后台新增放行菜单，功能包含：新增放行，修改放行，删除放行，放行列表，设置放行审批流程，放行功能模块包含且不限于以下字段：
+ * 申请单位，日期，申请人，身份证号码，物品名称，数量，放行状态等
+ * 2.	业主端新增放行申请功能，放行申请列表，放行申请详情页
+ * 3.	物业端新增放行管理功能，放行审批，放行申请详情页
+ */
+package com.java110.common.cmd.itemRelease;

service-job/src/main/java/com/java110/job/export/adapt/ReportPayFeeDetailAdapt.java

@@ -7,6 +7,7 @@ import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
 import com.java110.intf.report.IQueryPayFeeDetailInnerServiceSMO;
 import com.java110.job.export.IExportDataAdapt;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.apache.poi.ss.usermodel.Row;
@@ -118,7 +119,7 @@ public class ReportPayFeeDetailAdapt implements IExportDataAdapt{
             row.createCell(6).setCellValue(dataObj.getString("primeRate"));
             row.createCell(7).setCellValue(dataObj.getString("startTime"));
             row.createCell(8).setCellValue(dataObj.getString("endTime"));
-            row.createCell(9).setCellValue(dataObj.getString("createTime"));
+            row.createCell(9).setCellValue(DateUtil.getFormatTimeString(dataObj.getDate("createTime"),DateUtil.DATE_FORMATE_STRING_A));
             row.createCell(10).setCellValue(dataObj.getDouble("receivableAmount"));
             row.createCell(11).setCellValue(dataObj.getDouble("receivedAmount"));
             row.createCell(12).setCellValue(dataObj.getDouble("preferentialAmount"));