Skip to content

J
jyzb_platformV2
Commit b9dc1c63 by 李小惠
Options

项目重新提交

parent de744ead
正在显示 包含 1814 行增加 和 1562 行删除
jyzb-api/pom.xml
......@@ -47,6 +47,12 @@
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
</dependency>
<dependency>
<groupId>com.belerweb</groupId>
<artifactId>pinyin4j</artifactId>
<version>2.5.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/AccountingDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto;
import lombok.Data;
import java.math.BigDecimal;
//存储记账的信息
@Data
public class AccountingDto {
//号型id
private String sizeId;
//类型id
private String typeId;
//单价
private BigDecimal price;
//记账数量
private Integer modifyQuantity;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/BusFormDto.java
package com.junmp.jyzb.api.bean.dto;
import com.junmp.v2.common.bean.request.BaseRequest;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
......@@ -127,14 +125,23 @@ public class BusFormDto {
private String note;
/**
* 供应商id
* 厂商id
*/
private String supplierId;
/**
* 供应商名称
* 厂商名称
*/
private String supplierName;
/**
* 厂商类型（0为供应商，1为生产厂商，2为维修单位，3为销毁单位）
*/
private Integer agencyType;
/**
* 装备类别拼接
*/
private String invList;
/**
* 仓库id
......@@ -158,23 +165,18 @@ public class BusFormDto {
private String updateUser;
/**
* 报废类型（1报废出库，2移入报废区）
* 报废销毁类型（1销毁出库，2移入报废区）
*/
private Integer type;
/**
* 维修单位id
*/
private String repairId;
/**
* 维修单位名称
*/
private String repairName;
/**
* 销毁、报废单位id
* 单据使用次数（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
*/
private String destoryId;
private String useCount;
/**
* 销毁、报废单位名称
* 审核人信息
*/
private String destoryName;
private String currentAssign;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/ESOrgDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class ESOrgDto {
private List<OrgDto> orgDto;
private ArrayList ids;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/ESTypeDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class ESTypeDto {
private List<EquipmentTypeDto> typeDto;
private ArrayList ids;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EqsSumDto.java
......@@ -9,20 +9,36 @@ import java.io.Serializable;
*/
@Data
public class EqsSumDto implements Serializable {
/**
* 装备类型id
*/
private String typeId;
/**
* 装备类型名称
*/
private String typeName;
/**
* 装备类型id
*/
private String sizeId;
/**
* 装备类型名称
*/
private String sizeName;
//组织机构id
private Long orgId;
//组织机构名称
private String orgName;
//总数（单警柜+仓库）
private Integer totalSum;
//仓库在库数
private Integer inSum;
//总数（在库数+出库数）
private Integer number;
//仓库在库数(包含报废区)
private Integer ckStockNumber;
//仓库出库数
private Integer outSum;
private Integer ckOutboundNumber;
//单警柜出库数
private Integer cabinetOutSum;
private Integer djgOutboundNumber;
//单警柜在库数
private Integer cabinetInSum;
//报废数
private Integer brokenSum;
private Integer djgStockNumber;
//销毁
private Integer destructionNumber;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentTypeDto.java
......@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.ArrayList;
import java.util.List;
@Data
......@@ -22,4 +23,10 @@ public class EquipmentTypeDto {
private Boolean isLeaf;
private List<String> supplierList;
private String photo;
private Integer childCount;
private List<EquipmentTypeDto> children = new ArrayList<>();
public void addChild(EquipmentTypeDto child) {
children.add(child);
}
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/GeneratePurchaseQuicklyDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class GeneratePurchaseQuicklyDto {
private String sizeId;
private String sizeName;
private String typeId;
private String typeName;
private Integer number;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/InventoryDto.java
......@@ -69,6 +69,8 @@ public class InventoryDto implements Serializable {
*/
private String locationId ;
private String locationName;
/**
* 价格
*/
......@@ -91,7 +93,8 @@ public class InventoryDto implements Serializable {
/**
* 组织机构id
*/
private Long orgId;
private String orgId;
private Long orgIdInt;
/**
* 组织机构
*/
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/InventorySumDto.java
......@@ -63,4 +63,11 @@ public class InventorySumDto {
*number 库存数量
*/
private Integer number;
private Integer ckStockNumber;
private Integer djgStockNumber;
private Integer ckOutboundNumber;
private Integer djgOutboundNumber;
private Integer totalNumber;
private Integer destructionNumber;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/LogDetailDto.java
......@@ -3,6 +3,7 @@ package com.junmp.jyzb.api.bean.dto;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
......@@ -10,7 +11,7 @@ public class LogDetailDto implements Serializable {
/**
* 出入库明细ID
*/
private Integer id;
private Long id;
/**
* 物资id
......@@ -20,7 +21,7 @@ public class LogDetailDto implements Serializable {
/**
* 出入库汇总ID
*/
private Integer summaryId;
private Long summaryId;
/**
* 单据ID
......@@ -35,17 +36,17 @@ public class LogDetailDto implements Serializable {
/**
* 装备名称
*/
private String equipmentName;
private String typeName;
/**
* 装备号型
*/
private String equipmentSize;
private String sizeName;
/**
* 供应商
*/
private String equipmentSupplier;
private String supplierName;
/**
* 装备类型:0单件/1装备包
......@@ -97,4 +98,8 @@ public class LogDetailDto implements Serializable {
* 存储名称：XX仓库，XX单警柜
*/
private String locationName;
private BigDecimal price;
private String outInState;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/LogSummaryDto.java
......@@ -11,7 +11,7 @@ public class LogSummaryDto implements Serializable {
/**
* 出入库汇总ID
*/
private Integer id;
private Long id;
/**
* 组织机构ID
......@@ -67,6 +67,8 @@ public class LogSummaryDto implements Serializable {
*/
private Integer outInState;
private Integer number;
/**
* 照片信息
*/
......@@ -96,10 +98,6 @@ public class LogSummaryDto implements Serializable {
* 创建人员
*/
private String createUser;
/**
* 装备详细信息
*/
private List<LogDetailDto> logList;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/NormalInOutDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto;
import lombok.Data;
import java.math.BigDecimal;
//日常出入库输出类，用于更新计算库存汇总表中的数据
@Data
public class NormalInOutDto {
/**
*orgId 组织机构id
*/
private Long orgId;
/**
*orgName 组织机构名称
*/
private String orgName;
/**
*typeId 装备类型id
*/
private String typeId;
/**
*typeName 装备类型名称
*/
private String typeName;
/**
*sizeId 装备型号id
*/
private String sizeId;
/**
*sizeName 装备型号名称
*/
private String sizeName;
/**
* 位置信息id
*/
private String locationId;
/**
* 位置名称
*/
private String locationName;
/**
* 单价
*/
private BigDecimal price;
/**
*number 库存数量
*/
private Integer number;
//出入库状态
private String OutInState;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrderDetailDto.java
......@@ -37,6 +37,8 @@ public class OrderDetailDto implements Serializable {
* 实际数量
*/
private Integer actualNum;
//记账数量
private Integer modifyQuantity;
private BigDecimal price;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrderDto.java
......@@ -76,9 +76,9 @@ public class OrderDto implements Serializable {
private String invList;
/**
* 生产厂商id
* 生产厂商
*/
private String manufacturerId;
private String manufacturerName;
/**
* 明细列表
*/
......@@ -87,5 +87,20 @@ public class OrderDto implements Serializable {
private Date useDate;
private String createUser;
private String allocateType;
private String repairName;
private String destoryName;
/**
* 附件地址
*/
private String attachmentLocation;
/**
* 归还人id，归还入库特有(相当于领用人)
*/
private String returnUserId;
private String returnUser;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrgDto.java
......@@ -12,12 +12,15 @@ public class OrgDto {
private String orgCode;
private Integer isDepartment;
private Long orgParentId;
private String orgParentIds;
private String areaName;
private String levelFlag;
private String dName;
private Boolean isLeaf;
private Integer statusFlag;
private Integer childCount;
private List<OrgDto> children = new ArrayList<>();
public void addChild(OrgDto child) {
children.add(child);
}
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/PolicemanDto.java
......@@ -24,6 +24,8 @@ public class PolicemanDto {
private String photo;
private String tel;
private String phone;
//单警柜编号
private String cabinetNum;
......@@ -40,7 +42,28 @@ public class PolicemanDto {
private Boolean isCreatedAccount;
//指纹信息列表
private List<PoliceFingerDto> fingersList;
private String fileContent;
private Long userId;
//用户名
private String account;
/**
* 角色id列表
*/
private List<Long> rolesList;
/**
* 0警员，1辅警
*/
private Integer identity;
/**
* 人脸照片list
*/
private List<String> faceInfoList;
/**
* 指纹照片list
*/
private List<String> fingerList;
}
\ No newline at end of file
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/ProcessOrderDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto;
import lombok.Data;
/**
* 流程单据具体装备输出实体类
*/
@Data
public class ProcessOrderDto {
/**
* 出入库单据
*/
private OrderDto orderDto;
/**
* 业务单据
*/
private BusFormDto busFormDto;
/**
* 调岗单据
*/
private ReassignmentDto reassignmentDto;
/**
* 盘库单据
*/
private StocktakeDto stocktakeDto;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/ProductBatchDto.java deleted 100644 → 0
package com.junmp.jyzb.api.bean.dto;
import lombok.Data;
import java.io.Serializable;
/**
* <pre>
*
* 描述：
* 版本：1.0.0
* 日期：2022/8/3 13:21
* 作者：ningzp@junmp.com.cn
* <br>修改记录
* <br>修改日期 修改人 修改内容
*
* </pre>
*/
@Data
public class ProductBatchDto implements Serializable {
/**
* 批次编号
*/
private Long batchId;
/**
* 批次号
*/
private String batchNo;
/**
* 产品编号
*/
private Long productId;
/**
* 产品名称
*/
private String productName;
/**
* 广告语
*/
private String adInfo;
/**
* 号型编号
*/
private Long specId;
/**
* 号型
*/
private String spec;
/**
* 重量
*/
private String weight;
/**
* 材质
*/
private String material;
/**
* 计划生产数
*/
private Integer total;
/**
* 是否复检完成
*/
private Boolean hasFinish;
/**
* 是否初始化完成
*/
private Boolean hasInit;
/**
* 已生产数量
*/
private Integer doneNum;
/**
* 初始化数量
*/
private Integer initNum;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/ProductProcessDto.java deleted 100644 → 0
package com.junmp.jyzb.api.bean.dto;
import lombok.Data;
import java.io.Serializable;
/**
* <pre>
*
* 描述：
* 版本：1.0.0
* 日期：2022/8/3 13:21
* 作者：ningzp@junmp.com.cn
* <br>修改记录
* <br>修改日期 修改人 修改内容
*
* </pre>
*/
@Data
public class ProductProcessDto implements Serializable {
/**
* 批次编号
*/
private Long batchId;
/**
* 批次号
*/
private String batchNo;
/**
* 产品编号
*/
private Long productId;
/**
* 产品名称
*/
private String productName;
/**
* 广告语
*/
private String adInfo ;
/**
* 号型编号
*/
private Long specId;
/**
* 号型
*/
private String spec;
/**
* 重量
*/
private String weight;
/**
* 材质
*/
private String material;
/**
* 计划生产数
*/
private Integer total;
/**
* 是否复检完成
*/
private Boolean hasFinish;
/**
* 是否初始化完成
*/
private Boolean hasInit;
/**
* 已自检数量
*/
private Integer checkedNum;
/**
* 待自检数量
*/
private Integer waitingNum;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/ProductTagDto.java deleted 100644 → 0
package com.junmp.jyzb.api.bean.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* <pre>
*
* 描述：
* 版本：1.0.0
* 日期：2022/8/5 15:32
* 作者：ningzp@junmp.com.cn
* <br>修改记录
* <br>修改日期 修改人 修改内容
*
* </pre>
*/
@Data
public class ProductTagDto implements Serializable {
private Long tagId ;
private String productCode ;
private String password;
private String ciphertext ;
private String productName ;
private Date produceTime ;
private String spec ;
private String material ;
private String weight ;
private String companyName ;
private String adInfo ;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/ReassignmentDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class ReassignmentDto {
/**
* id
*/
private String id;
/**
* 经办人
*/
private String userName;
/**
* 工作流id
*/
private String processId;
/**
* 订单编号
*/
private String orderCode;
/**
* 调岗警员id
*/
private String policeId;
/**
* 调岗警员姓名
*/
private String policeName;
/**
* 警员带走装备
*/
private String eqsList;
/**
* 组织机构id（谁申请，就是谁的组织机构号）
*/
private Long orgId;
private String orgName;
/**
* 警员
*/
private String policeCode;
/**
* 调岗原因
*/
private String note;
/**
* 审核状态(none未接入工作流，working审批中，finished审批完成)
*/
private String examineState;
/**
* 申请时间
*/
private Date applyTime;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 创建人员
*/
private String createUser;
/**
* 更新人员
*/
private String updateUser;
/**
* 装备总数
*/
private Integer totalNum;
/**
* 装备总金额
*/
private BigDecimal price;
/**
* 类型（调入警员0，调出警员1）
*/
private Integer reassigmentType;
}
\ No newline at end of file
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/StocktakeDto.java
package com.junmp.jyzb.api.bean.dto;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.io.Serializable;
......@@ -34,9 +35,20 @@ public class StocktakeDto implements Serializable {
private Long orgId;
/**
* 组织机构名称
*/
private String orgName;
/**
* 仓库id
*/
private String locationId;
/**
* 仓库名称
*/
private String locationName;
/**
* 盘库类型（0全盘，1根据货架位置盘，2根据装备类型盘）
*/
......@@ -48,9 +60,19 @@ public class StocktakeDto implements Serializable {
private String shelfId;
/**
* 货架位置（类型为1时特有）
* 排
*/
private String shelfLocation;
private Integer shelfRanges;
/**
* 列
*/
private Integer shelfColumns;
/**
* 行
*/
private Integer shelfRows;
/**
* 号型id（类型为2时特有）
......@@ -122,4 +144,6 @@ public class StocktakeDto implements Serializable {
* 更新人员
*/
private String updateUser;
}
}
\ No newline at end of file
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/SupplierDto.java
......@@ -33,6 +33,11 @@ public class SupplierDto {
private String shortName;
/**
* 类型（0为供应商，1为生产厂商，2为维修单位，3为销毁单位）
*/
private Integer agencyType;
/**
* 联系人
*/
private String contacts;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TjDto/FinalTjOrgEqsDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto.TjDto;
import lombok.Data;
import java.util.List;
@Data
public class FinalTjOrgEqsDto {
// 合计总数
private Integer totalNumber;
// 合计仓库在库数
private Integer ckStockNumber;
// 合计单警柜在库数
private Integer djgStockNumber;
// 合计仓库出库数
private Integer ckOutboundNumber;
// 合计单警柜出库数
private Integer djgOutboundNumber;
// 合计销毁数
private Integer destructionNumber;
// 每个组织机构的装备数
private List<TjOrgEqsDto> tjOrgEqsDto;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TjDto/FinalTjOrgPriceDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto.TjDto;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
public class FinalTjOrgPriceDto {
// 合计年初数量
private Integer startNum;
// 合计年初金额
private BigDecimal startPrice;
// 合计年末数量
private Integer endNum;
// 合计年末金额
private BigDecimal endPrice;
// 合计本年度新增数量
private Integer addNum;
// 合计本年度销毁数量
private Integer destoryNum;
// 组织机构装备新增情况list
private List<TjOrgPriceDto> tjOrgPriceDto;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TjDto/TjOrgEqsDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto.TjDto;
import lombok.Data;
import java.util.List;
@Data
public class TjOrgEqsDto {
/**
* 组织机构id
*/
private Long orgId;
/**
* 组织机构名称
*/
private String orgName;
/**
* 组织机构编码
*/
private String orgCode;
/**
* 上层组织机构id
*/
private Long parentId;
/**
* 装备总数
*/
private Integer totalNumber;
/**
* 在库数（仓库数）
*/
private Integer ckStockNumber;
/**
* 出库数（仓库数）
*/
private Integer ckOutboundNumber;
/**
* 单警柜在库数
*/
private Integer djgStockNumber;
/**
* 单警柜出库数
*/
private Integer djgOutboundNumber;
/**
* 销毁数
*/
private Integer destructionNumber;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TjDto/TjOrgPriceDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto.TjDto;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class TjOrgPriceDto {
/**
* 组织机构id
*/
private Long orgId;
/**
* 组织机构名称
*/
private String orgName;
/**
* 组织机构编码
*/
private String orgCode;
/**
* 上层组织机构id
*/
private Long parentId;
// 年初数量
private Integer startNum;
// 年初金额
private BigDecimal startPrice;
// 年末数量
private Integer endNum;
// 年末金额
private BigDecimal endPrice;
// 本年度新增数量
private Integer addNum;
// 本年度销毁数量
private Integer destoryNum;
private String sizeId;
private String sizeName;
private String typeId;
private String typeName;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/BussinessOrderDetialReq.java 0 → 100644
package com.junmp.jyzb.api.bean.query;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class BussinessOrderDetialReq {
private String id;
private Long orgId;
private String orgName;
private String typeId;
private String typeName;
private String sizeId;
private String sizeName;
private String locationType;
private String locationName;
private String locationId;
private Integer planNum;
private BigDecimal unitPrice;
private BigDecimal price;
private String note;
private BigDecimal totalPrice;
//备注
private String remark;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/EpcCheckReq.java 0 → 100644
package com.junmp.jyzb.api.bean.query;
import lombok.Data;
import java.util.List;
@Data
public class EpcCheckReq {
private List<String> epcList;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InAndOutRecordReq/DetailLogReq.java 0 → 100644
package com.junmp.jyzb.api.bean.query.InAndOutRecordReq;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class DetailLogReq {
private Integer summaryId;
private String inventoryId;
private String bussinessType;
private String epc;
private String sizeId;
private String typeId;
private String typeName;
private String sizeName;
private String supplierId;
private String supplierName;
private Integer errorState;
private BigDecimal price;
private Integer equipmentType;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InAndOutRecordReq/DetailOrderReq.java 0 → 100644
package com.junmp.jyzb.api.bean.query.InAndOutRecordReq;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class DetailOrderReq {
private String id;
private String orderType;
private BigDecimal price;
private Integer actualNum;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InAndOutRecordReq/OrderReq.java 0 → 100644
package com.junmp.jyzb.api.bean.query.InAndOutRecordReq;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
public class OrderReq {
private String id;
private BigDecimal price;
private Integer actualQuantity;
private Integer orderState;
private List<DetailOrderReq> orderDetail;
private List<PurchaseEqsReq> purchaseList;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InAndOutRecordReq/OutInLogsReq.java 0 → 100644
package com.junmp.jyzb.api.bean.query.InAndOutRecordReq;
import lombok.Data;
import java.util.List;
@Data
public class OutInLogsReq {
//组织机构id
private Long orgId;
//组织机构名称
private String orgName;
//设备标识
private String device;
//出入设备
private Integer deviceType;
//业务类型
private String bussinessType;
//出入状态
private String outInState;
//所属位置（0仓库1单警柜）
private Integer locationType;
private OrderReq orderMain;
private List<SummaryLogReq> logSummaryList;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InAndOutRecordReq/PurchaseEqsReq.java 0 → 100644
package com.junmp.jyzb.api.bean.query.InAndOutRecordReq;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class PurchaseEqsReq {
private String epc;
private String typeId;
private String typeName;
private String sizeId;
private String sizeName;
private Date productionDate;
private Integer warranyPeriod;
private Integer maintenancePeriod;
private String supplierId;
private String supplierName;
//装备类型0单件，1装备包
private Integer equipmentType;
private BigDecimal price;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InAndOutRecordReq/SummaryLogReq.java 0 → 100644
package com.junmp.jyzb.api.bean.query.InAndOutRecordReq;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
public class SummaryLogReq {
private String orderMainId;
private String orderCode;
private String locationId;
private String locationName;
private String userName;
private Date useTime;
private String picture;
private String equipmentList;
private Integer number;
private List<DetailLogReq> logDetailList;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InventoryReq.java
......@@ -139,6 +139,7 @@ public class InventoryReq extends BaseRequest {
* 位置ID
*/
private String locationId ;
private String locationName;
/**
* 是否遗失
*/
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InventorySumReq.java
......@@ -9,6 +9,8 @@ import lombok.Getter;
@Data
@EqualsAndHashCode(callSuper = true)
public class InventorySumReq extends BaseRequest {
private String id;
/**
* 组织机构
*/
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/LogDetailReq.java
package com.junmp.jyzb.api.bean.query;
import com.baomidou.mybatisplus.annotation.TableField;
import com.junmp.v2.common.bean.request.ValidationApi;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
@Data
......@@ -10,7 +14,7 @@ public class LogDetailReq {
/**
* 出入库明细ID
*/
private Integer id;
private Long id;
/**
* 物资id
......@@ -20,12 +24,9 @@ public class LogDetailReq {
/**
* 出入库汇总ID
*/
private Integer summaryId;
@NotNull(message = "出入库记录汇总id不能为空",groups = {ValidationApi.detail.class})
private Long summaryId;
/**
* 单据ID
*/
private String orderMainId;
/**
* EPC信息
......@@ -88,13 +89,4 @@ public class LogDetailReq {
*/
private Integer deviceType;
/**
* 存储ID
*/
private String locationId;
/**
* 存储名称：XX仓库，XX单警柜
*/
private String locationName;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/LogSummaryReq.java
......@@ -7,6 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
......@@ -17,12 +18,12 @@ public class LogSummaryReq extends BaseRequest {
/**
* 出入库汇总ID
*/
private Integer id;
private Long id;
/**
* 组织机构ID
*/
@NotNull(message = "组织机构id不能为空",groups = {detail.class})
@NotNull(message = "组织机构id不能为空",groups = {page.class})
private Long orgId;
/**
......@@ -33,6 +34,7 @@ public class LogSummaryReq extends BaseRequest {
/**
* 单据id
*/
@NotBlank(message = "单据id不能为空",groups = {detail.class})
private String orderMainId;
/**
......@@ -40,10 +42,6 @@ public class LogSummaryReq extends BaseRequest {
*/
private String locationId;
/**
* 箱门id
*/
private String cabinetboxId;
/**
* 存储名称：XX仓库，XX单警柜
......@@ -53,6 +51,7 @@ public class LogSummaryReq extends BaseRequest {
/**
* 0仓库，1单警柜
*/
@NotNull(message = "位置不能为空",groups = {page.class})
private Integer locationType;
/**
......@@ -80,9 +79,11 @@ public class LogSummaryReq extends BaseRequest {
private String userName;
/**
* 出入库类型:0出库/1入库
* 出入库类型
*/
private Integer outInState;
private String outInState;
private Integer number;
/**
* 照片信息
......@@ -120,4 +121,9 @@ public class LogSummaryReq extends BaseRequest {
private String typeId;
private String column;
private String order;
private Date startTime;
private Date endTime;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrderDetailReq.java
......@@ -36,6 +36,7 @@ public class OrderDetailReq extends BaseRequest {
private Integer actualNum;
private BigDecimal price;
private String orderType;
......@@ -53,7 +54,7 @@ public class OrderDetailReq extends BaseRequest {
private String warehouseName;
/**
* 修改后数量
* 修改后数量(记账数量)
*/
private Integer modifyQuantity;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrderMainReq.java
......@@ -19,6 +19,8 @@ public class OrderMainReq extends BaseRequest {
@NotBlank(message = "业务类型不能为空",groups = {edit.class})
private String orderType;
private String processInstanceId;
private String processId;
private String bussinessType;
......@@ -92,12 +94,12 @@ public class OrderMainReq extends BaseRequest {
/**
* 生产厂商id
*/
private String manufacturerId;
private String manufacturerName;
/**
* 调拨类型（2支拨，1价拨），调拨出入库才有
*/
private Integer transferType;
private Integer allocateType;
/**
* 归还人，归还入库特有
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/PoliceReassignmentReq.java deleted 100644 → 0
package com.junmp.jyzb.api.bean.query;
import com.junmp.jyzb.api.bean.req.FormEqsReq;
import com.junmp.v2.common.bean.request.ValidationApi;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.List;
//警员调岗
@Data
public class PoliceReassignmentReq {
//调岗警员id
@NotBlank(message = "警员id不能为空",groups = {ValidationApi.edit.class})
private String id;
//目标组织机构id
@NotNull(message = "目标组织机构id不能为空",groups = {ValidationApi.edit.class})
private Long goalOrgId;
//需要带走的装备信息列表
private List<FormEqsReq> eqsReqList;
//调岗原因
private String note;
//工作流id
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ProcessReq/PoliceEquipmentReq.java 0 → 100644
package com.junmp.jyzb.api.bean.query.ProcessReq;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@Data
public class PoliceEquipmentReq {
/**
* 主键
*/
private String id;
/**
* 警员ID
*/
private String policeId;
private String policeName;
/**
* 装备号型id
*/
private String sizeId;
/**
*装备号型名称
*/
private String sizeName;
/**
* 装备类型id
*/
private String typeId;
/**
*装备类型名称
*/
private String typeName;
/**
* 装备数量
*/
private Integer num;
/**
* 组织机构ID
*/
private Long orgId;
//装备单价
private BigDecimal price;
/**
* 更新时间
*/
private Date updateTime;
/**
* 创建时间
*/
private Date createTime;
private List<PoliceEquipmentReq> list;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ProductBatchReq.java deleted 100644 → 0
package com.junmp.jyzb.api.bean.query;
import com.junmp.v2.common.bean.request.BaseRequest;
import com.junmp.v2.validator.api.validators.unique.TableUniqueValue;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* <pre>
*
* 描述：
* 版本：1.0.0
* 日期：2022/8/2 10:11
* 作者：ningzp@junmp.com.cn
* <br>修改记录
* <br>修改日期 修改人 修改内容
*
* </pre>
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class ProductBatchReq extends BaseRequest {
/**
* 批次主键
*/
@NotNull(message = "批次主键不能为空", groups = {edit.class, delete.class, detail.class})
private Long batchId;
/**
* 批次编号
*/
@NotBlank(message = "批次号不能为空", groups = {edit.class})
@TableUniqueValue(
message = "批次号重复",
groups = {edit.class},
tableName = "biz_product_batch",
columnName = "batch_no",
idFieldName = "batch_id")
private String batchNo;
/**
* 产品编号
*/
@NotNull(message = "批次主键不能为空", groups = {edit.class, add.class})
private Long productId;
/**
* 关联号型
*/
private Long specId;
/**
* 生产总量
*/
@NotNull(message = "批次主键不能为空", groups = {edit.class, add.class})
private Integer total;
/**
* 序号前缀
*/
private String prefix;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ProductReq.java deleted 100644 → 0
package com.junmp.jyzb.api.bean.query;
import com.junmp.v2.common.bean.request.BaseRequest;
import com.junmp.v2.validator.api.validators.unique.TableUniqueValue;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
/**
* <pre>
*
* 描述：
* 版本：1.0.0
* 日期：2022/8/1 16:29
* 作者：ningzp@junmp.com.cn
* <br>修改记录
* <br>修改日期 修改人 修改内容
*
* </pre>
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class ProductReq extends BaseRequest {
@NotNull(message = "产品主键不能为空", groups = {edit.class, delete.class, detail.class})
private Long productId;
/**
* 产品代码
*/
@NotBlank(message = "产品编码不能为空", groups = {edit.class})
@TableUniqueValue(
message = "编码重复",
groups = {edit.class},
tableName = "biz_product",
columnName = "product_code",
idFieldName = "product_id")
private String productCode;
/**
* 产品当前序号
*/
private Integer sn;
/**
* 产品名称
*/
private String name;
/**
* 条码信息
*/
private String barcode;
/**
* 重量
*/
private String weight;
/**
* 规格尺寸
*/
private String spec;
/**
* 材质
*/
private String material;
/**
* 计量单位
*/
private String unit;
/**
* 广告信息
*/
private String adInfo;
/**
* 图片地址
*/
private String imageUrl;
/**
* 生产厂家编号
*/
private Long mfBizId;
/**
* 生产厂家名称
*/
private String mfBizName;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ProductSkuReq.java deleted 100644 → 0
package com.junmp.jyzb.api.bean.query;
import com.junmp.v2.common.bean.request.BaseRequest;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
* <pre>
*
* 描述：
* 版本：1.0.0
* 日期：2022/8/1 18:28
* 作者：ningzp@junmp.com.cn
* <br>修改记录
* <br>修改日期 修改人 修改内容
*
* </pre>
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class ProductSkuReq extends BaseRequest {
@NotNull(message = "号型主键不能为空", groups = {edit.class, delete.class, detail.class})
private Long specId;
private String skuCode ;
/**
* 号型
*/
private String spec;
/**
* 重量
*/
private String weight;
/**
* 材质
*/
private String material;
/**
* 关联产品
*/
private Long productId;
/**
* 预览属性1
*/
private String attr1;
/**
* 预览属性2
*/
private String attr2;
/**
* 预览属性3
*/
private String attr3;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ProductTagReq.java deleted 100644 → 0
package com.junmp.jyzb.api.bean.query;
import com.junmp.v2.common.bean.request.BaseRequest;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
/**
* <pre>
*
* 描述：
* 版本：1.0.0
* 日期：2022/8/2 14:36
* 作者：ningzp@junmp.com.cn
* <br>修改记录
* <br>修改日期 修改人 修改内容
*
* </pre>
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class ProductTagReq extends BaseRequest {
/**
* 标签编号
*/
@NotNull(message = "标签编号不能为空", groups = {edit.class, delete.class, detail.class})
private Long tagId;
private String tagUid;
/**
* 成品码（批次+序号）
*/
private String productCode;
/**
* 关联生成批次编号
*/
@NotNull(message = "批次不能为空", groups = {add.class})
private Long batchId;
/**
* 关联生成产品主键
*/
@NotNull(message = "产品不能为空", groups = {add.class})
private Long productId;
/**
* 关联生成号型主键
*/
@NotNull(message = "号型不能为空", groups = {add.class})
private Long specId;
/**
* 产品序号
*/
private Integer serialId;
/**
* 版本编号
*/
private String versionNo;
/**
* 密码
*/
private String password;
/**
* 密文内容
*/
private String ciphertext;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryBusFormReq.java
......@@ -124,7 +124,7 @@ public class QueryBusFormReq extends BaseRequest {
/**
* 调拨类型（2支拨，1价拨）
*/
private Integer allocateType;
private String allocateType;
/**
* 备注
......@@ -132,14 +132,18 @@ public class QueryBusFormReq extends BaseRequest {
private String note;
/**
* 供应商id
* 厂商id
*/
private String supplierId;
/**
* 供应商名称
* 厂商名称
*/
private String supplierName;
/**
* 厂商类型（0为供应商，1为生产厂商，2为维修单位，3为销毁单位）
*/
private Integer agencyType;
/**
* 仓库id
......@@ -183,24 +187,25 @@ public class QueryBusFormReq extends BaseRequest {
private String order;
/**
* 报废类型（1报废出库，2移入报废区）
* 报废销毁类型（1销毁出库，2移入报废区）
*/
private Integer type;
/**
* 维修单位id
*/
private String repairId;
/**
* 维修单位名称
* 单据使用次数（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
*/
private String repairName;
private String useCount;
/**
* 销毁、报废单位id
*装备类别拼接
*/
private String destoryId;
private String invList;
/**
* 销毁、报废单位名称
* 装备名称
*/
private String destoryName;
private String typeName;
//当前登录人员
private String userId;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryEquipmentSizeReq.java
......@@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
......@@ -27,4 +28,6 @@ public class QueryEquipmentSizeReq extends BaseRequest {
private Integer state;
private String instructions;
private List<String> typeIdsList;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryEquipmentTypeReq.java
......@@ -16,5 +16,6 @@ public class QueryEquipmentTypeReq {
private String code;
private String parentId;
private Integer type;
private String typeName;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryOrgReq.java
......@@ -13,6 +13,7 @@ public class QueryOrgReq {
private String orgCode;
@NotNull(message = "组织机构不能为空",groups = {ValidationApi.detail.class})
private Long orgId;
private String orgName;
private Long parentId;
private Integer isDepartment;
private Integer level;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryReassignmentReq.java 0 → 100644
package com.junmp.jyzb.api.bean.query;
import com.baomidou.mybatisplus.annotation.TableField;
import com.junmp.v2.common.bean.request.BaseRequest;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
//警员调岗
@Data
@EqualsAndHashCode(callSuper = true)
public class QueryReassignmentReq extends BaseRequest {
/**
* id
*/
private String id;
/**
* 经办人
*/
private String userName;
/**
* 工作流id
*/
private String processDefinitionId;
private String orderCode;
/**
* 调岗警员id
*/
private String policeId;
/**
* 调岗警员姓名
*/
private String policeName;
/**
* 警员带走装备
*/
private String eqsList;
/**
* 组织机构id（警员原组织机构id）
*/
private Long orgId;
private String orgName;
/**
* 警员编号
*/
private String policeCode;
/**
* 调岗原因
*/
private String note;
/**
* 审核状态(none未接入工作流，working审批中，finished审批完成)
*/
private String examineState;
/**
* 申请时间
*/
private Date applyTime;
/**
* 开始时间
*/
private Date startTime;
/**
* 结束时间
*/
private Date endTime;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 创建人员
*/
private String createUser;
/**
* 更新人员
*/
private String updateUser;
/**
* 排序规则
*/
private String order;
/**
* 排序字段
*/
private String column;
/**
* 装备总数
*/
private Integer totalNum;
/**
* 装备总金额
*/
private BigDecimal price;
/**
* 类型（调入警员0，调出警员1）
*/
private Integer reassigmentType;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QuerySupplierReq.java
......@@ -16,6 +16,10 @@ public class QuerySupplierReq extends BaseRequest {
private String id;
private String code;
/**
* 类型（0为供应商，1为生产厂商，2为维修单位，3为销毁单位）
*/
private Integer agencyType;
private String shortName;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/TestReq.java 0 → 100644
package com.junmp.jyzb.api.bean.query;
import lombok.Data;
@Data
public class TestReq {
private String queueName;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/TjReq/TjOrgEqsReq.java 0 → 100644
package com.junmp.jyzb.api.bean.query.TjReq;
import lombok.Data;
import java.util.List;
@Data
public class TjOrgEqsReq {
//组织机构
private Long orgId;
List<String> typeIdsList;
private List<String> sizeNameList;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/TjReq/TjOrgPriceReq.java 0 → 100644
package com.junmp.jyzb.api.bean.query.TjReq;
import lombok.Data;
import java.util.List;
@Data
public class TjOrgPriceReq {
//组织机构
private Long orgId;
//类型idList
List<String> typeIdsList;
//号型名称list
private List<String> sizeNameList;
//年
private Integer year;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/FormEqsReq.java
......@@ -13,7 +13,6 @@ public class FormEqsReq extends BaseRequest {
/**
* 主键
*/
@ApiModelProperty(value = "主键ID")
private String id;
/**
......@@ -42,16 +41,6 @@ public class FormEqsReq extends BaseRequest {
private String typeName;
/**
*供应商id
*/
private String supplierId;
/**
*供应商名称
*/
private String supplierName;
/**
* 装备数量
*/
private Integer num;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/GeneratePurchaseQuicklyReq.java 0 → 100644
package com.junmp.jyzb.api.bean.req;
import lombok.Data;
import java.util.List;
@Data
public class GeneratePurchaseQuicklyReq {
//业务单
private List<UpdateBusFormReq> busFormList;
//组织机构id
private Long orgId;
//业务类型
private String bussinessType;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/InvExpireReq.java 0 → 100644
package com.junmp.jyzb.api.bean.req;
import lombok.Data;
/**
* 过质保期的数据汇总数据
*/
@Data
public class InvExpireReq {
private String typeId;
private String typeName;
private String sizeId;
private String sizeName;
private Long orgId;
private String locationId;
private String locationName;
private Integer sumExpireNumber;
private String userId;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/RabbitMqOrderReq.java
......@@ -12,9 +12,9 @@ import java.util.List;
@Data
public class RabbitMqOrderReq implements Serializable {
//主单据
private OrderMainReq orderMainReq;
private OrderMainReq orderMain;
//子单据
private OrderDetailReq orderDetailReq;
private OrderDetailReq orderDetail;
//具体装备epc
private List<InventoryReq> inventoryReqList;
//设备标识
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateBusFormReq.java
......@@ -38,7 +38,7 @@ public class UpdateBusFormReq extends BaseRequest {
/**
* 组织机构id
*/
@NotNull(message = "组织机构id不能为空",groups = {add.class})
// @NotNull(message = "组织机构id不能为空",groups = {add.class})
private Long orgId;
/**
......@@ -124,7 +124,7 @@ public class UpdateBusFormReq extends BaseRequest {
/**
* 调拨类型（2支拨，1价拨）
*/
private Integer allocateType;
private String allocateType;
/**
* 备注
......@@ -132,15 +132,18 @@ public class UpdateBusFormReq extends BaseRequest {
private String note;
/**
* 供应商id
* 厂商id
*/
private String supplierId;
/**
* 供应商名称
* 厂商名称
*/
private String supplierName;
/**
* 厂商类型（0为供应商，1为生产厂商，2为维修单位，3为销毁单位）
*/
private Integer agencyType;
/**
* 仓库id
*/
......@@ -163,24 +166,18 @@ public class UpdateBusFormReq extends BaseRequest {
private String updateUser;
/**
* 报废类型（1报废出库，2移入报废区）
* 报废销毁类型（1销毁出库，2移入报废区）
*/
private Integer type;
/**
* 维修单位id
*/
private String repairId;
/**
* 维修单位名称
* 单据使用次数（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
*/
private String repairName;
/**
* 销毁、报废单位id
*/
private String destoryId;
private String useCount;
/**
* 销毁、报废单位名称
*装备类别拼接
*/
private String destoryName;
private String invList;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateEquipmentSizeReq.java
......@@ -13,7 +13,7 @@ public class UpdateEquipmentSizeReq {
@NotBlank(message = "装备号型主键不能为空", groups = {ValidationApi.edit.class, ValidationApi.delete.class, ValidationApi.detail.class})
private String id;
@NotBlank(message = "装备类型id不能为空", groups = {ValidationApi.edit.class, ValidationApi.add.class})
private String typeId;
@NotBlank(message = "编码不能为空", groups = {ValidationApi.edit.class, ValidationApi.add.class})
private String code;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderReq.java
......@@ -31,11 +31,13 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
*/
private String processDefinitionId;
/**
* 工作流实例id
*/
private String processId;
/**
* 单据业务类型
*/
// @IsDateTime(format = "yyyy-MM-dd HH:mm:ss", message = "字段必须是有效的日期或时间")
private String bussinessType;
/**
* 订单号
......@@ -50,7 +52,7 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
* 发物单位
*/
// @IsNumber(message = "startOrgId必须是数字",groups = {add.class})
private Long startOrgId;
private String startOrgId;
/**
* 发物单位名称
*/
......@@ -64,7 +66,10 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
* 收物单位名称
*/
private String endOrgName;
/**
* 供应商id
*/
private String supplierId;
/**
* 供应商名称
*/
......@@ -127,24 +132,29 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
private List<UpdateOrderDetailReq> detailList;
/**
* 生产厂商id
* 生产厂商
*/
private String manufacturerId;
private String manufacturerName;
/**
* 调拨类型（2支拨，1价拨），调拨出入库才有
*/
private Integer transferType;
private String allocateType;
/**
* 归还人，归还入库特有
* 归还人id，归还入库特有(相当于领用人)
*/
private String returnUserId;
private String returnUser;
private Date useDate;
private String createUser;
private String updateUser;
//备注
private String note;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdatePolicemanReq.java
......@@ -53,7 +53,6 @@ public class UpdatePolicemanReq extends BaseRequest {
private Date updateTime;
@NotBlank(message = "身份证号不能为空", groups = {add.class,edit.class})
private String idCard;
private String updateUser;
......@@ -70,5 +69,16 @@ public class UpdatePolicemanReq extends BaseRequest {
* 角色id列表
*/
private List<Long> rolesList;
//当前登录人的id
private Long createUser;
/**
* 人脸照片list
*/
private List<String> faceInfoList;
/**
* 指纹照片list
*/
private List<String> fingerList;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateReassignmentReq.java
package com.junmp.jyzb.api.bean.req;
import com.baomidou.mybatisplus.annotation.TableField;
import com.junmp.v2.common.bean.request.BaseRequest;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
@Data
......@@ -14,6 +16,13 @@ public class UpdateReassignmentReq extends BaseRequest {
*/
private String id;
/**
* 经办人
*/
private String userName;
/**
* 申请人id
*/
private String userId;
/**
......@@ -22,6 +31,11 @@ public class UpdateReassignmentReq extends BaseRequest {
private String processDefinitionId;
/**
* 业务类型
*/
private String bussinessType;
/**
* 调岗警员id
*/
private String policeId;
......@@ -41,10 +55,12 @@ public class UpdateReassignmentReq extends BaseRequest {
*/
private Long orgId;
private String orgName;
/**
* 目标组织机构id
* 警员编号
*/
private Long targetOrgId;
private String policeCode;
/**
* 调岗原因
......@@ -55,15 +71,11 @@ public class UpdateReassignmentReq extends BaseRequest {
* 审核状态(none未接入工作流，working审批中，finished审批完成)
*/
private String examineState;
/**
* 开始时间
*/
private Date startTime;
/**
* 结束时间
* 申请时间
*/
private Date endTime;
private Date applyTime;
/**
* 创建时间
*/
......@@ -85,11 +97,17 @@ public class UpdateReassignmentReq extends BaseRequest {
private String updateUser;
/**
* 排序规则
* 装备总数
*/
private String order;
private Integer totalNum;
/**
* 排序字段
* 装备总金额
*/
private String column;
private BigDecimal price;
/**
* 类型（调入警员0，调出警员1）
*/
private Integer reassigmentType;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateSupplierReq.java
......@@ -17,6 +17,12 @@ public class UpdateSupplierReq {
@NotBlank(message = "供应商编码不能为空", groups = {ValidationApi.edit.class, ValidationApi.add.class})
private String code;
/**
* 类型，（0为供应商，1为生产厂商，2为维修单位，3为销毁单位）
*/
@NotNull(message = "类型不能为空", groups = {ValidationApi.edit.class, ValidationApi.add.class})
private Integer agencyType;
private String shortName;
private String contacts;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/EquipmentTypeExceptionEnum.java → jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/EquipmentExceptionEnum.java
......@@ -5,8 +5,11 @@ import com.junmp.v2.common.constant.CommonConstant;
import com.junmp.v2.common.exception.IExceptionEnum;
import lombok.Getter;
/**
* 装备异常信息，包括了size和type
*/
@Getter
public enum EquipmentTypeExceptionEnum implements IExceptionEnum {
public enum EquipmentExceptionEnum implements IExceptionEnum {
/**
* 装备类别不存在
......@@ -14,14 +17,24 @@ public enum EquipmentTypeExceptionEnum implements IExceptionEnum {
EQUIPMENT_TYPE_NOT_EXIST(CommonConstant.DEFAULT_CORE_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 12, "装备或类别不存在"),
/**
* 装备类别不存在
* 有多关联装备，无法删除
*/
EQUIPMENT_CHILDREN_EXIST(CommonConstant.DEFAULT_CORE_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 13, "有多关联装备，无法删除"),
/**
* 装备不存在
*/
SUPPLIER_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 13, "{}");
SUPPLIER_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 13, "{}"),
/**
* 装备名称重复
*/
EQUIPMENT_NAME_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"装备名称重复"),
/**
* 装备名称和编号重复
*/
EQUIPMENT_NAME_CODE_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"装备名称和编号重复"),
;
/**
......@@ -35,7 +48,7 @@ public enum EquipmentTypeExceptionEnum implements IExceptionEnum {
private final String message;
EquipmentTypeExceptionEnum(Integer code, String message) {
EquipmentExceptionEnum(Integer code, String message) {
this.code = code;
this.message = message;
}
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/OrderExceptionEnum.java
......@@ -13,6 +13,7 @@ public enum OrderExceptionEnum implements IExceptionEnum {
ORDERDETAIL_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"子单据不存在"),
ORDERDETAIL_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE,"子单据不一致，操作失败"),
ROLE_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE,"审核组织机构用户配置异常！请检查日志"),
ORDER_CREATE_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE,"单子创建失败"),
;
/**
......
jyzb-biz/pom.xml
......@@ -13,6 +13,12 @@
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.22</version>
......
jyzb-biz/src/main/java/com/junmp/jyzb/Repository/BlogRepository.java 0 → 100644
package com.junmp.jyzb.Repository;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.junmp.jyzb.entity.ES.Blog;
import io.lettuce.core.dynamic.annotation.Param;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.elasticsearch.annotations.Query;
import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
import java.awt.print.Pageable;
import java.util.List;
public interface BlogRepository extends ElasticsearchRepository<Blog, Long> {
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/Repository/PubOrgRepository.java 0 → 100644
package com.junmp.jyzb.Repository;
import com.junmp.jyzb.entity.EquipmentType;
import com.junmp.jyzb.entity.PubOrg;
import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
public interface PubOrgRepository extends ElasticsearchRepository<PubOrg, Long> {
}
jyzb-biz/src/main/java/com/junmp/jyzb/Repository/SizeRepository.java 0 → 100644
package com.junmp.jyzb.Repository;
import com.junmp.jyzb.entity.EquipmentSize;
import com.junmp.jyzb.entity.EquipmentType;
import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
public interface SizeRepository extends ElasticsearchRepository<EquipmentSize, Long> {
}
jyzb-biz/src/main/java/com/junmp/jyzb/Repository/TypeRepository.java 0 → 100644
package com.junmp.jyzb.Repository;
import com.junmp.jyzb.api.bean.dto.EquipmentTypeDto;
import com.junmp.jyzb.entity.ES.Blog;
import com.junmp.jyzb.entity.EquipmentType;
import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
public interface TypeRepository extends ElasticsearchRepository<EquipmentType, Long> {
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/BussinessController.java
......@@ -2,7 +2,9 @@ package com.junmp.jyzb.controller;
import cn.hutool.core.util.ObjectUtil;
import com.junmp.jyzb.api.bean.dto.BusFormDto;
import com.junmp.jyzb.api.bean.dto.GeneratePurchaseQuicklyDto;
import com.junmp.jyzb.api.bean.query.QueryBusFormReq;
import com.junmp.jyzb.api.bean.req.GeneratePurchaseQuicklyReq;
import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
import com.junmp.jyzb.service.BusFormService;
import com.junmp.v2.common.bean.request.ValidationApi;
......@@ -18,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* 业务单据管理模块（只针对业务单据，不包含任何出入库单据）
......@@ -34,24 +37,10 @@ public class BussinessController {
@PostMapping("/AddBussinessOrder")
@ApiOperation("创建业务单")
public ApiRes<String> AddBussinessOrder(@RequestBody @Validated(ValidationApi.add.class) UpdateBusFormReq req){
//判断是否有工作流id，如果有则将状态进行修改
if (ObjectUtil.isEmpty(req.getProcessDefinitionId()))
{
req.setExamineState("none");
}
else
{
req.setExamineState("working");
}
return ApiRes.success(busFormService.AddBussinessOrder(req));
}
//修改业务单
@PostMapping("/UpdateBussinessOrder")
@ApiOperation("修改业务单")
public ApiRes<Boolean> UpdateBussinessOrder(@RequestBody @Validated(ValidationApi.edit.class) UpdateBusFormReq req){
return ApiRes.success(busFormService.UpdateBussinessOrder(req));
}
//查看业务单（可以条件查询）
@PostMapping("/showBussinessOrder")
......@@ -60,6 +49,11 @@ public class BussinessController {
return ApiRes.success(busFormService.showBussinessOrder(req));
}
//根据调拨单，一键生成采购单
@PostMapping("/GeneratePurchaseQuickly")
@ApiOperation("快速生成采购单")
public ApiRes<List<GeneratePurchaseQuicklyDto>> GeneratePurchaseQuickly(@RequestBody GeneratePurchaseQuicklyReq req){
return ApiRes.success(busFormService.GeneratePurchaseQuickly(req));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/ES/CrudController.java 0 → 100644
package com.junmp.jyzb.controller.ES;
import com.junmp.jyzb.Repository.BlogRepository;
import com.junmp.jyzb.entity.ES.Blog;
import com.junmp.jyzb.entity.EquipmentSize;
import com.junmp.jyzb.service.EquipmentSizeService;
import com.junmp.jyzb.service.EquipmentTypeService;
import com.junmp.jyzb.service.PubOrgService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.elasticsearch.index.query.QueryStringQueryBuilder;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.sort.SortBuilders;
import org.elasticsearch.search.sort.SortOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@Api(tags = "增删改查（文档）")
@RestController
@Slf4j
@RequestMapping("crud")
public class CrudController {
@Autowired
private BlogRepository blogRepository;
@Resource
public EquipmentTypeService equipmentTypeService;
@Resource
public EquipmentSizeService equipmentSizeService;
@Resource
public PubOrgService pubOrgService;
@ApiOperation("测试")
@PostMapping("testDocument")
public Object testDocument() {
return equipmentTypeService.addEs();
}
@ApiOperation("测试组织机构")
@PostMapping("testOrgDocument")
public Object testOrgDocument() {
return pubOrgService.AddToEs();
}
@ApiOperation("一键初始化ES")
@PostMapping("UpdateES")
public Object UpdateES() {
pubOrgService.AddToEs();
equipmentTypeService.addEs();
equipmentSizeService.addEs();
return true;
}
@ApiOperation("添加单个文档")
@PostMapping("addDocument")
public Blog addDocument() {
Long id = 1L;
Blog blog = new Blog();
blog.setBlogId(id);
blog.setTitle("巡特警" + id);
blog.setContent("巡特警手铐" + id);
blog.setAuthor("Tony");
blog.setCategory("ElasticSearch");
blog.setCreateTime(new Date());
blog.setStatus(1);
blog.setSerialNum(id.toString());
Long id1 = 2L;
Blog blog1 = new Blog();
blog1.setBlogId(id1);
blog1.setTitle("巡特警" + id1);
blog1.setContent("巡特警盾牌" + id1);
blog1.setAuthor("Tony");
blog1.setCategory("ElasticSearch");
blog1.setCreateTime(new Date());
blog1.setStatus(1);
blog1.setSerialNum(id1.toString());
blogRepository.save(blog1);
return blogRepository.save(blog);
}
@ApiOperation("添加多个文档")
@PostMapping("addDocuments")
public Object addDocuments(Integer count) {
List<Blog> blogs = new ArrayList<>();
for (int i = 1; i <= count; i++) {
Long id = (long)i;
Blog blog = new Blog();
blog.setBlogId(id);
blog.setTitle("Spring Data ElasticSearch学习教程" + id);
blog.setContent("这是添加单个文档的实例" + id);
blog.setAuthor("Tony");
blog.setCategory("ElasticSearch");
blog.setCreateTime(new Date());
blog.setStatus(1);
blog.setSerialNum(id.toString());
blogs.add(blog);
}
return blogRepository.saveAll(blogs);
}
/**
* 跟新增是同一个方法。若id已存在，则修改。
* 无法只修改某个字段，只能覆盖所有字段。若某个字段没有值，则会写入null。
* @return 成功写入的数据
*/
@ApiOperation("修改单个文档")
@PostMapping("editDocument")
public Blog editDocument() {
Long id = 1L;
Blog blog = new Blog();
blog.setBlogId(id);
blog.setTitle("Spring Data ElasticSearch学习教程" + id);
blog.setContent("这是修改单个文档的实例" + id);
// blog.setAuthor("Tony");
// blog.setCategory("ElasticSearch");
// blog.setCreateTime(new Date());
// blog.setStatus(1);
// blog.setSerialNum(id.toString());
return blogRepository.save(blog);
}
@ApiOperation("查找单个文档")
@GetMapping("findById")
public Blog findById(Long id) {
return blogRepository.findById(id).get();
}
@ApiOperation("删除单个文档")
@PostMapping("deleteDocument")
public String deleteDocument(Long id) {
blogRepository.deleteById(id);
return "success";
}
@ApiOperation("删除所有文档")
@PostMapping("deleteDocumentAll")
public String deleteDocumentAll() {
blogRepository.deleteAll();
return "success";
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentSizeController.java
......@@ -2,9 +2,11 @@ package com.junmp.jyzb.controller;
import cn.hutool.db.Page;
import com.junmp.jyzb.api.bean.dto.EquipmentSizeDto;
import com.junmp.jyzb.api.bean.query.InventorySumReq;
import com.junmp.jyzb.api.bean.query.QueryEquipmentSizeReq;
import com.junmp.jyzb.api.bean.req.UpdateEquipmentSizeReq;
import com.junmp.jyzb.entity.EquipmentSize;
import com.junmp.jyzb.entity.InventorySummary;
import com.junmp.jyzb.service.EquipmentSizeService;
import com.junmp.v2.common.bean.request.ValidationApi;
import com.junmp.v2.common.bean.response.ApiRes;
......@@ -73,5 +75,18 @@ public class EquipmentSizeController {
return ApiRes.success(equipmentSizeService.changeSizeState(req));
}
//根据typeId返回号型名称
@PostMapping("/searchByTypeIds")
@ApiOperation("/根据装备类型返回装备号型名称")
public ApiRes<List<String>> searchByTypeIds(@RequestBody QueryEquipmentSizeReq req ){
return ApiRes.success(equipmentSizeService.getByTypeIds(req));
}
@PostMapping("/selectByTypeIds")
@ApiOperation("/根据装备类型返回装备所有装备子集")
public ApiRes<List<String>> selectByTypeIds(@RequestBody QueryEquipmentSizeReq req ){
return ApiRes.success(equipmentSizeService.selectByTypeIds(req.getTypeIdsList()));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentTypeController.java
package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.dto.ESTypeDto;
import com.junmp.jyzb.api.bean.dto.EquipmentTypeDto;
import com.junmp.jyzb.api.bean.dto.EquipmentTreeDto;
import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
......@@ -15,6 +16,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.List;
@RestController
......@@ -49,7 +51,11 @@ public class EquipmentTypeController {
public ApiRes<List<EquipmentTypeDto>> ShowEquipmentList(@RequestBody QueryEquipmentTypeReq req) {
return ApiRes.success(equipmentTypeService.getEquipmentList(req));
}
@PostMapping("/ShowEquipmentESList")
@ApiOperation("通过ES模糊检索类别列表")
public ApiRes<ESTypeDto> ShowEquipmentESList(@RequestBody QueryEquipmentTypeReq req) throws IOException {
return ApiRes.success(equipmentTypeService.getTypeTreeByEs(req));
}
@PostMapping("/GetEquipmentDetail")
@ApiOperation("查询单个物资信息")
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/InventoryController.java
......@@ -4,9 +4,11 @@ import com.junmp.jyzb.api.bean.dto.*;
import com.junmp.jyzb.api.bean.query.*;
import com.junmp.jyzb.api.bean.req.BatchEditingInvsReq;
import com.junmp.jyzb.api.bean.req.EquipmentBindReq;
import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
import com.junmp.jyzb.entity.InventorySummary;
import com.junmp.jyzb.entity.LogDetail;
import com.junmp.jyzb.entity.LogSummary;
import com.junmp.jyzb.entity.PubOrg;
import com.junmp.jyzb.service.*;
import com.junmp.v2.common.bean.request.ValidationApi;
import com.junmp.v2.common.bean.response.ApiRes;
......@@ -18,7 +20,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
import java.util.*;
@RestController
@Slf4j
......@@ -33,6 +35,13 @@ public class InventoryController {
public MQProductService mqProductService;
@GetMapping("/TestSum")
@ApiOperation("根据组织机构查询库存信息")
public ApiRes<Boolean> TestSum( ) {
inventorySummaryService.MonthStartSum();
return ApiRes.success();
}
@GetMapping("/testMQ")
@ApiOperation("根据组织机构查询库存信息")
public ApiRes<Boolean> testMQ( ) {
......@@ -41,7 +50,8 @@ public class InventoryController {
}
//填充汇总信息(将表中的数据base_inventory_summary进行删除并且根据base_inventory表中数据同步)
//填充汇总信息(根据base_inventory表中数据汇总同步)--第一次进行数据同步，适用于3.0初始化inventory_summary表
//该方法只有插入语句，要注意inventory_summary表中没有数据，仅有结构，否则数据不准确
@PostMapping("/SetInventoryMsg")
@ApiOperation("填充汇总表信息")
public ApiRes<Boolean> setInventoryMsg() {
......@@ -91,6 +101,14 @@ public class InventoryController {
return ApiRes.success(inventorySummaryService.getEquipmentInfo(req));
}
@PostMapping("/getOne")
@ApiOperation("获取单个库存的数量")
public ApiRes<InventorySummary> getOne(@RequestBody InventorySumReq req){
return ApiRes.success(inventorySummaryService.getOne(req));
}
//根据组织机构id/单警柜id/仓库id查询出库存汇总数量以及金额(和getEquipmentInfo同时调用，汇总出符合查询条件的装备)
@PostMapping("/getTotalNumberAndPrice")
@ApiOperation("查询总金额以及各个汇总数量")
......@@ -112,6 +130,7 @@ public class InventoryController {
public ApiRes<List<EqsBriefDto>> searchEqsByBoxId(@RequestBody @Validated(ValidationApi.detail.class) CabinetBoxReq req){
return ApiRes.success(inventoryService.searchEqsByBoxId(req));
}
//查询箱门（cabinetBox下）所有装备简要信息列表page（传递cabinetBoxId）
@PostMapping("/searchEqsByBoxIdPage")
@ApiOperation("查询某一箱门下的所有装备简要信息(page)")
......@@ -126,6 +145,7 @@ public class InventoryController {
public ApiRes<List<InventorySummary>> EqsByCabinetBoxId(@RequestBody @Validated(ValidationApi.detail.class)CabinetBoxReq req){
return ApiRes.success(inventoryService.EqsByCabinetBoxId(req));
}
//查询单警柜箱门下的汇总信息（传递cabinetBoxId）
@PostMapping("/EqsByCabinetBoxIdPage")
@ApiOperation("查询箱门下的汇总信息(page)")
......@@ -139,6 +159,7 @@ public class InventoryController {
public ApiRes<List<InventorySummary>> ShelfInventoryList(@RequestBody @Validated(ValidationApi.edit.class) ShelfReq req){
return ApiRes.success(inventoryService.ShelfInventoryList(req));
}
//根据货架id查询装备信息汇总 (page)
@PostMapping("/ShelfInventoryPage")
@ApiOperation("根据货架id查询装备信息汇总(page)")
......@@ -215,35 +236,8 @@ public class InventoryController {
return ApiRes.success(inventoryService.BatchEditingInvsInfo(req));
}
//装备出入库记录（根据单据id）
@PostMapping("/ShowInOutRecordsByOrder")
@ApiOperation("出入库单据查询展示")
public ApiRes<PageResult<LogSummary>> ShowInOutRecordsByOrder(@RequestBody @Validated(ValidationApi.detail.class) LogSummaryReq req){
return ApiRes.success(inventoryService.ShowInOutRecordsByOrder(req));
}
//装备出入库记录（根据条件查询）
@PostMapping("/ShowInOutRecordsByItems")
@ApiOperation("出入库记录条件查询展示")
public ApiRes<PageResult<LogSummary>> ShowInOutRecordsByItems(@RequestBody @Validated(ValidationApi.detail.class) LogSummaryReq req){
return ApiRes.success(inventoryService.ShowInOutRecordsByItems(req));
}
//通过装备id查询某一件装备的出入库记录
@PostMapping("/ShowInOutRecordsByEqs")
@ApiOperation("出入库记录装备id查询展示")
public ApiRes<PageResult<LogDetail>> getInOutRecords(@RequestBody @Validated(ValidationApi.detail.class) InventoryReq req){
return ApiRes.success(inventoryService.getInOutRecords(req));
}
@PostMapping("/test")
public ApiRes<Boolean> test(@RequestBody InventorySumReq req){
System.out.println("req = " + req);
return ApiRes.success(true);
}
//首页上的装备统计数量
@PostMapping("/EquipmentStatistics")
@ApiOperation("装备数量数据统计")
public ApiRes<List<InventorySummary>> EquipmentStatistics(@RequestBody InventorySumReq req){
......@@ -251,7 +245,19 @@ public class InventoryController {
return ApiRes.success(inventorySummaryService.EquipmentStatistics(req));
}
//判断epc是否存在
@PostMapping("/checkEPCList")
@ApiOperation("判断epc是否存在")
public ApiRes<List<String>> checkEPCList(@RequestBody EpcCheckReq req){
return ApiRes.success(inventoryService.checkEPCList(req));
}
//调用存储过程将汇总信息进行插入
@PostMapping("/insertToSummary")
@ApiOperation("将汇总信息进行插入更新")
public ApiRes<Boolean> insertToSummary(){
return ApiRes.success(inventorySummaryService.insertToSummary());
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/OrderController.java
......@@ -3,6 +3,7 @@ package com.junmp.jyzb.controller;
import cn.hutool.core.util.ObjectUtil;
import com.junmp.jyzb.api.bean.dto.OrderDto;
import com.junmp.jyzb.api.bean.dto.OrderMainDto;
import com.junmp.jyzb.api.bean.dto.ProcessOrderDto;
import com.junmp.jyzb.api.bean.query.OrderMainReq;
import com.junmp.jyzb.api.bean.query.OrderUploadReq;
import com.junmp.jyzb.api.bean.req.BaseOrderReq;
......@@ -38,16 +39,7 @@ public class OrderController {
@PostMapping("/AddOrder")
@ApiOperation("新增任务单")
public ApiRes<List<String>> addOrder(@RequestBody @Validated(ValidationApi.add.class) UpdateOrderReq req) {
//判断是否有工作流id，如果有则将状态进行修改
if (ObjectUtil.isEmpty(req.getProcessDefinitionId()))
{
req.setExamineState("none");
}
else//有工作流
{
req.setExamineState("working");
}
return ApiRes.success(orderMainService.AddOrder(req));
}
......@@ -58,17 +50,17 @@ public class OrderController {
@PostMapping("/AddFinishOrder")
@ApiOperation("新增已完成的任务单")
public ApiRes<String> AddFinishOrder(@RequestBody UpdateOrderReq req) {
req.setExamineState("finished");
return ApiRes.success(orderMainService.AddFinishOrder(req));
}
//修改任务单只允许工作流id为空的时候（视为草稿可以进行修改）
@PostMapping("/UpdateOrder")
@ApiOperation("修改任务单")
public ApiRes<Boolean> updateOrder(@RequestBody @Validated(ValidationApi.edit.class) UpdateOrderReq req) {
return ApiRes.success(orderMainService.updateOrder(req));
}
// @PostMapping("/UpdateOrder")
// @ApiOperation("修改任务单")
// public ApiRes<Boolean> updateOrder(@RequestBody @Validated(ValidationApi.edit.class) UpdateOrderReq req) {
// return ApiRes.success(orderMainService.updateOrder(req));
// }
//查询任务列表(根据组织机构id)
......@@ -103,8 +95,7 @@ public class OrderController {
}
//个人装备管理申请单（移交申请）
//个人装备管理申请单
@PostMapping("/AddPersonalEqsOrder")
@ApiOperation("/新增个人装备申请单")
public ApiRes<List<String>> AddPersonalEqsOrder(@RequestBody BaseOrderReq req){
......@@ -155,4 +146,10 @@ public class OrderController {
}
//根据流程id获取单据的装备信息
@PostMapping("/GetByProcessId")
@ApiOperation("根据流程id获取单据装备信息")
public ApiRes<ProcessOrderDto> GetByProcessId(@RequestBody OrderMainReq req){
return ApiRes.success(orderMainService.GetByProcessId(req));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/OutAndInboundController.java
package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.dto.LogDetailDto;
import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.OutInLogsReq;
import com.junmp.jyzb.api.bean.query.InventoryReq;
import com.junmp.jyzb.api.bean.req.FormEqsReq;
import com.junmp.jyzb.service.PoliceEquipmentService;
import com.junmp.jyzb.api.bean.query.LogDetailReq;
import com.junmp.jyzb.api.bean.query.LogSummaryReq;
import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
import com.junmp.jyzb.entity.LogDetail;
import com.junmp.jyzb.entity.LogSummary;
import com.junmp.jyzb.service.InventorySummaryService;
import com.junmp.jyzb.service.LogDetailService;
import com.junmp.jyzb.service.LogSummaryService;
import com.junmp.v2.common.bean.request.ValidationApi;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
@RestController
@Slf4j
@RequestMapping("/OutAndInbound")
@RequestMapping("/OutAndInRecords")
@Api(tags = "出入库模块")
public class OutAndInboundController {
@Resource
private PoliceEquipmentService policeEquipmentService;
//装备入库，添加入库记录
@ApiOperation("添加装备入库记录")
@PostMapping("/AddInRecords")
public ApiRes<Boolean> AddInRecords(InventoryReq req){
return ApiRes.success();
}
public LogSummaryService logSummaryService;
@Resource
private LogDetailService logDetailService;
@ApiOperation("/查看出入库详情")
@PostMapping("/GetDetailByLogSumId")
public ApiRes<List<LogDetailDto>> GetDetailByLogSumId(@RequestBody @Validated(ValidationApi.detail.class) LogDetailReq req){
return ApiRes.success(logDetailService.GetDetailByLogSumId(req));
}
//装备出入库记录（根据单据id）
@PostMapping("/ShowInOutRecordsByOrder")
@ApiOperation("出入库单据查询展示")
public ApiRes<List<LogDetailDto>> ShowInOutRecordsByOrder(@RequestBody @Validated(ValidationApi.detail.class) LogSummaryReq req){
return ApiRes.success(logDetailService.ShowInOutRecordsByOrder(req));
}
//装备出入库记录（根据条件查询）
@PostMapping("/ShowInOutRecordsByItems")
@ApiOperation("出入库记录条件查询展示")
public ApiRes<PageResult<LogSummary>> ShowInOutRecordsByItems(@RequestBody @Validated(ValidationApi.page.class) LogSummaryReq req){
return ApiRes.success(logSummaryService.ShowInOutRecordsByItems(req));
}
//警员借用装备后在在数据库中增加相关借用装备数据
@PostMapping("/AddBorrowEqs")
@ApiOperation("增加警员借用装备数据信息")
public ApiRes<Boolean> AddBorrowEqs(FormEqsReq req){
return ApiRes.success(policeEquipmentService.AddPoliceEqs(req));
//通过装备id查询某一件装备的出入库记录
@PostMapping("/ShowInOutRecordsByEqs")
@ApiOperation("出入库记录装备id查询展示")
public ApiRes<PageResult<LogDetail>> getInOutRecords(@RequestBody @Validated(ValidationApi.detail.class) InventoryReq req){
return ApiRes.success(logDetailService.getInOutRecords(req));
}
//警员领用装备后在数据库中增加相关领用装备数据
@PostMapping("/AddTakeEqs")
@ApiOperation("增加警员领用装备数据信息")
public ApiRes<Boolean> AddTakeEqs(FormEqsReq req){
return ApiRes.success(policeEquipmentService.AddPoliceEqs(req));
@PostMapping("/OutInRecords")
public ApiRes<Boolean> OutInRecords(@RequestBody OutInLogsReq req){
return ApiRes.success(logSummaryService.processInventoryRecords(req));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java
......@@ -2,9 +2,10 @@ package com.junmp.jyzb.controller;
import cn.hutool.core.util.ObjectUtil;
import com.junmp.jyzb.api.bean.dto.PolicemanDto;
import com.junmp.jyzb.api.bean.dto.ReassignmentDto;
import com.junmp.jyzb.api.bean.query.CabinetReq;
import com.junmp.jyzb.api.bean.query.PoliceReassignmentReq;
import com.junmp.jyzb.api.bean.query.PolicemanReq;
import com.junmp.jyzb.api.bean.query.QueryReassignmentReq;
import com.junmp.jyzb.api.bean.req.UpdatePolicemanReq;
import com.junmp.jyzb.api.bean.req.UpdateReassignmentReq;
import com.junmp.jyzb.entity.EquipmentSize;
......@@ -46,6 +47,12 @@ public class PoliceController {
String policeId = policemanService.AddPoliceman(req);
return ApiRes.success(policeId);
}
//添加警员时先将没有组织机构号的警员查询出来
@PostMapping("/GetPoliceWithoutOrg")
@ApiOperation("/获取没有组织机构的警员信息")
public ApiRes<List<Policeman>> GetPoliceWithoutOrg(){
return ApiRes.success(policemanService.GetPoliceWithoutOrg());
}
@PostMapping("/DeletePolice")
@ApiOperation("删除警员信息")
......@@ -57,6 +64,13 @@ public class PoliceController {
return ApiRes.success(b);
}
//添加人脸和指纹照片或修改
@PostMapping("/addFaceAndfinger")
@ApiOperation("添加警员人脸照片和指纹照片")
public ApiRes<Boolean> addFaceAndfinger(@RequestBody UpdatePolicemanReq req){
return ApiRes.success(policemanService.addFaceAndfinger(req));
}
@PostMapping("/ChangePoliceState")
@ApiOperation("修改警员状态")
......@@ -187,13 +201,6 @@ public class PoliceController {
return ApiRes.success(policemanService.UpdatePoliceInfo(req));
}
//获取警员的装备信息
@PostMapping("/GetPoliceEqs")
@ApiOperation("获取警员装备信息")
public ApiRes<PageResult<PoliceEquipment>> GetPoliceEqs(@RequestBody PolicemanReq req){
return ApiRes.success(policemanService.GetPoliceEqs(req));
}
//将警员和user一一对应并且关系表也一一对应
@PostMapping("/UpdatePoliceUser")
@ApiOperation("将警员关系一一对应")
......@@ -201,6 +208,7 @@ public class PoliceController {
return ApiRes.success(policemanService.UpdatePoliceUser());
}
@PostMapping("/PoliceReassignment")
@ApiOperation("警员调岗申请单")
public ApiRes<String> PoliceReassignment(@RequestBody UpdateReassignmentReq req){
......@@ -209,14 +217,22 @@ public class PoliceController {
@PostMapping("/ShowReassignmentPage")
@ApiOperation("查看警员调岗申请单")
public ApiRes<PageResult<Reassignment>> ShowReassignmentPage(@RequestBody UpdateReassignmentReq req){
public ApiRes<PageResult<ReassignmentDto>> ShowReassignmentPage(@RequestBody QueryReassignmentReq req){
return ApiRes.success(policemanService.ShowReassignmentPage(req));
}
@PostMapping("/ChangePoliceOrg")
@ApiOperation("警员调岗（业务过程）")
public ApiRes<Boolean> changePoliceOrg(@RequestBody @Validated(ValidationApi.edit.class)PoliceReassignmentReq req){
public ApiRes<Boolean> changePoliceOrg(@RequestBody UpdateReassignmentReq req){
return ApiRes.success(policemanService.changePoliceOrg(req));
}
//获取警员的装备信息
@PostMapping("/GetPoliceEquipment")
@ApiOperation("获取警员装备信息")
public ApiRes<List<PoliceEquipment>> GetPoliceEqs(@RequestBody QueryReassignmentReq req){
return ApiRes.success(policemanService.GetPoliceEqs(req));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/ProductBatchController.java deleted 100644 → 0
package com.junmp.jyzb.controller;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.junmp.jyzb.api.bean.dto.ProductBatchDto;
import com.junmp.jyzb.api.bean.dto.ProductProcessDto;
import com.junmp.jyzb.api.bean.query.ProductBatchReq;
import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
import com.junmp.jyzb.api.util.GenCodeUtil;
import com.junmp.jyzb.doc.ProductBatchDoc;
import com.junmp.jyzb.entity.ProductBatch;
import com.junmp.jyzb.entity.ProductTag;
import com.junmp.jyzb.service.ProductBatchService;
import com.junmp.jyzb.service.ProductTagService;
import com.junmp.v2.common.bean.request.ValidationApi;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
import com.junmp.v2.db.api.page.PageResult;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* <pre>
*
* 描述：
* 版本：1.0.0
* 日期：2022/8/1 17:59
* 作者：ningzp@junmp.com.cn
* <br>修改记录
* <br>修改日期 修改人 修改内容
* 20221109 ning 修改初始化重复成品码严重的BUG.
* </pre>
*/
@RestController
@Slf4j
@RequestMapping("/api")
public class ProductBatchController implements ProductBatchDoc {
@Resource
private ProductBatchService productBatchService;
@Resource
private ProductTagService productTagService;
@PostMapping(path = "/batch/produce", name = "生产产品批次")
public ApiRes<Boolean> makeProduct(@RequestBody @Validated(ValidationApi.detail.class) ProductBatchReq req) {
if (ObjectUtil.isNotNull(req) && ObjectUtil.isNotNull(req.getBatchId())) {
ProductBatchDto dto = productBatchService.getBatchDetail(req.getBatchId());
List<ProductTag> list = batchTagInfo(dto);
if (null != list && list.size() > 0) {
productTagService.saveBatch(list);
//更新已完成
ProductBatch pb = new ProductBatch();
pb.setBatchId(req.getBatchId());
pb.setHasInit(true);
productBatchService.updateById(pb);
return ApiRes.success();
} else {
return ApiRes.failure("没有可生产数据");
}
} else {
return ApiRes.failure(DefaultBizExceptionEnum.VALID_PARAMS_ERROR);
}
}
@PostMapping(path = "/batch", name = "新增产品批次")
@Override
public ApiRes<Boolean> addProductBatch(@RequestBody @Validated(ValidationApi.add.class) ProductBatchReq req) {
boolean flag = productBatchService.addProductBatch(req);
if (flag) {
return ApiRes.success();
} else {
log.warn(StrUtil.format("请求的参数：{}", JSONUtil.toJsonStr(req)));
return ApiRes.failure(StrUtil.format("保存失败"));
}
}
@PutMapping(path = "/batch", name = "更新产品批次")
@Override
public ApiRes<Boolean> editProductBatch(@RequestBody @Validated(ValidationApi.edit.class) ProductBatchReq req) {
boolean flag = productBatchService.editProductBatch(req);
if (flag) {
return ApiRes.success();
} else {
log.warn(StrUtil.format("请求的参数：{}", JSONUtil.toJsonStr(req)));
return ApiRes.failure(StrUtil.format("更新失败"));
}
}
@DeleteMapping(path = "/batch", name = "删除产品批次")
@Override
public ApiRes<Boolean> delBatch(@RequestBody @Validated(ValidationApi.delete.class) ProductBatchReq req) {
try {
boolean flag = productBatchService.del(req);
if (flag) {
return ApiRes.success();
} else {
return ApiRes.failure("删除失败");
}
} catch (ServiceException ex) {
return ApiRes.failure(ex.getMessage());
}
}
@GetMapping(path = "/batch/page", name = "分页批次数据")
@Override
public ApiRes<PageResult<ProductBatchDto>> getPage(ProductBatchReq req) {
return ApiRes.success(productBatchService.findPage(req));
}
@GetMapping(path = "/batch/process/page", name = "分页批次数据")
@Override
public ApiRes<PageResult<ProductProcessDto>> getProcessPage(ProductBatchReq req) {
return ApiRes.success(productBatchService.findProcessPage(req));
}
/**
* 批次信息
*
*
*/
private List<ProductTag> batchTagInfo(ProductBatchDto batch) {
if (batch.getHasInit()) {
throw new ServiceException(ProductExceptionEnum.BATCH_PROCESSED_DONE);
} else {
List<ProductTag> list = new ArrayList<>();
Integer total = batch.getTotal();
//修改已知的BUG 。重复成品码的根源
Integer initVal = batch.getInitNum() > 0 ? batch.getInitNum() + 1 : 1;
for (; initVal <= total; initVal++) {
ProductTag tag = new ProductTag();
tag.setBatchId(batch.getBatchId());
tag.setProductId(batch.getProductId());
tag.setSpecId(batch.getSpecId());
tag.setProduceTime(new Date());
tag.setSerialId(initVal);
//成品码
StringBuilder sb = new StringBuilder();
String serialNo = GenCodeUtil.splicingZero(String.valueOf(initVal), 4);
sb.append(batch.getBatchNo())
.append(serialNo);
tag.setProductCode(sb.toString());
tag.setHasInit(false);
tag.setHasChecked(false);
list.add(tag);
}
return list;
}
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/ProductController.java deleted 100644 → 0
package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.query.ProductReq;
import com.junmp.jyzb.doc.ProductDoc;
import com.junmp.jyzb.entity.Product;
import com.junmp.jyzb.service.ProductService;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* <pre>
*
* 描述：
* 版本：1.0.0
* 日期：2022/8/1 16:25
* 作者：ningzp@junmp.com.cn
* <br>修改记录
* <br>修改日期 修改人 修改内容
*
* </pre>
*/
@RestController
@Slf4j
@RequestMapping("/api")
public class ProductController implements ProductDoc {
@Resource
private ProductService productService;
@PostMapping(path = "/product", name = "新增产品")
@Override
public ApiRes<Boolean> addProduct(@RequestBody @Validated(ProductReq.add.class) ProductReq req) {
return ApiRes.success(productService.addProduct(req));
}
@PutMapping(path = "/product", name = "编辑产品")
@Override
public ApiRes<Boolean> editProduct(@RequestBody @Validated(ProductReq.edit.class) ProductReq req) {
return ApiRes.success(productService.editProduct(req));
}
@GetMapping(path = "/product", name = "产品列表")
@Override
public ApiRes<List<Product>> list(ProductReq req) {
return ApiRes.success(productService.findList(req));
}
@DeleteMapping(path = "/product", name = "删除产品")
@Override
public ApiRes<Boolean> delProduct(@RequestBody @Validated(ProductReq.delete.class)ProductReq req) {
return ApiRes.success(productService.del(req));
}
@GetMapping(path = "/product/page", name = "产品分页")
@Override
public ApiRes<PageResult<Product>> page(ProductReq req) {
return ApiRes.success(productService.findPage(req));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/ProductSkuController.java deleted 100644 → 0
package com.junmp.jyzb.controller;
import cn.hutool.core.util.ObjectUtil;
import com.junmp.jyzb.api.bean.query.ProductSkuReq;
import com.junmp.jyzb.api.bean.vo.ProductSkuVo;
import com.junmp.jyzb.doc.ProductSkuDoc;
import com.junmp.jyzb.entity.ProductSku;
import com.junmp.jyzb.service.ProductSkuService;
import com.junmp.v2.common.bean.request.ValidationApi;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.db.api.page.PageResult;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* <pre>
*
* 描述：
* 版本：1.0.0
* 日期：2022/8/1 17:59
* 作者：ningzp@junmp.com.cn
* <br>修改记录
* <br>修改日期 修改人 修改内容
*
* </pre>
*/
@RestController
@Slf4j
@RequestMapping("/api")
public class ProductSkuController implements ProductSkuDoc {
@Resource
private ProductSkuService productSkuService;
@PostMapping(path = "/spec", name = "新增号型")
@Override
public ApiRes<Boolean> addProductSku(@RequestBody @Validated(ProductSkuReq.add.class) ProductSkuReq req) {
try {
productSkuService.addProductSku(req);
return ApiRes.success();
} catch (ServiceException ex) {
log.error("新增号型异常>>" + ex.getMessage());
return ApiRes.failure(DefaultBizExceptionEnum.SYS_RUNTIME_ERROR);
}
}
@PutMapping(path = "/spec", name = "编辑号型")
@Override
public ApiRes<Boolean> editProductSku(@RequestBody @Validated(ProductSkuReq.edit.class)ProductSkuReq req) {
return ApiRes.success(productSkuService.editProductSku(req));
}
@DeleteMapping(path = "/spec", name = "删除号型")
@Override
public ApiRes<Boolean> del(@RequestBody @Validated(ValidationApi.delete.class)ProductSkuReq req) {
return ApiRes.success(productSkuService.del(req));
}
@GetMapping(path = "/spec/page", name = "分页号型")
@Override
public ApiRes<PageResult<ProductSku>> page(ProductSkuReq req) {
return ApiRes.success(productSkuService.findPage(req));
}
@GetMapping(path = "/spec/getByProduct", name = "获取指定产品号型列表")
@Override
public ApiRes<List<ProductSkuVo>> listByProduct(ProductSkuReq req) {
if (ObjectUtil.isNotNull(req) && ObjectUtil.isNotNull(req.getProductId())) {
List<ProductSku> list = productSkuService.findList(req);
return ApiRes.success(BeanPlusUtil.toBeanList(list, ProductSkuVo.class));
} else {
return ApiRes.failure("产品编号不能为空");
}
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/ProductTagController.java deleted 100644 → 0
package com.junmp.jyzb.controller;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.junmp.jyzb.api.bean.dto.ProductTagDto;
import com.junmp.jyzb.api.bean.query.ProductTagReq;
import com.junmp.jyzb.api.bean.vo.TagInfoVo;
import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
import com.junmp.jyzb.doc.ProductTagDoc;
import com.junmp.jyzb.entity.ProductTag;
import com.junmp.jyzb.service.ProductTagService;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
import com.junmp.v2.db.api.page.PageResult;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Date;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
/**
* <pre>
*
* 描述：
* 版本：1.0.0
* 日期：2022/8/1 17:59
* 作者：ningzp@junmp.com.cn
* <br>修改记录
* <br>修改日期 修改人 修改内容
*
* </pre>
*/
@RestController
@Slf4j
@RequestMapping("/api")
public class ProductTagController implements ProductTagDoc {
@Resource
private ProductTagService productTagService;
/**
* 前端参数包括：batchId 和 tagUid
*/
@PostMapping(path = "/tag/updateUid", name = "更新标签UID")
@Override
public ApiRes<TagInfoVo> updateUid(@RequestBody ProductTagReq req) {
ProductTag info = productTagService.checkTagUid(req);
info.setTagUid(req.getTagUid());
info.setHasInit(true);
boolean flag = productTagService.updateById(info);
if (flag) {
String hexStr = HexUtil.encodeHexStr(info.getProductCode());
return ApiRes.success(TagInfoVo.builder().tagId(info.getTagId()).content(hexStr).build());
} else {
return ApiRes.failure("UID数据更新失败");
}
}
/**
* 前端参数包括：tagId,password,ciphertext
*/
@PostMapping(path = "/tag/updateContent", name = "更新内容")
@Override
public ApiRes<TagInfoVo> updateContent(@RequestBody ProductTagReq req) {
if (ObjectUtil.isNotNull(req) && ObjectUtil.isNotNull(req.getTagId())) {
ProductTag info = productTagService.getById(req.getTagId());
if (null != info) {
info.setPassword(req.getPassword());
info.setCiphertext(req.getCiphertext());
boolean flag = productTagService.updateById(info);
if (flag) {
//查询视图获取数据
ProductTagDto dto = productTagService.getTagInfo(req.getTagId());
StringBuilder tmp = new StringBuilder();
Set<String> params = new LinkedHashSet<>();
if (StrUtil.isNotBlank(dto.getCompanyName())) {
tmp.append("厂家:{}\n");
params.add(dto.getCompanyName());
}
if (StrUtil.isNotBlank(dto.getProductName())) {
tmp.append("名称:{}\n");
params.add(dto.getProductName());
}
if (StrUtil.isNotBlank(dto.getSpec())) {
tmp.append("规格:{}\n");
params.add(dto.getSpec());
}
if (StrUtil.isNotBlank(dto.getMaterial())) {
tmp.append("材质:{}\n");
params.add(dto.getMaterial());
}
if (StrUtil.isNotBlank(dto.getWeight())) {
tmp.append("重量:{}\n");
params.add(dto.getWeight());
}
//厂家:{}\n日期:{}
tmp.append("编号:{}\n");
params.add(dto.getProductCode());
//写入广告语
if (StrUtil.isNotBlank(dto.getAdInfo())) {
tmp.append("{}\n");
params.add(dto.getAdInfo());
}
log.info(StrUtil.format("待写入的模板:{}", tmp.toString()));
//String abc = "名称:{}\n规格:{}\n重量:{}\n厂家:{}\n日期:{}\n编号:{}\n";
String content = StrUtil.format(tmp.toString(), params.toArray());
log.info(StrUtil.format("写入的内容:{}", content));
TagInfoVo infoVo = TagInfoVo.builder()
.tagId(req.getTagId())
.productCode(dto.getCiphertext())
.content(content).build();
log.info(StrUtil.format("写入芯片的内容>>", JSONUtil.toJsonStr(info)));
return ApiRes.success(infoVo);
} else {
return ApiRes.failure("UID数据更新失败");
}
} else {
return ApiRes.failure(ProductExceptionEnum.TAG_INFO_NOT_EXISTS);
}
} else {
return ApiRes.failure(DefaultBizExceptionEnum.VALID_PARAMS_ERROR);
}
}
/**
* 前端参数：tagUid,productCode
*/
@PostMapping(path = "/tag/check", name = "复检接口")
public ApiRes<Boolean> checkTag(@RequestBody ProductTagReq req) {
if (ObjectUtil.isNotNull(req) &&
ObjectUtil.isNotNull(req.getTagUid()) &&
ObjectUtil.isNotNull(req.getProductCode())) {
String code = HexUtil.decodeHexStr(req.getProductCode());
req.setProductCode(code);
List<ProductTag> list = productTagService.findList(req);
if (CollectionUtil.isNotEmpty(list) && list.size() == 1) {
ProductTag tag = list.get(0);
log.info(StrUtil.format("复检结果为：{}", JSONUtil.toJsonStr(tag)));
if (tag.getHasChecked()) {
log.warn("该产品已完成自检，编号为:{}", req.getTagUid());
return ApiRes.success();
}
if (ObjectUtil.isNotNull(tag)) {
//更新为已经复检
tag.setHasChecked(true);
tag.setCheckTime(new Date());
productTagService.updateById(tag);
return ApiRes.success();
} else {
return ApiRes.failure(ProductExceptionEnum.TAG_INFO_NOT_EXISTS);
}
} else {
return ApiRes.failure(ProductExceptionEnum.TAG_INFO_REPEAT_ERROR);
}
} else {
return ApiRes.failure(DefaultBizExceptionEnum.VALID_PARAMS_ERROR);
}
}
@GetMapping(path = "/tag/page", name = "分页标签")
public ApiRes<PageResult<ProductTag>> getPage(ProductTagReq req) {
return ApiRes.success(productTagService.findPage(req));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PubOrgController.java
package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.dto.ESOrgDto;
import com.junmp.jyzb.api.bean.dto.OrgDto;
import com.junmp.jyzb.api.bean.dto.OrgTreeDto;
import com.junmp.jyzb.api.bean.query.ProductSkuReq;
import com.junmp.jyzb.api.bean.query.QueryOrgReq;
import com.junmp.jyzb.api.bean.req.UpdateOrgReq;
import com.junmp.jyzb.service.PubOrgService;
......@@ -12,11 +11,11 @@ import com.junmp.v2.common.bean.response.ApiRes;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.lang.Nullable;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.List;
import java.util.Map;
......@@ -53,6 +52,11 @@ public class PubOrgController {
public ApiRes<OrgDto> GetCurrentList(@RequestBody @Validated(ValidationApi.detail.class) QueryOrgReq req) {
return ApiRes.success(pubOrgService.getOrgHierarchy(req));
}
@PostMapping("/GetCurrentESList")
@ApiOperation("根据当前组织机构列表ES查询")
public ApiRes<ESOrgDto> GetCurrentESList(@RequestBody QueryOrgReq req) throws IOException {
return ApiRes.success(pubOrgService.getOrgTreeByEs(req));
}
@PostMapping("/ChangeOrgState")
@ApiOperation("改变组织机构状态信息")
public ApiRes<Boolean> changeOrgState(@RequestBody @Validated(ValidationApi.updateStatus.class) UpdateOrgReq req) {
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/StocktakeController.java
package com.junmp.jyzb.controller;
import cn.hutool.core.util.ObjectUtil;
import com.junmp.jyzb.api.bean.dto.StocktakeDto;
import com.junmp.jyzb.api.bean.query.StocktakeReq;
import com.junmp.jyzb.api.bean.req.UpdateStocktakeReq;
import com.junmp.jyzb.entity.Stocktake;
......@@ -47,7 +48,7 @@ public class StocktakeController {
//查询单据
@PostMapping("/ShowStocktakeOrderPage")
@ApiOperation("盘库单据查询")
public ApiRes<PageResult<Stocktake>> ShowStocktakeOrderPage(@RequestBody @Validated(ValidationApi.edit.class)StocktakeReq req){
public ApiRes<PageResult<StocktakeDto>> ShowStocktakeOrderPage(@RequestBody @Validated(ValidationApi.edit.class)StocktakeReq req){
return ApiRes.success(stocktakeService.ShowStocktakeOrderPage(req));
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/TestController.java
package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
import com.junmp.jyzb.api.bean.query.ProcessReq.PoliceEquipmentReq;
import com.junmp.jyzb.api.bean.query.TestReq;
import com.junmp.jyzb.entity.InventorySummary;
import com.junmp.jyzb.entity.PoliceEquipment;
import com.junmp.jyzb.service.InventorySummaryService;
import com.junmp.jyzb.service.PoliceEquipmentService;
import com.junmp.jyzb.service.TestService;
import com.junmp.jyzb.utils.ResponseResult;
import io.swagger.annotations.ApiOperation;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.common.util.BeanPlusUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.core.RabbitAdmin;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
import java.util.stream.Collectors;
@RestController
@Slf4j
......@@ -19,15 +28,39 @@ public class TestController {
@Resource
private TestService testService;
@Resource
private InventorySummaryService inventorySummaryService;
@Resource
private PoliceEquipmentService policeEquipmentService;
@Resource
private RabbitAdmin rabbitAdmin;
@RequestMapping("/hello")
public ResponseResult Hello(){
return new ResponseResult(10000,"操作成功","hello");
}
@PostMapping("/uploadResult")
@ApiOperation("模拟本地主机上传结果到rabbitmq")
public Boolean uploadResult(@RequestBody RabbitMqOrderReq req){
// @PostMapping("/test")
// public ApiRes<Boolean> test(@RequestBody RabbitMqOrderReq req){
// return ApiRes.success(testService.test(req));
// }
@PostMapping("/hasConsumers")
public ApiRes<Boolean> hasConsumers(@RequestBody TestReq req){
Long execute = rabbitAdmin.getRabbitTemplate().execute(channel -> channel.consumerCount(req.getQueueName()));
System.out.println("execute = " + execute);
return ApiRes.success(execute>0L);
}
return testService.uploadResult(req);
@PostMapping("addPoliceEqs")
public ApiRes<Boolean> addPoliceEqs(@RequestBody PoliceEquipmentReq req){
List<PoliceEquipment> collect = req.getList().stream().map(policeEquipmentReq -> {
PoliceEquipment policeEquipment = new PoliceEquipment();
BeanPlusUtil.copyProperties(policeEquipmentReq, policeEquipment);
return policeEquipment;
}).collect(Collectors.toList());
return ApiRes.success(policeEquipmentService.saveBatch(collect));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/TjController.java 0 → 100644
package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.dto.InventorySumDto;
import com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgEqsDto;
import com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgPriceDto;
import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgEqsDto;
import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto;
import com.junmp.jyzb.api.bean.query.InventoryReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgEqsReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
import com.junmp.jyzb.service.TjService;
import com.junmp.v2.common.bean.response.ApiRes;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
@RestController
@Slf4j
@RequestMapping("/Tj")
@Api(tags = "统计报表模块")
public class TjController {
@Resource
private TjService tjService;
/**
* 根据组织机构统计装备的报表数据（外层数据）
*/
@PostMapping("/TjOrgEqs")
@ApiOperation("/装备统计报表")
public ApiRes<FinalTjOrgEqsDto> TjOrgEqs(@RequestBody TjOrgEqsReq req){
return ApiRes.success(tjService.TjOrgEqs(req));
}
//装备统计报表（点击+后里面的数据）
@PostMapping("/TjOrgEqsDetail")
@ApiOperation("/根据添加查询组织机构下的装备统计")
public ApiRes<List<InventorySumDto>> TjOrgEqsDetail(@RequestBody TjOrgEqsReq req){
return ApiRes.success(tjService.TjOrgEqsDetail(req));
}
//财务统计报表
@PostMapping("/TjOrgPrice")
@ApiOperation("/财务统计报表")
public ApiRes<FinalTjOrgPriceDto> TjOrgPrice(@RequestBody TjOrgPriceReq req){
return ApiRes.success(tjService.TjOrgPrice(req));
}
//财务统计报表（点击+后里面的数据）
@PostMapping("/TjOrgPriceDetail")
@ApiOperation("/根据添加查询组织机构下的财务统计")
public ApiRes<List<TjOrgPriceDto>> TjOrgPriceDetail(@RequestBody TjOrgPriceReq req){
return ApiRes.success(tjService.TjOrgPriceDetail(req));
}
@PostMapping("test")
public ApiRes<List<TjOrgEqsDto>> test(@RequestBody InventoryReq req){
return ApiRes.success(tjService.test(req));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/doc/ProductBatchDoc.java deleted 100644 → 0
package com.junmp.jyzb.doc;
import com.junmp.jyzb.api.bean.dto.ProductBatchDto;
import com.junmp.jyzb.api.bean.dto.ProductProcessDto;
import com.junmp.jyzb.api.bean.query.ProductBatchReq;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/**
* <pre>
*
* 描述：
* 版本：1.0.0
* 日期：2022/8/1 18:12
* 作者：ningzp@junmp.com.cn
* <br>修改记录
* <br>修改日期 修改人 修改内容
*
* </pre>
*/
@Api(value = "生产管理", tags = "生产管理接口")
public interface ProductBatchDoc {
/**
* 生产标签
*
* @param req
*/
@ApiOperation(value = "生产初始化", tags = "生产管理接口")
ApiRes<Boolean> makeProduct(ProductBatchReq req);
/**
* 新增批次信息
*/
@ApiOperation(value = "新增批次信息", tags = "生产管理接口")
ApiRes<Boolean> addProductBatch(ProductBatchReq req);
/**
* 更新批次信息
*/
@ApiOperation(value = "更新批次信息", tags = "生产管理接口")
ApiRes<Boolean> editProductBatch(ProductBatchReq req);
/**
* 删除批次信息
*/
@ApiOperation(value = "删除批次信息", tags = "生产管理接口")
ApiRes<Boolean> delBatch(ProductBatchReq req);
/**
* 分页批次信息
*/
@ApiOperation(value = "分页批次信息", tags = "生产管理接口")
ApiRes<PageResult<ProductBatchDto>> getPage(ProductBatchReq req);
/**
* 分页批次信息
*/
@ApiOperation(value = "分页批次进度信息", tags = "生产管理接口")
ApiRes<PageResult<ProductProcessDto>> getProcessPage(ProductBatchReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/doc/ProductDoc.java deleted 100644 → 0
package com.junmp.jyzb.doc;
import com.junmp.jyzb.api.bean.query.ProductReq;
import com.junmp.jyzb.entity.Product;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.List;
/**
* <pre>
*
* 描述：
* 版本：1.0.0
* 日期：2022/8/1 16:25
* 作者：ningzp@junmp.com.cn
* <br>修改记录
* <br>修改日期 修改人 修改内容
*
* </pre>
*/
@Api(value = "产品管理", tags = "产品管理接口")
public interface ProductDoc {
/**
* 新增产品
*/
@ApiOperation(value = "新增产品", tags = "产品管理接口")
ApiRes<Boolean> addProduct(ProductReq req);
/**
* 更新产品
*/
@ApiOperation(value = "更新产品", tags = "产品管理接口")
ApiRes<Boolean> editProduct(ProductReq req);
/**
* 获取所有产品
*/
@ApiOperation(value = "获取所有产品", tags = "产品管理接口")
ApiRes<List<Product>> list(ProductReq req);
/**
* 删除产品
*/
@ApiOperation(value = "删除产品",tags = "产品管理接口")
ApiRes<Boolean> delProduct(ProductReq req);
/**
* 分页产品信息
*/
@ApiOperation(value = "分页产品信息", tags = "产品管理接口")
ApiRes<PageResult<Product>> page(ProductReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/doc/ProductSkuDoc.java deleted 100644 → 0
package com.junmp.jyzb.doc;
import com.junmp.jyzb.api.bean.query.ProductSkuReq;
import com.junmp.jyzb.api.bean.vo.ProductSkuVo;
import com.junmp.jyzb.entity.ProductSku;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.List;
/**
* <pre>
*
* 描述：
* 版本：1.0.0
* 日期：2022/8/1 18:00
* 作者：ningzp@junmp.com.cn
* <br>修改记录
* <br>修改日期 修改人 修改内容
*
* </pre>
*/
@Api(value = "号型管理", tags = "产品号型接口")
public interface ProductSkuDoc {
/**
* 新增产品号型
*
* @param req
*/
@ApiOperation(value = "新增产品号型", tags = "产品号型接口")
ApiRes<Boolean> addProductSku(ProductSkuReq req);
/**
* 新增产品号型
*
* @param req
*/
@ApiOperation(value = "编辑号型", tags = "产品号型接口")
ApiRes<Boolean> editProductSku(ProductSkuReq req);
/**
* 新增产品号型
*
* @param req
*/
@ApiOperation(value = "删除号型", tags = "产品号型接口")
ApiRes<Boolean> del(ProductSkuReq req);
/**
* 新增产品号型
*
* @param req
*/
@ApiOperation(value = "分页产品信息", tags = "产品号型接口")
ApiRes<PageResult<ProductSku>> page(ProductSkuReq req);
/**
* 获取指定产品号型列表
*/
@ApiOperation(value = "获取指定产品号型列表", tags = "产品号型接口")
ApiRes<List<ProductSkuVo>> listByProduct(ProductSkuReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/doc/ProductTagDoc.java deleted 100644 → 0
package com.junmp.jyzb.doc;
import com.junmp.jyzb.api.bean.query.ProductTagReq;
import com.junmp.jyzb.api.bean.vo.TagInfoVo;
import com.junmp.jyzb.entity.ProductTag;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/**
* <pre>
*
* 描述：
* 版本：1.0.0
* 日期：2022/8/1 18:10
* 作者：ningzp@junmp.com.cn
* <br>修改记录
* <br>修改日期 修改人 修改内容
*
* </pre>
*/
@Api(value = "生产管理", tags = "生产管理接口")
public interface ProductTagDoc {
@ApiOperation(value = "更新产品UID", tags = "生产管理接口")
ApiRes<TagInfoVo> updateUid(ProductTagReq req);
@ApiOperation(value = "更新产品内容", tags = "生产管理接口")
ApiRes<TagInfoVo> updateContent(ProductTagReq req);
@ApiOperation(value = "产品复检", tags = "生产管理接口")
ApiRes<Boolean> checkTag(ProductTagReq req);
@ApiOperation(value = "分页接口", tags = "生产管理接口")
ApiRes<PageResult<ProductTag>> getPage(ProductTagReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/document/ProductDocument.java 0 → 100644
package com.junmp.jyzb.document;
import org.springframework.data.annotation.Id;
import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.Mapping;
import java.io.Serializable;
import java.util.Date;
@Document(indexName = "orders")
@Mapping(mappingPath = "productIndex.json") // 解决IK分词不能使用问题
public class ProductDocument implements Serializable {
@Id
private String id;
//@Field(analyzer = "ik_max_word",searchAnalyzer = "ik_max_word")
private String productName;
//@Field(analyzer = "ik_max_word",searchAnalyzer = "ik_max_word")
private String productDesc;
private Date createTime;
private Date updateTime;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getProductDesc() {
return productDesc;
}
public void setProductDesc(String productDesc) {
this.productDesc = productDesc;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/document/ProductDocumentBuilder.java 0 → 100644
package com.junmp.jyzb.document;
import java.util.Date;
public class ProductDocumentBuilder {
private static ProductDocument productDocument;
// create start
public static ProductDocumentBuilder create(){
productDocument = new ProductDocument();
return new ProductDocumentBuilder();
}
public ProductDocumentBuilder addId(String id) {
productDocument.setId(id);
return this;
}
public ProductDocumentBuilder addProductName(String productName) {
productDocument.setProductName(productName);
return this;
}
public ProductDocumentBuilder addProductDesc(String productDesc) {
productDocument.setProductDesc(productDesc);
return this;
}
public ProductDocumentBuilder addCreateTime(Date createTime) {
productDocument.setCreateTime(createTime);
return this;
}
public ProductDocumentBuilder addUpdateTime(Date updateTime) {
productDocument.setUpdateTime(updateTime);
return this;
}
public ProductDocument builder() {
return productDocument;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/entity/BusForm.java
......@@ -148,7 +148,7 @@ public class BusForm implements Serializable {
* 调拨类型（2支拨，1价拨）
*/
@TableField(value = "allocate_type")
private Integer allocateType;
private String allocateType;
/**
* 备注
......@@ -156,18 +156,28 @@ public class BusForm implements Serializable {
private String note;
/**
* 供应商id
* 厂商id
*/
@TableField(value = "supplier_id")
private String supplierId;
/**
* 供应商名称
* 厂商名称
*/
@TableField(value = "supplier_name")
private String supplierName;
/**
* 厂商类型（0为供应商，1为生产厂商，2为维修单位，3为销毁单位）
*/
@TableField(value = "agency_type")
private Integer agencyType;
/**
* 装备类别拼接
*/
@TableField(value = "inv_list")
private String invList;
/**
* 仓库id
*/
@TableField(value = "warehouse_id")
......@@ -204,29 +214,22 @@ public class BusForm implements Serializable {
private String updateUser;
/**
* 报废类型（1报废出库，2移入报废区）
* 报废销毁类型（1销毁出库，2移入报废区）
*/
private Integer type;
/**
* 维修单位id
*/
@TableField(value = "repair_id")
private String repairId;
/**
* 维修单位名称
*/
@TableField(value = "repair_name")
private String repairName;
/**
* 销毁、报废单位id
* 审核人信息
*/
@TableField(value = "destory_id")
private String destoryId;
@TableField(value = "current_assign")
private String currentAssign;
/**
* 销毁、报废单位名称
* 单据使用次数（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
*/
@TableField(value = "destory_name")
private String destoryName;
@TableField(value = "use_count")
private String useCount;
private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/ES/Blog.java 0 → 100644
package com.junmp.jyzb.entity.ES;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.data.annotation.Id;
import org.springframework.data.elasticsearch.annotations.DateFormat;
import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
import java.util.Date;
@Data
@Document(indexName = "blog", shards = 1, replicas = 1)
public class Blog {
//此项作为id，不会写到_source里边。
@Id
private Long blogId;
@Field(type = FieldType.Text)
private String title;
@Field(type = FieldType.Text)
private String content;
@Field(type = FieldType.Text)
private String author;
//博客所属分类。
@Field(type = FieldType.Keyword)
private String category;
//0: 未发布（草稿） 1：已发布 2：已删除
@Field(type = FieldType.Integer)
private int status;
//序列号，用于给外部展示的id
@Field(type = FieldType.Keyword)
private String serialNum;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS")
@Field(type= FieldType.Date, format= DateFormat.custom, pattern="yyyy-MM-dd HH:mm:ss.SSS")
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS")
@Field(type=FieldType.Date, format=DateFormat.custom, pattern="yyyy-MM-dd HH:mm:ss.SSS")
private Date updateTime;
}
jyzb-biz/src/main/java/com/junmp/jyzb/entity/EquipmentSize.java
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -9,18 +10,23 @@ import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.data.annotation.Id;
import org.springframework.data.elasticsearch.annotations.Document;
@ApiModel(value = "com-junmp-jyzb-domain-EquipmentSize")
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_equipment_size")
@Document(indexName = "size_pinyin")
@JsonIgnoreProperties(ignoreUnknown = true)
public class EquipmentSize implements Serializable {
/**
* 装备号型ID
*/
@ApiModelProperty(value = "装备号型ID")
@TableField("id")
@Id
private String id;
/**
......@@ -79,6 +85,7 @@ public class EquipmentSize implements Serializable {
@TableField("epc_type")
private Integer epcType;
//图片
private String photo;
/**
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论