Skip to content

J
jyzb_platformV2
Commit d8aa6021 by 李小惠
Options

将domain包中的实体类重写放入entity包下，domain中重写的实体类删除。

parent c39fc72c
正在显示 包含 339 行增加 和 384 行删除
.gitignore
...@@ -50,3 +50,9 @@ Thumbs.db ...@@ -50,3 +50,9 @@ Thumbs.db
/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java.orig /jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java.orig
/jyzb-boot/pom.xml.orig /jyzb-boot/pom.xml.orig
/jyzb-mq/jyzb-mq-consumer/src/main/java/com/junmp/jyzb/config/DirectReceiver.java.orig /jyzb-mq/jyzb-mq-consumer/src/main/java/com/junmp/jyzb/config/DirectReceiver.java.orig
/jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController111.java
/jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController111.java
/jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController111.java
/jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController111.java
/jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController111.java
/jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController111.java
jyzb-biz/src/main/java/com/junmp/jyzb/beanReq/CabinetReq.java
package com.junmp.jyzb.beanReq; package com.junmp.jyzb.beanReq;
import com.junmp.jyzb.domain.CabinetBox; import com.junmp.jyzb.entity.CabinetBox;
import com.junmp.v2.common.bean.request.BaseRequest; import com.junmp.v2.common.bean.request.BaseRequest;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController111.java
//package com.junmp.jyzb.controller; //package com.junmp.jyzb.controller;
// //
//import com.junmp.jyzb.api.bean.req.ProductReq;
//import com.junmp.jyzb.beanReq.CabinetReq; //import com.junmp.jyzb.beanReq.CabinetReq;
//import com.junmp.jyzb.doc.CabinetDoc; //import com.junmp.jyzb.doc.CabinetDoc;
//import com.junmp.jyzb.domain.Cabinet; //import com.junmp.jyzb.entity.Cabinet;
//import com.junmp.jyzb.domain.PoliceFinger;
//import com.junmp.jyzb.service.CabinetService; //import com.junmp.jyzb.service.CabinetService;
//import com.junmp.v2.common.bean.request.ValidationApi; //import com.junmp.v2.common.bean.request.ValidationApi;
//import com.junmp.v2.common.bean.response.ApiRes; //import com.junmp.v2.common.bean.response.ApiRes;
......
jyzb-biz/src/main/java/com/junmp/jyzb/domain/EquipmentType.java deleted 100644 → 0
package com.junmp.jyzb.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-EquipmentType")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class EquipmentType implements Serializable {
/**
* 装备类型ID
*/
@ApiModelProperty(value = "装备类型ID")
private String id;
/**
* 类型名称
*/
@ApiModelProperty(value = "类型名称")
private String name;
/**
* 单位
*/
@ApiModelProperty(value = "单位")
private String unit;
/**
* 单位类型
*/
@ApiModelProperty(value = "单位类型")
private String unitType;
/**
* 装备Code码
*/
@ApiModelProperty(value = "装备Code码")
private String code;
/**
* 上级id
*/
@ApiModelProperty(value = "上级id")
private String parentId;
/**
* 上级ids
*/
@ApiModelProperty(value = "上级id")
private String parentIds;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 最后更新时间
*/
@ApiModelProperty(value = "最后更新时间")
private Date updateTime;
/**
* 当前状态:0关闭/1启用
*/
@ApiModelProperty(value = "当前状态:0关闭/1启用")
private Integer state;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String note;
/**
* 类型，0类别，1装备
*/
@ApiModelProperty(value = "类型，0类别，1装备")
private Integer type;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/Inventory.java deleted 100644 → 0
package com.junmp.jyzb.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-Inventory")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class Inventory implements Serializable {
/**
* 装备ID
*/
@ApiModelProperty(value = "装备ID")
private String id;
/**
* 装备包ID
*/
@ApiModelProperty(value = "装备包ID")
private String packageId;
/**
* 装备类型ID
*/
@ApiModelProperty(value = "装备类型ID")
private String typeId;
/**
* 装备类型名称
*/
@ApiModelProperty(value = "装备类型名称")
private String typeName;
/**
* 号型ID
*/
@ApiModelProperty(value = "号型ID")
private String sizeId;
/**
* 供应商ID
*/
@ApiModelProperty(value = "供应商ID")
private String supplierId;
/**
* 供应商名称
*/
@ApiModelProperty(value = "供应商名称")
private String supplierName;
/**
* 货架ID
*/
@ApiModelProperty(value = "货架ID")
private String shelfId;
/**
* 区域信息
*/
@ApiModelProperty(value = "区域信息")
private String locationArea;
/**
* 位置信息
*/
@ApiModelProperty(value = "位置信息")
private String positionMsg;
/**
* EPC信息
*/
@ApiModelProperty(value = "EPC信息")
private String epc;
/**
* 组织机构ID
*/
@ApiModelProperty(value = "组织机构ID")
private String orgId;
/**
* 组织机构名称
*/
@ApiModelProperty(value = "组织机构名称")
private String orgName;
/**
* 状态:0正常/1损坏/2报废/3销毁
*/
@ApiModelProperty(value = "状态:0正常/1损坏/2报废/3销毁")
private Integer state;
/**
* 业务状态:0无业务,1调拨/借用/领用
*/
@ApiModelProperty(value = "业务状态:0无业务,1调拨/借用/领用")
private Integer bussinessState;
/**
* 在库状态:0在库，1出库
*/
@ApiModelProperty(value = "在库状态:0在库，1出库")
private Integer locationState;
/**
* 生产日期
*/
@ApiModelProperty(value = "生产日期")
private Date productionDate;
/**
* 质保期
*/
@ApiModelProperty(value = "质保期")
private Integer warrantyPeriod;
/**
* 维保期
*/
@ApiModelProperty(value = "维保期")
private Integer maintenancePeriod;
/**
* 维修次数
*/
@ApiModelProperty(value = "维修次数")
private Integer fixCount;
/**
* 价格
*/
@ApiModelProperty(value = "价格")
private String price;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String note;
/**
* 箱门id
*/
@ApiModelProperty(value = "箱门id")
private String locationId;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/Policeman.java
package com.junmp.jyzb.domain; package com.junmp.jyzb.domain;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleCreateTableStatement; import com.junmp.jyzb.entity.Cabinet;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable; import java.io.Serializable;
......
jyzb-biz/src/main/java/com/junmp/jyzb/domain/Cabinet.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/Cabinet.java
package com.junmp.jyzb.domain; package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -27,14 +29,8 @@ public class Cabinet implements Serializable { ...@@ -27,14 +29,8 @@ public class Cabinet implements Serializable {
* 单警柜编号 * 单警柜编号
*/ */
@ApiModelProperty(value = "单警柜编号") @ApiModelProperty(value = "单警柜编号")
@TableField("cabinet_num")
private String cabinetNum; private String cabinetNum;
/**
* 箱数
*/
@ApiModelProperty(value = "箱数")
private Integer num;
/** /**
* 单警柜名称 * 单警柜名称
*/ */
...@@ -42,12 +38,20 @@ public class Cabinet implements Serializable { ...@@ -42,12 +38,20 @@ public class Cabinet implements Serializable {
private String name; private String name;
/** /**
* 组织机构号 * 新版本组织机构号
*/ */
@ApiModelProperty(value = "组织机构号") @ApiModelProperty(value = "新版本组织机构号")
private String orgId; @TableField("org_id_int")
private long orgId;
/** /**
* 部门id
*/
@ApiModelProperty(value = "部门id")
@TableField("department_id")
private Integer departmentId;
/**
* 位置信息 * 位置信息
*/ */
@ApiModelProperty(value = "位置信息") @ApiModelProperty(value = "位置信息")
...@@ -60,24 +64,67 @@ public class Cabinet implements Serializable { ...@@ -60,24 +64,67 @@ public class Cabinet implements Serializable {
private Integer state; private Integer state;
/** /**
* 装备总数
*/
@ApiModelProperty(value = "装备总数")
private Integer sum;
/**
* 在库装备总数
*/
@ApiModelProperty(value = "在库装备总数")
@TableField("in_sum")
private Integer inSum;
/**
* 出库装备总数
*/
@ApiModelProperty(value = "出库装备总数")
@TableField("out_sum")
private Integer outSum;
/**
* 库存总价
*/
@ApiModelProperty(value = "库存总价")
@TableField("price_total")
private BigDecimal priceTotal;
/**
* 创建时间 * 创建时间
*/ */
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@TableField("create_time")
private Date createTime; private Date createTime;
/** /**
* 更新时间 * 更新时间
*/ */
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
@TableField("update_time")
private Date updateTime; private Date updateTime;
/** /**
* 新增人员
*/
@ApiModelProperty(value = "新增人员")
@TableField("create_user")
private String createUser;
/**
* 更新人员 * 更新人员
*/ */
@ApiModelProperty(value = "更新人员") @ApiModelProperty(value = "更新人员")
@TableField("update_user")
private String updateUser; private String updateUser;
/** /**
* 箱数
*/
@ApiModelProperty(value = "箱数")
private Integer num;
/**
* 单警柜与箱门一对多关系 * 单警柜与箱门一对多关系
*/ */
private List<CabinetBox> list; private List<CabinetBox> list;
......
jyzb-biz/src/main/java/com/junmp/jyzb/domain/CabinetBox.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/CabinetBox.java
package com.junmp.jyzb.domain; package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable; import java.io.Serializable;
...@@ -11,6 +13,7 @@ import lombok.NoArgsConstructor; ...@@ -11,6 +13,7 @@ import lombok.NoArgsConstructor;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@TableName("base_cabinet_box")
public class CabinetBox implements Serializable { public class CabinetBox implements Serializable {
/** /**
* 主键ID * 主键ID
...@@ -22,19 +25,14 @@ public class CabinetBox implements Serializable { ...@@ -22,19 +25,14 @@ public class CabinetBox implements Serializable {
* 主柜ID * 主柜ID
*/ */
@ApiModelProperty(value = "主柜ID") @ApiModelProperty(value = "主柜ID")
@TableField("cabinet_id")
private String cabinetId; private String cabinetId;
/** /**
* 警员ID * 箱号
*/ */
@ApiModelProperty(value = "警员ID") @ApiModelProperty(value = "箱号")
private String policeId; private Integer num;
/**
* 警员姓名
*/
@ApiModelProperty(value = "警员姓名")
private String policeName;
/** /**
* 异常状态:1正常/0异常 * 异常状态:1正常/0异常
...@@ -46,12 +44,14 @@ public class CabinetBox implements Serializable { ...@@ -46,12 +44,14 @@ public class CabinetBox implements Serializable {
* 异常原因 * 异常原因
*/ */
@ApiModelProperty(value = "异常原因") @ApiModelProperty(value = "异常原因")
@TableField("error_msg")
private String errorMsg; private String errorMsg;
/** /**
* 使用日志存储位置信息 * 使用日志存储位置信息
*/ */
@ApiModelProperty(value = "使用日志存储位置信息") @ApiModelProperty(value = "使用日志存储位置信息")
@TableField("log_map")
private String logMap; private String logMap;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/domain/EquipmentSize.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/EquipmentSize.java
package com.junmp.jyzb.domain; package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
...@@ -12,6 +15,7 @@ import lombok.NoArgsConstructor; ...@@ -12,6 +15,7 @@ import lombok.NoArgsConstructor;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@TableName("base_equipment_size")
public class EquipmentSize implements Serializable { public class EquipmentSize implements Serializable {
/** /**
* 装备号型ID * 装备号型ID
...@@ -23,13 +27,9 @@ public class EquipmentSize implements Serializable { ...@@ -23,13 +27,9 @@ public class EquipmentSize implements Serializable {
* 装备类型ID * 装备类型ID
*/ */
@ApiModelProperty(value = "装备类型ID") @ApiModelProperty(value = "装备类型ID")
@TableField("type_id")
private String typeId; private String typeId;
/**
* 信息关联ID
*/
@ApiModelProperty(value = "信息关联ID")
private String detailId;
/** /**
* 号型码 * 号型码
...@@ -47,12 +47,14 @@ public class EquipmentSize implements Serializable { ...@@ -47,12 +47,14 @@ public class EquipmentSize implements Serializable {
* 创建时间 * 创建时间
*/ */
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@TableField("create_time")
private Date createTime; private Date createTime;
/** /**
* 更新时间 * 更新时间
*/ */
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
@TableField("update_time")
private Date updateTime; private Date updateTime;
/** /**
...@@ -65,7 +67,7 @@ public class EquipmentSize implements Serializable { ...@@ -65,7 +67,7 @@ public class EquipmentSize implements Serializable {
* 价格 * 价格
*/ */
@ApiModelProperty(value = "价格") @ApiModelProperty(value = "价格")
private Double price; private BigDecimal price;
/** /**
* 当前状态：0关闭/1启用 * 当前状态：0关闭/1启用
...@@ -77,6 +79,7 @@ public class EquipmentSize implements Serializable { ...@@ -77,6 +79,7 @@ public class EquipmentSize implements Serializable {
* EPC类型 * EPC类型
*/ */
@ApiModelProperty(value = "EPC类型") @ApiModelProperty(value = "EPC类型")
@TableField("epc_type")
private Integer epcType; private Integer epcType;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/EquipmentType.java
package com.junmp.jyzb.entity; package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-EquipmentType")
@Data @Data
@TableName("base_inventory") @AllArgsConstructor
@NoArgsConstructor
@TableName("base_equipment_type")
public class EquipmentType implements Serializable { public class EquipmentType implements Serializable {
/** /**
* 装备类型ID * 装备类型ID
*/ */
@ApiModelProperty(value = "装备类型ID")
private String id; private String id;
/** /**
* 类型名称 * 类型名称
*/ */
@ApiModelProperty(value = "类型名称")
private String name; private String name;
/** /**
* 单位 * 单位
*/ */
@ApiModelProperty(value = "单位")
private String unit; private String unit;
/** /**
* 单位类型 * 单位类型
*/ */
@TableField(value = "unit_type") @ApiModelProperty(value = "单位类型")
@TableField("unit_type")
private String unitType; private String unitType;
/** /**
* 装备Code码 * 装备Code码
*/ */
@ApiModelProperty(value = "装备Code码")
private String code; private String code;
/** /**
* 上级id * 上级id
*/ */
@TableField(value = "parent_id") @ApiModelProperty(value = "上级id")
@TableField("parent_id")
private String parentId; private String parentId;
/** /**
* 上级ids * 上级ids
*/ */
@TableField(value = "parent_ids")
@ApiModelProperty(value = "上级id") @ApiModelProperty(value = "上级id")
@TableField("parent_ids")
private String parentIds; private String parentIds;
/** /**
* 创建时间 * 创建时间
*/ */
@TableField(value = "create_time", fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间")
@TableField("create_time")
private Date createTime; private Date createTime;
/** /**
* 更新时间 * 最后更新时间
*/ */
@TableField(value = "update_time", fill = FieldFill.UPDATE) @ApiModelProperty(value = "最后更新时间")
@TableField("update_time")
private Date updateTime; private Date updateTime;
/** /**
* 当前状态:0关闭/1启用 * 当前状态:0关闭/1启用
*/ */
...@@ -78,6 +88,12 @@ public class EquipmentType implements Serializable { ...@@ -78,6 +88,12 @@ public class EquipmentType implements Serializable {
private String note; private String note;
/** /**
* 原id
*/
@ApiModelProperty(value = "原id")
private String guid;
/**
* 类型，0类别，1装备 * 类型，0类别，1装备
*/ */
@ApiModelProperty(value = "类型，0类别，1装备") @ApiModelProperty(value = "类型，0类别，1装备")
......
jyzb-biz/src/main/java/com/junmp/jyzb/domain/History.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/History.java
package com.junmp.jyzb.domain; package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable; import java.io.Serializable;
...@@ -12,6 +14,7 @@ import lombok.NoArgsConstructor; ...@@ -12,6 +14,7 @@ import lombok.NoArgsConstructor;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@TableName("base_history")
public class History implements Serializable { public class History implements Serializable {
/** /**
* 历史记录id * 历史记录id
...@@ -23,30 +26,35 @@ public class History implements Serializable { ...@@ -23,30 +26,35 @@ public class History implements Serializable {
* 装备类型id * 装备类型id
*/ */
@ApiModelProperty(value = "装备类型id") @ApiModelProperty(value = "装备类型id")
@TableField("equipmen_id")
private String equipmentId; private String equipmentId;
/** /**
* 组织机构id * 组织机构id
*/ */
@ApiModelProperty(value = "组织机构id") @ApiModelProperty(value = "组织机构id")
@TableField("organization_id")
private String organizationId; private String organizationId;
/** /**
* 要查询的时间 * 要查询的时间
*/ */
@ApiModelProperty(value = "要查询的时间") @ApiModelProperty(value = "要查询的时间")
@TableField("search_date")
private Date searchDate; private Date searchDate;
/** /**
* 当月使用次数 * 当月使用次数
*/ */
@ApiModelProperty(value = "当月使用次数") @ApiModelProperty(value = "当月使用次数")
@TableField("use_month")
private Integer useMonth; private Integer useMonth;
/** /**
* 当月维修次数 * 当月维修次数
*/ */
@ApiModelProperty(value = "当月维修次数") @ApiModelProperty(value = "当月维修次数")
@TableField("fix_month")
private Integer fixMonth; private Integer fixMonth;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/Inventory.java
...@@ -57,7 +57,7 @@ public class Inventory implements Serializable { ...@@ -57,7 +57,7 @@ public class Inventory implements Serializable {
private String shelfLocation; private String shelfLocation;
/** /**
* 货架位置 * 货架id
*/ */
@TableField("shelf_id") @TableField("shelf_id")
private String shelfId; private String shelfId;
...@@ -71,7 +71,7 @@ public class Inventory implements Serializable { ...@@ -71,7 +71,7 @@ public class Inventory implements Serializable {
* 组织机构ID * 组织机构ID
*/ */
@TableField("org_id_int") @TableField("org_id_int")
private String orgId; private long orgId;
/** /**
* 规格尺寸 * 规格尺寸
...@@ -100,25 +100,25 @@ public class Inventory implements Serializable { ...@@ -100,25 +100,25 @@ public class Inventory implements Serializable {
* 质保期 * 质保期
*/ */
@TableField("warranty_period") @TableField("warranty_period")
private int warrantyPeriod; private Integer warrantyPeriod;
/** /**
* 维保期 * 维保期
*/ */
@TableField("maintenance_period") @TableField("maintenance_period")
private int maintenancePeriod; private Integer maintenancePeriod;
/** /**
* 维修次数 * 维修次数
*/ */
@TableField("fix_count") @TableField("fix_count")
private int fixCount; private Integer fixCount;
/** /**
* 位置类型 * 位置类型
*/ */
@TableField(value = "location_type") @TableField(value = "location_type")
private String locationType; private Integer locationType;
/** /**
* 位置ID * 位置ID
...@@ -130,7 +130,7 @@ public class Inventory implements Serializable { ...@@ -130,7 +130,7 @@ public class Inventory implements Serializable {
* 是否遗失 * 是否遗失
*/ */
@TableField(value = "lost_flag") @TableField(value = "lost_flag")
private int lostFlag ; private Integer lostFlag ;
/** /**
...@@ -162,13 +162,13 @@ public class Inventory implements Serializable { ...@@ -162,13 +162,13 @@ public class Inventory implements Serializable {
private Date updateTime; private Date updateTime;
/** /**
* 创建时间 * 更新人员
*/ */
@TableField(value = "update_user", fill = FieldFill.INSERT) @TableField(value = "update_user", fill = FieldFill.INSERT)
private String updateUser; private String updateUser;
/** /**
* 更新时间 * 创建人员
*/ */
@TableField(value = "create_user", fill = FieldFill.UPDATE) @TableField(value = "create_user", fill = FieldFill.UPDATE)
private String createUser; private String createUser;
......
jyzb-biz/src/main/java/com/junmp/jyzb/domain/InventorySummary.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/InventorySummary.java
package com.junmp.jyzb.domain; package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable; import java.io.Serializable;
...@@ -13,6 +15,7 @@ import lombok.NoArgsConstructor; ...@@ -13,6 +15,7 @@ import lombok.NoArgsConstructor;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@TableName("base_inventory_summary")
public class InventorySummary implements Serializable { public class InventorySummary implements Serializable {
/** /**
* 装备汇总id * 装备汇总id
...@@ -24,66 +27,77 @@ public class InventorySummary implements Serializable { ...@@ -24,66 +27,77 @@ public class InventorySummary implements Serializable {
* 组织机构id * 组织机构id
*/ */
@ApiModelProperty(value = "组织机构id") @ApiModelProperty(value = "组织机构id")
@TableField("org_id")
private String orgId; private String orgId;
/** /**
* 组织机构名称 * 组织机构名称
*/ */
@ApiModelProperty(value = "组织机构名称") @ApiModelProperty(value = "组织机构名称")
@TableField("org_name")
private String orgName; private String orgName;
/** /**
* 装备类型id * 装备类型id
*/ */
@ApiModelProperty(value = "装备类型id") @ApiModelProperty(value = "装备类型id")
@TableField("type_id")
private String typeId; private String typeId;
/** /**
* 类型名称 * 类型名称
*/ */
@ApiModelProperty(value = "类型名称") @ApiModelProperty(value = "类型名称")
@TableField("type_name")
private String typeName; private String typeName;
/** /**
* 装备号型id * 装备号型id
*/ */
@ApiModelProperty(value = "装备号型id") @ApiModelProperty(value = "装备号型id")
@TableField("size_id")
private String sizeId; private String sizeId;
/** /**
* 号型名称 * 号型名称
*/ */
@ApiModelProperty(value = "号型名称") @ApiModelProperty(value = "号型名称")
@TableField("size_name")
private String sizeName; private String sizeName;
/** /**
* 位置类型，0代表仓库，1代表单警柜 * 位置类型，0代表仓库，1代表单警柜
*/ */
@ApiModelProperty(value = "位置类型，0代表仓库，1代表单警柜") @ApiModelProperty(value = "位置类型，0代表仓库，1代表单警柜")
@TableField("location_type")
private String locationType; private String locationType;
/** /**
* 位置信息id * 位置信息id
*/ */
@ApiModelProperty(value = "位置信息id") @ApiModelProperty(value = "位置信息id")
@TableField("location_id")
private String locationId; private String locationId;
/** /**
* 位置名称 * 位置名称
*/ */
@ApiModelProperty(value = "位置名称") @ApiModelProperty(value = "位置名称")
@TableField("location_name")
private String locationName; private String locationName;
/** /**
* 区域id * 区域id
*/ */
@ApiModelProperty(value = "区域id") @ApiModelProperty(value = "区域id")
@TableField("location_area_id")
private String locationAreaId; private String locationAreaId;
/** /**
* 区域信息 * 区域信息
*/ */
@ApiModelProperty(value = "区域信息") @ApiModelProperty(value = "区域信息")
@TableField("location_area")
private String locationArea; private String locationArea;
/** /**
...@@ -102,37 +116,50 @@ public class InventorySummary implements Serializable { ...@@ -102,37 +116,50 @@ public class InventorySummary implements Serializable {
* 在库数 * 在库数
*/ */
@ApiModelProperty(value = "在库数") @ApiModelProperty(value = "在库数")
@TableField("stock_number")
private Integer stockNumber; private Integer stockNumber;
/** /**
* 出库数量 * 出库数量
*/ */
@ApiModelProperty(value = "出库数量") @ApiModelProperty(value = "出库数量")
@TableField("outbound_number")
private Integer outboundNumber; private Integer outboundNumber;
/** /**
* 销毁数量 * 销毁数量
*/ */
@ApiModelProperty(value = "销毁数量") @ApiModelProperty(value = "销毁数量")
@TableField("destruction_number")
private Integer destructionNumber; private Integer destructionNumber;
/** /**
* 过质保数量 * 过质保数量
*/ */
@ApiModelProperty(value = "过质保数量") @ApiModelProperty(value = "过质保数量")
@TableField("expire_number")
private Integer expireNumber; private Integer expireNumber;
/** /**
* 创建时间 * 创建时间
*/ */
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@TableField("create_time")
private Date createTime; private Date createTime;
/** /**
* 更新时间 * 更新时间
*/ */
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
@TableField("update_time")
private Date updateTime; private Date updateTime;
/**
* 唯一值
*/
@ApiModelProperty(value = "唯一值")
@TableField("one_id")
private String oneId;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/LogDetail.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/LogDetail.java
package com.junmp.jyzb.domain; package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
...@@ -11,6 +16,7 @@ import lombok.NoArgsConstructor; ...@@ -11,6 +16,7 @@ import lombok.NoArgsConstructor;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@TableName("base_log_detail")
public class LogDetail implements Serializable { public class LogDetail implements Serializable {
/** /**
* 出入库明细ID * 出入库明细ID
...@@ -19,15 +25,24 @@ public class LogDetail implements Serializable { ...@@ -19,15 +25,24 @@ public class LogDetail implements Serializable {
private Integer id; private Integer id;
/** /**
* 物资id
*/
@ApiModelProperty(value = "物资id")
@TableField("inverntory_id")
private String inverntoryId;
/**
* 出入库汇总ID * 出入库汇总ID
*/ */
@ApiModelProperty(value = "出入库汇总ID") @ApiModelProperty(value = "出入库汇总ID")
@TableField("summary_id")
private Integer summaryId; private Integer summaryId;
/** /**
* 单据ID * 单据ID
*/ */
@ApiModelProperty(value = "单据ID") @ApiModelProperty(value = "单据ID")
@TableField("order_main_id")
private String orderId; private String orderId;
/** /**
...@@ -40,30 +55,35 @@ public class LogDetail implements Serializable { ...@@ -40,30 +55,35 @@ public class LogDetail implements Serializable {
* 装备名称 * 装备名称
*/ */
@ApiModelProperty(value = "装备名称") @ApiModelProperty(value = "装备名称")
@TableField("equipment_name")
private String equipmentName; private String equipmentName;
/** /**
* 装备号型 * 装备号型
*/ */
@ApiModelProperty(value = "装备号型") @ApiModelProperty(value = "装备号型")
@TableField("equipment_size")
private String equipmentSize; private String equipmentSize;
/** /**
* 供应商 * 供应商
*/ */
@ApiModelProperty(value = "供应商") @ApiModelProperty(value = "供应商")
@TableField("equipment_supplier")
private String equipmentSupplier; private String equipmentSupplier;
/** /**
* 装备类型:0单件/1装备包 * 装备类型:0单件/1装备包
*/ */
@ApiModelProperty(value = "装备类型:0单件/1装备包") @ApiModelProperty(value = "装备类型:0单件/1装备包")
@TableField("equipment_type")
private Integer equipmentType; private Integer equipmentType;
/** /**
* 状态，0正常/1异常 * 状态，0正常/1异常
*/ */
@ApiModelProperty(value = "状态，0正常/1异常") @ApiModelProperty(value = "状态，0正常/1异常")
@TableField("error_state")
private Integer errorState; private Integer errorState;
/** /**
...@@ -72,5 +92,49 @@ public class LogDetail implements Serializable { ...@@ -72,5 +92,49 @@ public class LogDetail implements Serializable {
@ApiModelProperty(value = "备注信息") @ApiModelProperty(value = "备注信息")
private String note; private String note;
/**
* 业务类型
*/
@ApiModelProperty(value = "业务类型")
@TableField("bussiness_type")
private String bussinessType;
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
/**
* 更新时间
*/
@TableField(value = "update_time", fill = FieldFill.UPDATE)
private Date updateTime;
/**
* 更新人员
*/
@TableField(value = "update_user", fill = FieldFill.INSERT)
private String updateUser;
/**
* 创建人员
*/
@TableField(value = "create_user", fill = FieldFill.UPDATE)
private String createUser;
/**
* 照片信息
*/
@ApiModelProperty(value = "照片信息")
private String picture;
/**
* 作业设备：0手持机 1单警柜 2通道）
*/
@ApiModelProperty(value = "业务类型")
@TableField("device_type")
private Integer deviceType;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/LogSummary.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/LogSummary.java
package com.junmp.jyzb.domain; package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable; import java.io.Serializable;
...@@ -12,6 +15,7 @@ import lombok.NoArgsConstructor; ...@@ -12,6 +15,7 @@ import lombok.NoArgsConstructor;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@TableName("base_log_summary")
public class LogSummary implements Serializable { public class LogSummary implements Serializable {
/** /**
* 出入库汇总ID * 出入库汇总ID
...@@ -23,25 +27,36 @@ public class LogSummary implements Serializable { ...@@ -23,25 +27,36 @@ public class LogSummary implements Serializable {
* 组织机构ID * 组织机构ID
*/ */
@ApiModelProperty(value = "组织机构ID") @ApiModelProperty(value = "组织机构ID")
@TableField("error_state")
private String orgId; private String orgId;
/** /**
* 组织机构名称 * 组织机构名称
*/ */
@ApiModelProperty(value = "组织机构名称") @ApiModelProperty(value = "组织机构名称")
@TableField("error_state")
private String orgName; private String orgName;
/** /**
* 仓库ID * 单据id
*/ */
@ApiModelProperty(value = "仓库ID") @ApiModelProperty(value = "单据id")
private String warehouseId; @TableField("order_main_id")
private String orderMainId;
/** /**
* 仓库名称 * 存储ID
*/ */
@ApiModelProperty(value = "仓库名称") @ApiModelProperty(value = "存储ID")
private String warehouseName; @TableField("location_id")
private String locationId;
/**
* 存储名称：XX仓库，XX单警柜
*/
@ApiModelProperty(value = "存储名称")
@TableField("location_name")
private String locationName;
/** /**
* 设备标识 * 设备标识
...@@ -53,24 +68,34 @@ public class LogSummary implements Serializable { ...@@ -53,24 +68,34 @@ public class LogSummary implements Serializable {
* 出入设备:0手持机/1单警柜/2通道 * 出入设备:0手持机/1单警柜/2通道
*/ */
@ApiModelProperty(value = "出入设备:0手持机/1单警柜/2通道") @ApiModelProperty(value = "出入设备:0手持机/1单警柜/2通道")
@TableField("device_type")
private Integer deviceType; private Integer deviceType;
/** /**
* 操作时间 * 操作时间
*/ */
@ApiModelProperty(value = "操作时间") @ApiModelProperty(value = "操作时间")
@TableField("use_time")
private Date useTime; private Date useTime;
/** /**
* 业务类型
*/
@ApiModelProperty(value = "业务类型")
@TableField("bussiness_type")
private String bussinessType;
/**
* 操作人员姓名 * 操作人员姓名
*/ */
@ApiModelProperty(value = "操作人员姓名") @ApiModelProperty(value = "操作人员姓名")
@TableField("user_name")
private String userName; private String userName;
/** /**
* 出入库类型:0出库/1入库 * 出入库类型:0出库/1入库
*/ */
@ApiModelProperty(value = "出入库类型:0出库/1入库") @ApiModelProperty(value = "出入库类型:0出库/1入库")
@TableField("out_in_state")
private Integer outInState; private Integer outInState;
/** /**
...@@ -79,5 +104,36 @@ public class LogSummary implements Serializable { ...@@ -79,5 +104,36 @@ public class LogSummary implements Serializable {
@ApiModelProperty(value = "照片信息") @ApiModelProperty(value = "照片信息")
private String picture; private String picture;
/**
* 装备记录集合，警棍、盾牌
*/
@ApiModelProperty(value = "装备记录集合")
@TableField("equipment_List")
private String equipmentList;
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
/**
* 更新时间
*/
@TableField(value = "update_time", fill = FieldFill.UPDATE)
private Date updateTime;
/**
* 更新人员
*/
@TableField(value = "update_user", fill = FieldFill.INSERT)
private String updateUser;
/**
* 创建人员
*/
@TableField(value = "create_user", fill = FieldFill.UPDATE)
private String createUser;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/CabinetBoxMapper.java
package com.junmp.jyzb.mapper; package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.domain.CabinetBox; import com.junmp.jyzb.entity.CabinetBox;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/CabinetMapper.java
package com.junmp.jyzb.mapper; package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.domain.Cabinet; import com.junmp.jyzb.entity.Cabinet;
import com.junmp.jyzb.domain.Policeman;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentSizeMapper.java
package com.junmp.jyzb.mapper; package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.domain.EquipmentSize; import com.junmp.jyzb.entity.EquipmentSize;
import com.junmp.jyzb.domain.EquipmentType;
import com.junmp.jyzb.domain.Warehouse;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentTypeMapper.java
package com.junmp.jyzb.mapper; package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.domain.EquipmentType; import com.junmp.jyzb.entity.EquipmentType;
import com.junmp.jyzb.domain.Warehouse;
import com.junmp.jyzb.entity.ProductBatch;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/ExpireMapper.java
package com.junmp.jyzb.mapper; package com.junmp.jyzb.mapper;
import com.junmp.jyzb.domain.Inventory;
import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map; import java.util.Map;
@Mapper @Mapper
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/CabinetService.java
package com.junmp.jyzb.service; package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.jyzb.beanReq.CabinetReq; import com.junmp.jyzb.beanReq.CabinetReq;
import com.junmp.jyzb.domain.Cabinet; import com.junmp.jyzb.entity.Cabinet;
import com.junmp.jyzb.domain.PoliceFinger;
import com.junmp.jyzb.utils.ResponseResult; import com.junmp.jyzb.utils.ResponseResult;
import java.util.List; import java.util.List;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/CabinetBoxServiceImpl.java
package com.junmp.jyzb.service.impl; package com.junmp.jyzb.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.junmp.jyzb.domain.CabinetBox; import com.junmp.jyzb.entity.CabinetBox;
import com.junmp.jyzb.mapper.CabinetBoxMapper; import com.junmp.jyzb.mapper.CabinetBoxMapper;
import com.junmp.jyzb.mapper.PoliceFingerMapper;
import com.junmp.jyzb.service.CabinetBoxService; import com.junmp.jyzb.service.CabinetBoxService;
import com.junmp.jyzb.utils.HttpStatus; import com.junmp.jyzb.utils.HttpStatus;
import com.junmp.jyzb.utils.ResponseResult; import com.junmp.jyzb.utils.ResponseResult;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/CabinetServiceImpl.java
...@@ -3,12 +3,9 @@ package com.junmp.jyzb.service.impl; ...@@ -3,12 +3,9 @@ package com.junmp.jyzb.service.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.jyzb.beanReq.CabinetReq; import com.junmp.jyzb.beanReq.CabinetReq;
import com.junmp.jyzb.beanReq.PolicemanFingerReq; import com.junmp.jyzb.entity.Cabinet;
import com.junmp.jyzb.domain.Cabinet; import com.junmp.jyzb.entity.CabinetBox;
import com.junmp.jyzb.domain.CabinetBox;
import com.junmp.jyzb.domain.PoliceFinger;
import com.junmp.jyzb.mapper.*; import com.junmp.jyzb.mapper.*;
import com.junmp.jyzb.service.CabinetService; import com.junmp.jyzb.service.CabinetService;
import com.junmp.jyzb.service.PubOrgService; import com.junmp.jyzb.service.PubOrgService;
...@@ -82,7 +79,7 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl ...@@ -82,7 +79,7 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
cabinet.setName((String) msg.get("name")); cabinet.setName((String) msg.get("name"));
//cabinet.setUpdateUser((String) msg.get("updateUser")); //cabinet.setUpdateUser((String) msg.get("updateUser"));
cabinet.setLocation((String) msg.get("location")); cabinet.setLocation((String) msg.get("location"));
cabinet.setNum((Integer) msg.get("num")); cabinet.setNum((String) msg.get("num"));
cabinet.setCabinetNum(cabinetNum); cabinet.setCabinetNum(cabinetNum);
cabinetMapper.addCabinet(cabinet); cabinetMapper.addCabinet(cabinet);
/** /**
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentSizeServiceImpl.java
package com.junmp.jyzb.service.impl; package com.junmp.jyzb.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.domain.EquipmentSize; import com.junmp.jyzb.entity.EquipmentSize;
import com.junmp.jyzb.domain.EquipmentType;
import com.junmp.jyzb.mapper.EquipmentTypeMapper; import com.junmp.jyzb.mapper.EquipmentTypeMapper;
import com.junmp.jyzb.service.EquipmentSizeService; import com.junmp.jyzb.service.EquipmentSizeService;
import com.junmp.jyzb.utils.DateTimeUtil; import com.junmp.jyzb.utils.DateTimeUtil;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java
package com.junmp.jyzb.service.impl; package com.junmp.jyzb.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.domain.EquipmentType; import com.junmp.jyzb.entity.EquipmentType;
import com.junmp.jyzb.domain.PubOrg;
import com.junmp.jyzb.entity.ProductBatch;
import com.junmp.jyzb.mapper.ProductBatchMapper;
import com.junmp.jyzb.mapper.SupplierMapper; import com.junmp.jyzb.mapper.SupplierMapper;
import com.junmp.jyzb.service.EquipmentTypeService; import com.junmp.jyzb.service.EquipmentTypeService;
import com.junmp.jyzb.utils.*; import com.junmp.jyzb.utils.*;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java
...@@ -7,13 +7,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -7,13 +7,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.dto.InventoryDto; import com.junmp.jyzb.api.bean.dto.InventoryDto;
import com.junmp.jyzb.api.bean.req.InventoryReq; import com.junmp.jyzb.api.bean.req.InventoryReq;
import com.junmp.jyzb.domain.EquipmentSize;
import com.junmp.jyzb.domain.EquipmentType;
import com.junmp.jyzb.entity.Inventory; import com.junmp.jyzb.entity.Inventory;
import com.junmp.jyzb.service.CabinetService; import com.junmp.jyzb.service.CabinetService;
import com.junmp.jyzb.service.InventoryService; import com.junmp.jyzb.service.InventoryService;
import com.junmp.jyzb.service.ProductService;
import com.junmp.jyzb.service.WarehouseService; import com.junmp.jyzb.service.WarehouseService;
import com.junmp.jyzb.utils.HttpStatus; import com.junmp.jyzb.utils.HttpStatus;
import com.junmp.jyzb.utils.ResponseResult; import com.junmp.jyzb.utils.ResponseResult;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
...@@ -3,18 +3,12 @@ package com.junmp.jyzb.service.impl; ...@@ -3,18 +3,12 @@ package com.junmp.jyzb.service.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum; import com.junmp.jyzb.entity.Cabinet;
import com.junmp.jyzb.domain.Cabinet;
import com.junmp.jyzb.domain.PoliceFinger; import com.junmp.jyzb.domain.PoliceFinger;
import com.junmp.jyzb.domain.PubOrg;
import com.junmp.jyzb.entity.Product;
import com.junmp.jyzb.exception.enums.PolicemanExceptionEnum;
import com.junmp.jyzb.mapper.*; import com.junmp.jyzb.mapper.*;
import com.junmp.jyzb.service.PolicemanService; import com.junmp.jyzb.service.PolicemanService;
import com.junmp.jyzb.service.PubOrgService; import com.junmp.jyzb.service.PubOrgService;
import com.junmp.jyzb.utils.*; import com.junmp.jyzb.utils.*;
import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.util.BeanPlusUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java
package com.junmp.jyzb.service.impl; package com.junmp.jyzb.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.domain.EquipmentType;
import com.junmp.jyzb.domain.PubOrg; import com.junmp.jyzb.domain.PubOrg;
import com.junmp.jyzb.mapper.EquipmentTypeMapper;
import com.junmp.jyzb.service.EquipmentTypeService;
import com.junmp.jyzb.utils.HttpStatus; import com.junmp.jyzb.utils.HttpStatus;
import com.junmp.jyzb.utils.RedisUtils; import com.junmp.jyzb.utils.RedisUtils;
import com.junmp.jyzb.utils.ResponseResult; import com.junmp.jyzb.utils.ResponseResult;
......
jyzb-biz/src/main/resources/mapper/CabinetBoxMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.CabinetBoxMapper"> <mapper namespace="com.junmp.jyzb.mapper.CabinetBoxMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.CabinetBox"> <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.CabinetBox">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table base_cabinet_box--> <!--@Table base_cabinet_box-->
<id column="id" jdbcType="VARCHAR" property="id" /> <id column="id" jdbcType="VARCHAR" property="id" />
......
jyzb-biz/src/main/resources/mapper/CabinetMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.CabinetMapper"> <mapper namespace="com.junmp.jyzb.mapper.CabinetMapper">
<!-- <resultMap id="" type="">--> <resultMap id="BaseCabinetResultMap" type="com.junmp.jyzb.entity.Cabinet">
<id property="id" column="id" />
<!-- </resultMap>--> <result property="cabinetNum" column="cabinet_num" />
<result property="name" column="name" />
<result property="orgIdInt" column="org_id_int" />
<result property="orgId" column="org_id" />
<result property="departmentId" column="department_id" />
<result property="location" column="location" />
<result property="state" column="state" />
<result property="sum" column="sum" />
<result property="inSum" column="in_sum" />
<result property="outSum" column="out_sum" />
<result property="priceTotal" column="price_total" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="createUser" column="create_user" />
<result property="updateUser" column="update_user" />
<result property="num" column="num" />
</resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
...@@ -120,7 +136,7 @@ ...@@ -120,7 +136,7 @@
SET sum = ( SET sum = (
SELECT count(i.id) SELECT count(i.id)
FROM base_cabinet_box AS b FROM base_cabinet_box AS b
JOIN base_inventory AS i ON b.id = i.location_id JOIN base_AS i ON b.id = i.location_id
WHERE b.cabinet_id = c.id WHERE b.cabinet_id = c.id
) )
<if test="updateId != null and updateId != ''"> <if test="updateId != null and updateId != ''">
......
jyzb-biz/src/main/resources/mapper/EquipmentSizeMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.EquipmentSizeMapper"> <mapper namespace="com.junmp.jyzb.mapper.EquipmentSizeMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.EquipmentSize"> <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.EquipmentSize">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table base_equipment_size--> <!--@Table base_equipment_size-->
<id column="id" jdbcType="VARCHAR" property="id" /> <id column="id" jdbcType="VARCHAR" property="id" />
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
id, type_id, detail_id, code, `name`, create_time, update_time, note, epc_type id, type_id, detail_id, code, `name`, create_time, update_time, note, epc_type
</sql> </sql>
<insert id="addSize" parameterType="com.junmp.jyzb.domain.EquipmentSize"> <insert id="addSize" parameterType="com.junmp.jyzb.entity.EquipmentSize">
insert into base_equipment_size insert into base_equipment_size
(id,type_id,code,name,create_time,update_time,note,price,state,epc_type) (id,type_id,code,name,create_time,update_time,note,price,state,epc_type)
values values
......
jyzb-biz/src/main/resources/mapper/EquipmentTypeMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.EquipmentTypeMapper"> <mapper namespace="com.junmp.jyzb.mapper.EquipmentTypeMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.EquipmentType"> <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.EquipmentType">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table base_equipment_type--> <!--@Table base_equipment_type-->
<id column="id" jdbcType="VARCHAR" property="id" /> <id column="id" jdbcType="VARCHAR" property="id" />
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
id, `name`, code, parent_id, create_time, update_time, `state`, note id, `name`, code, parent_id, create_time, update_time, `state`, note
</sql> </sql>
<select id="selectAllEquipment" resultType="com.junmp.jyzb.domain.EquipmentType"> <select id="selectAllEquipment" resultType="com.junmp.jyzb.entity.EquipmentType">
SELECT id,name,unit,unit_type,code,parent_id,state,note,code,create_time,update_time,type SELECT id,name,unit,unit_type,code,parent_id,state,note,code,create_time,update_time,type
FROM base_equipment_type FROM base_equipment_type
where type = 0 where type = 0
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<!-- END AS update_time--> <!-- END AS update_time-->
<!-- FROM base_equipment_type--> <!-- FROM base_equipment_type-->
<insert id="addEquipment" parameterType="com.junmp.jyzb.domain.EquipmentType"> <insert id="addEquipment" parameterType="com.junmp.jyzb.entity.EquipmentType">
insert into base_equipment_type insert into base_equipment_type
(id,name,unit_type,code,parent_id,create_time,update_time,state,note) (id,name,unit_type,code,parent_id,create_time,update_time,state,note)
values values
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
where parent_id = #{parentId} where parent_id = #{parentId}
</select> </select>
<insert id="addSupplier" parameterType="com.junmp.jyzb.domain.EquipmentType"> <insert id="addSupplier" parameterType="com.junmp.jyzb.entity.EquipmentType">
INSERT INTO base_supplier_type (id,supplier_id,type_id,state,create_time,update_time) INSERT INTO base_supplier_type (id,supplier_id,type_id,state,create_time,update_time)
VALUES VALUES
<foreach collection="supplierList" item="supplier" separator=","> <foreach collection="supplierList" item="supplier" separator=",">
......
jyzb-biz/src/main/resources/mapper/ExpireMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.ExpireMapper"> <mapper namespace="com.junmp.jyzb.mapper.ExpireMapper">
<!-- <resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.Inventory">--> <!-- <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.Inventory">-->
<!-- &lt;!&ndash;@mbg.generated&ndash;&gt;--> <!-- &lt;!&ndash;@mbg.generated&ndash;&gt;-->
<!-- &lt;!&ndash;@Table base_equipment_size&ndash;&gt;--> <!-- &lt;!&ndash;@Table base_equipment_size&ndash;&gt;-->
<!-- <id column="id" jdbcType="VARCHAR" property="id" />--> <!-- <id column="id" jdbcType="VARCHAR" property="id" />-->
......
jyzb-biz/src/main/resources/mapper/HistoryMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.HistoryMapper"> <mapper namespace="com.junmp.jyzb.mapper.HistoryMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.History"> <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.History">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table base_history--> <!--@Table base_history-->
<id column="id" jdbcType="VARCHAR" property="id" /> <id column="id" jdbcType="VARCHAR" property="id" />
......
jyzb-biz/src/main/resources/mapper/InventoryMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.InventoryMapper"> <mapper namespace="com.junmp.jyzb.mapper.InventoryMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.Inventory"> <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.Inventory">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table base_inventory--> <!--@Table base_inventory-->
<id column="id" jdbcType="VARCHAR" property="id" /> <id column="id" jdbcType="VARCHAR" property="id" />
......
jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.InventorySummaryMapper"> <mapper namespace="com.junmp.jyzb.mapper.InventorySummaryMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.InventorySummary"> <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.InventorySummary">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table base_inventory_summary--> <!--@Table base_inventory_summary-->
<id column="id" jdbcType="VARCHAR" property="id" /> <id column="id" jdbcType="VARCHAR" property="id" />
......
jyzb-biz/src/main/resources/mapper/LogDetailMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.LogDetailMapper"> <mapper namespace="com.junmp.jyzb.mapper.LogDetailMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.LogDetail"> <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.LogDetail">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table base_log_detail--> <!--@Table base_log_detail-->
<id column="id" jdbcType="INTEGER" property="id" /> <id column="id" jdbcType="INTEGER" property="id" />
......
jyzb-biz/src/main/resources/mapper/LogSummaryMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.LogSummaryMapper"> <mapper namespace="com.junmp.jyzb.mapper.LogSummaryMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.LogSummary"> <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.LogSummary">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table base_log_summary--> <!--@Table base_log_summary-->
<id column="id" jdbcType="INTEGER" property="id" /> <id column="id" jdbcType="INTEGER" property="id" />
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论