Skip to content

J
jyzb_platformV2
Commit 638d755d by 李小惠
Options

Merge remote-tracking branch 'origin/develop' into develop-lxh

parents a04d50c7 a0d51399
正在显示 包含 808 行增加 和 689 行删除
.gitignore
......@@ -61,4 +61,3 @@ Thumbs.db
/jyzb-boot/pom.xml
/.idea/encodings.xml
/jyzb-api/jyzb-api.iml
/jyzb-api/jyzb-api.iml
.gitignore.orig 0 → 100644
/jyzb-process/target
/jyzb-api/target/
/jyzb-biz/target/
##ignore this file##
/target/
.classpath
.project
/.settings/
##filter databfile、sln file##
*.mdb
*.ldb
*.sln
##class file##
*.com
*.class
*.dll
*.exe
*.o
*.so
# compression file
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip
*.via
*.tmp
*.err
# OS generated files #
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
Thumbs.db
/*/target/*
/.idea/misc.xml
/.idea/jyzb_platformV2.iml
/.idea/artifacts/jyzb3.xml
/jyzb-mq/jyzb-mq-consumer/target/classes/application.yml
/jyzb-mq/jyzb-mq-producer/target/classes/application.yml
/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
/jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
/jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
/jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
/jyzb-boot/src/main/resources/application.yml
/jyzb-boot/pom.xml
/.idea/encodings.xml
<<<<<<< HEAD
/jyzb-boot/src/main/resources/application.yml
=======
/jyzb-api/jyzb-api.iml
/jyzb-api/jyzb-api.iml
>>>>>>> develop
jyzb-biz/src/main/java/com/junmp/jyzb/entity/SupplierEquipment.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentSizeDto.java
package com.junmp.jyzb.entity;
package com.junmp.jyzb.api.bean.dto;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import com.baomidou.mybatisplus.annotation.TableId;
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-SupplierEquipment")
import java.math.BigDecimal;
import java.util.Date;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_supplier_type")
public class SupplierEquipment implements Serializable {
public class EquipmentSizeDto {
/**
* 供应商产品ID
* 装备号型ID
*/
@TableField(value = "id")
private String id;
/**
* 供应商代码
* 装备类型ID
*/
@TableField(value = "supplier_id")
private String supplierId;
private String typeId;
/**
* 产品代码
* 号型码
*/
@TableField(value = "type_id")
private String typeId;
private String code;
/**
* 状态，0:启用，1:停用
* 号型名称
*/
@TableField(value = "state")
private Integer state;
private String name;
/**
* 创建时间
*/
@TableField(value = "create_time")
private Date createTime;
/**
* 最后更新时间
* 更新时间
*/
@TableField(value = "update_time")
private Date updateTime;
/**
* 更新人ID
* 备注
*/
@TableField(value = "update_user")
private String updateUser;
private String note;
/**
* 价格
*/
private BigDecimal price;
/**
* 当前状态：0关闭/1启用
*/
private Integer state;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentTreeDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class EquipmentTreeDto {
private String name;
private String code;
private Integer type;
private List<EquipmentTreeDto> child = new ArrayList<>();
public void addChild(EquipmentTreeDto child) {
this.child.add(child);
}
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentTypeDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto;
import lombok.Data;
@Data
public class EquipmentTypeDto {
private String id;
private String name;
private String unit;
private String unitType;
private Integer state;
private Integer type;
private String warrantyPeriod;
private String maintenancePeriod;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/SupplierDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.util.Date;
@Data
public class SupplierDto {
/**
* 供应商ID
*/
private String id;
/**
* 供应商名称
*/
private String name;
/**
* 供应商短码
*/
private String code;
/**
* 简称
*/
private String shortName;
/**
* 联系人
*/
private String contacts;
/**
* 联系电话
*/
private String phone;
private Date createTime;
private Date updateTime;
/**
* 创建人员
*/
private String createUser;
/**
* 更新人ID
*/
private String updateUser;
/**
* 1为启用，0为禁用
*/
private Integer state;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/CabinetBoxReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/CabinetBoxReq.java
package com.junmp.jyzb.api.bean.req;
package com.junmp.jyzb.api.bean.query;
import com.baomidou.mybatisplus.annotation.TableField;
import com.junmp.v2.common.bean.request.BaseRequest;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/CabinetReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/CabinetReq.java
package com.junmp.jyzb.api.bean.req;
package com.junmp.jyzb.api.bean.query;
import com.junmp.v2.common.bean.request.BaseRequest;
import io.swagger.annotations.ApiModelProperty;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/CompanyReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/CompanyReq.java
package com.junmp.jyzb.api.bean.req;
package com.junmp.jyzb.api.bean.query;
import com.junmp.v2.common.bean.request.BaseRequest;
import com.junmp.v2.validator.api.validators.unique.TableUniqueValue;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/InventoryReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InventoryReq.java
package com.junmp.jyzb.api.bean.req;
package com.junmp.jyzb.api.bean.query;
import cn.hutool.core.date.DateTime;
import com.junmp.v2.common.bean.request.BaseRequest;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/InventorySumReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InventorySumReq.java
package com.junmp.jyzb.api.bean.req;
package com.junmp.jyzb.api.bean.query;
import com.junmp.v2.common.bean.request.ValidationApi;
import com.junmp.v2.validator.api.validators.unique.TableUniqueValue;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/OrgUpdateReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrgUpdateReq.java
package com.junmp.jyzb.api.bean.req;
package com.junmp.jyzb.api.bean.query;
import com.junmp.v2.common.bean.request.BaseRequest;
import com.junmp.v2.common.bean.request.ValidationApi;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/PolicemanFingerReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/PolicemanFingerReq.java
package com.junmp.jyzb.api.bean.req;
package com.junmp.jyzb.api.bean.query;
import com.junmp.v2.common.bean.request.BaseRequest;
import io.swagger.annotations.ApiModelProperty;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/PolicemanReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/PolicemanReq.java
package com.junmp.jyzb.api.bean.req;
package com.junmp.jyzb.api.bean.query;
import com.baomidou.mybatisplus.annotation.TableField;
import com.junmp.v2.common.bean.request.BaseRequest;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ProcessReq/FormReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ProcessReq/FormReq.java
package com.junmp.jyzb.api.bean.req.ProcessReq;
package com.junmp.jyzb.api.bean.query.ProcessReq;
import com.junmp.v2.common.bean.request.ValidationApi;
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;
@Data
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ProcessReq/ProcessBaseReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ProcessReq/ProcessBaseReq.java
package com.junmp.jyzb.api.bean.req.ProcessReq;
package com.junmp.jyzb.api.bean.query.ProcessReq;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class ProcessBaseReq {
/**********************任务相关的参数**********************/
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ProcessReq/SuspendOrActivateDefinitionReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ProcessReq/SuspendOrActivateDefinitionReq.java
package com.junmp.jyzb.api.bean.req.ProcessReq;
package com.junmp.jyzb.api.bean.query.ProcessReq;
import com.junmp.v2.common.bean.request.ValidationApi;
import lombok.Data;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ProductBatchReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ProductBatchReq.java
package com.junmp.jyzb.api.bean.req;
package com.junmp.jyzb.api.bean.query;
import com.junmp.v2.common.bean.request.BaseRequest;
import com.junmp.v2.validator.api.validators.unique.TableUniqueValue;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ProductReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ProductReq.java
package com.junmp.jyzb.api.bean.req;
package com.junmp.jyzb.api.bean.query;
import com.junmp.v2.common.bean.request.BaseRequest;
import com.junmp.v2.validator.api.validators.unique.TableUniqueValue;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ProductSkuReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ProductSkuReq.java
package com.junmp.jyzb.api.bean.req;
package com.junmp.jyzb.api.bean.query;
import com.junmp.v2.common.bean.request.BaseRequest;
import io.swagger.annotations.ApiModelProperty;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ProductTagReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ProductTagReq.java
package com.junmp.jyzb.api.bean.req;
package com.junmp.jyzb.api.bean.query;
import com.junmp.v2.common.bean.request.BaseRequest;
import lombok.Data;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/EquipmentSizeReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryEquipmentSizeReq.java
package com.junmp.jyzb.api.bean.req;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
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.math.BigDecimal;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
public class EquipmentSizeReq extends BaseRequest {
@NotNull(message = "装备号型主键不能为空", groups = {edit.class, delete.class, detail.class})
private String id;
private String typeId;
private String code;
private String name;
private String note;
private BigDecimal price;
private Integer state;
private Integer epcType;
}
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;
import java.math.BigDecimal;
@Data
@EqualsAndHashCode(callSuper = true)
public class QueryEquipmentSizeReq extends BaseRequest {
@NotNull(message = "装备号型主键不能为空", groups = {edit.class, delete.class, detail.class})
private String id;
private String typeId;
private String code;
private String name;
private String note;
private BigDecimal price;
private Integer state;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryEquipmentTypeReq.java 0 → 100644
package com.junmp.jyzb.api.bean.query;
import com.junmp.v2.common.bean.request.BaseRequest;
import com.junmp.v2.common.bean.request.ValidationApi;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
public class QueryEquipmentTypeReq extends BaseRequest {
private String id;
private String code;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/SupplierReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QuerySupplierReq.java
package com.junmp.jyzb.api.bean.req;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.junmp.v2.common.bean.request.BaseRequest;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
public class SupplierReq extends BaseRequest {
@NotNull(message = "供应商主键不能为空", groups = {edit.class, delete.class, detail.class})
private String id;
private String name;
private String code;
private String shortName;
private String contacts;
private String phone;
private Date createTime;
private String createUser;
private Date updateTime;
private String updateUser;
private Integer state;
private List<String> supplierList;
}
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;
import java.util.Date;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
public class QuerySupplierReq extends BaseRequest {
private String name;
private String code;
private String shortName;
private Integer state;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ShelfReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ShelfReq.java
package com.junmp.jyzb.api.bean.req;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.junmp.v2.common.bean.request.BaseRequest;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
public class ShelfReq extends BaseRequest {
private String shelfId;
private Long areaId;
private String shelfName;
private String code;
private String type;
private String warehouseId;
private Integer shelfRows;
private Integer shelfColumns;
private Integer shelfRanges;
private String url;
private String sizeInfo;
}
package com.junmp.jyzb.api.bean.query;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.junmp.v2.common.bean.request.BaseRequest;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
public class ShelfReq extends BaseRequest {
private String shelfId;
private Long areaId;
private String shelfName;
private String code;
private String type;
private String warehouseId;
private Integer shelfRows;
private Integer shelfColumns;
private Integer shelfRanges;
private String url;
private String sizeInfo;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/SupplierTypeReq.java 0 → 100644
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;
import java.util.Date;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
public class SupplierTypeReq extends BaseRequest {
@NotNull(message = "供应商关联主键不能为空", groups = {edit.class, delete.class, detail.class})
private String id;
private String supplierId;
private String typeId;
private String state;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/WarehouseAreaReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/WarehouseAreaReq.java
package com.junmp.jyzb.api.bean.req;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.junmp.v2.common.bean.request.BaseRequest;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
public class WarehouseAreaReq extends BaseRequest {
@NotNull(message = "地区主键不能为空", groups = {edit.class, delete.class, detail.class})
private String id;
private String areaName;
private Long orgIdInt;
private String warehouseId;
private String photo;
private Date createTime;
private Date updateTime;
private String createUser;
private String updateUser;
}
package com.junmp.jyzb.api.bean.query;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.junmp.v2.common.bean.request.BaseRequest;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
public class WarehouseAreaReq extends BaseRequest {
@NotNull(message = "地区主键不能为空", groups = {edit.class, delete.class, detail.class})
private String id;
private String areaName;
private Long orgIdInt;
private String warehouseId;
private String photo;
private Date createTime;
private Date updateTime;
private String createUser;
private String updateUser;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/WarehouseReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/WarehouseReq.java
package com.junmp.jyzb.api.bean.req;
package com.junmp.jyzb.api.bean.query;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateEquipmentSizeReq.java 0 → 100644
package com.junmp.jyzb.api.bean.req;
import com.junmp.v2.common.bean.request.ValidationApi;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.List;
@Data
public class UpdateEquipmentSizeReq {
@NotBlank(message = "装备号型主键不能为空", groups = {ValidationApi.edit.class, ValidationApi.delete.class, ValidationApi.detail.class})
private String id;
private String typeId;
private String code;
private String name;
private String note;
private BigDecimal price;
@NotBlank(message = "状态值不能为空", groups = {ValidationApi.edit.class})
private Integer state;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateEquipmentTypeReq.java 0 → 100644
package com.junmp.jyzb.api.bean.req;
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 UpdateEquipmentTypeReq {
@NotNull(message = "装备主键不能为空", groups = {ValidationApi.edit.class, ValidationApi.delete.class, ValidationApi.detail.class})
private String id;
@NotNull(message = "状态不能为空", groups = { ValidationApi.updateStatus.class})
private String state;
private String unitType;
private String code;
private String name;
private String note;
@NotBlank(message = "上级不能为空", groups = {ValidationApi.edit.class, ValidationApi.add.class})
private String parentId;
@NotBlank(message = "上级集合不能为空", groups = {ValidationApi.edit.class, ValidationApi.add.class})
private String parentIds;
private int warrantyPeriod;
private int maintenancePeriod;
private int type;
private List<String> supplierList;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateSupplierReq.java 0 → 100644
package com.junmp.jyzb.api.bean.req;
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;
import java.util.List;
@Data
public class UpdateSupplierReq {
@NotBlank(message = "供应商主键不能为空", groups = {ValidationApi.edit.class, ValidationApi.delete.class, ValidationApi.detail.class})
private String id;
private String name;
private String code;
private String shortName;
private String contacts;
private String phone;
@NotBlank(message = "状态不能为空", groups = {ValidationApi.updateStatus.class})
private Integer state;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/EquipmentTypeExceptionEnum.java 0 → 100644
package com.junmp.jyzb.api.exception.enums;
import com.junmp.jyzb.api.constant.JYZBConstant;
import com.junmp.v2.common.constant.CommonConstant;
import com.junmp.v2.common.exception.IExceptionEnum;
import lombok.Getter;
@Getter
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, "{}");
/**
* 错误编码
*/
private final Integer code;
/**
* 提示用户信息
*/
private final String message;
EquipmentTypeExceptionEnum(Integer code, String message) {
this.code = code;
this.message = message;
}
}
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/WarehouseAreaExceptionEnum.java
......@@ -12,10 +12,6 @@ public enum WarehouseAreaExceptionEnum implements IExceptionEnum {
*/
WAREHOUSEAREA_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 12, "地区信息不存在"),
/**
* 产品信息不存在
*/
PRODUCT_SKU_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 13, "号型不存在"),
/**
* 批次信息不存在
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/package-info.java deleted 100644 → 0
/**
* <pre>
*
* 描述：
* 版本：1.0.0
* 日期：2022/8/1 13:08
* 作者：ningzp@junmp.com.cn
* <br>修改记录
* <br>修改日期 修改人 修改内容
*
* </pre>
*/
package com.junmp.jyzb.api.exception.enums;
jyzb-biz/jyzb-biz.iml
......@@ -20,6 +20,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="jyzb-api" />
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.6.3" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.20" level="project" />
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController.java
package com.junmp.jyzb.controller;
import com.junmp.jyzb.Dto.CabinetDto;
import com.junmp.jyzb.api.bean.req.CabinetBoxReq;
import com.junmp.jyzb.api.bean.req.CabinetReq;
import com.junmp.jyzb.api.bean.query.CabinetBoxReq;
import com.junmp.jyzb.api.bean.query.CabinetReq;
import com.junmp.jyzb.entity.Cabinet;
import com.junmp.jyzb.entity.CabinetBox;
import com.junmp.jyzb.service.CabinetBoxService;
import com.junmp.jyzb.service.CabinetService;
import com.junmp.jyzb.service.PoliceFingerService;
import com.junmp.jyzb.utils.HttpStatus;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.jyzb.utils.ReturnData;
import com.junmp.jyzb.utils.ReturnMsg;
import com.junmp.v2.common.bean.request.ValidationApi;
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.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.ArrayList;
import java.util.List;
import java.util.Map;
......@@ -81,7 +74,12 @@ public class CabinetController {
return returnMsg;
}
@PostMapping("/GetCabinetByOrgId")
@ApiOperation("根据组织机构获取单警柜及箱号信息")
public ResponseResult getCabinetByOrgId(@RequestBody Map<String, Object> msg){
ResponseResult returnMsg = cabinetService.getCabinetByOrgId(msg);
return returnMsg;
}
@PostMapping("/AddCabinetInfo")
@ApiOperation("添加单警柜信息（新）")
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/CompanyController.java
package com.junmp.jyzb.controller;
import cn.hutool.core.util.StrUtil;
import com.junmp.jyzb.api.bean.req.CompanyReq;
import com.junmp.jyzb.api.bean.query.CompanyReq;
import com.junmp.jyzb.doc.CompanyDoc;
import com.junmp.jyzb.entity.Company;
import com.junmp.jyzb.service.CompanyService;
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentSizeController.java
package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.req.EquipmentSizeReq;
import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.jyzb.api.bean.dto.EquipmentSizeDto;
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.service.EquipmentSizeService;
import com.junmp.jyzb.service.WarehouseService;
import com.junmp.jyzb.utils.HttpStatus;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.jyzb.utils.ReturnMsg;
import com.junmp.v2.common.bean.request.ValidationApi;
import com.junmp.v2.common.bean.response.ApiRes;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -19,9 +17,7 @@ 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.List;
import java.util.Map;
@RestController
@Slf4j
......@@ -33,13 +29,13 @@ public class EquipmentSizeController {
@PostMapping("/AddSize")
@ApiOperation("添加号型信息")
public ApiRes<Boolean> addSize(@RequestBody @Validated(EquipmentSizeReq.add.class) EquipmentSizeReq req) {
public ApiRes<Boolean> addSize(@RequestBody @Validated(ValidationApi.add.class) UpdateEquipmentSizeReq req) {
return ApiRes.success(equipmentSizeService.addSize(req));
}
@PostMapping("/DeleteSize")
@ApiOperation("删除号型信息")
public ApiRes<Boolean> deleteSize(@RequestBody @Validated(EquipmentSizeReq.delete.class)EquipmentSizeReq req) {
public ApiRes<Boolean> deleteSize(@RequestBody @Validated(ValidationApi.delete.class) UpdateEquipmentSizeReq req) {
// ResponseResult returnMsg = equipmentSizeService.deleteSize(msg);
// return returnMsg;
return ApiRes.success(equipmentSizeService.deleteSize(req));
......@@ -47,33 +43,28 @@ public class EquipmentSizeController {
@PostMapping("/GetOneSize")
@ApiOperation("查询单个号型信息")
public ApiRes<EquipmentSize> getOneSize(@RequestBody EquipmentSizeReq req) {
public ApiRes<EquipmentSize> getOneSize(@RequestBody QueryEquipmentSizeReq req) {
//ResponseResult returnMsg =
return ApiRes.success(equipmentSizeService.getOneSize(req));
}
@PostMapping("/ShowSize")
@ApiOperation("根据装备类型查询号型")
public ApiRes<List<EquipmentSize>> getAllSize(@RequestBody EquipmentSizeReq req){
public ApiRes<List<EquipmentSizeDto>> getAllSize(@RequestBody QueryEquipmentSizeReq req){
return ApiRes.success(equipmentSizeService.getAllSize(req));
}
@PostMapping("/UpdateSize")
@ApiOperation("修改号型信息")
public ApiRes<Boolean> updateSize(@RequestBody @Validated(EquipmentSizeReq.edit.class) EquipmentSizeReq req) {
public ApiRes<Boolean> updateSize(@RequestBody @Validated(ValidationApi.edit.class) UpdateEquipmentSizeReq req) {
return ApiRes.success(equipmentSizeService.updateSize(req));
}
@PostMapping("/ChangeSizeState")
@ApiOperation("禁用/启用装备号型")
public ApiRes<Boolean> changeSizeState(@RequestBody @Validated(EquipmentSizeReq.edit.class) EquipmentSizeReq req) {
public ApiRes<Boolean> changeSizeState(@RequestBody @Validated(ValidationApi.edit.class) UpdateEquipmentSizeReq req) {
return ApiRes.success(equipmentSizeService.changeSizeState(req));
}
@PostMapping("/GetSizeDevelop")
@ApiOperation("获取号型表所有信息(非树表)")
public ApiRes<EquipmentSize> getSizeDevelop() {
ResponseResult returnMsg = equipmentSizeService.getSizeDevelop();
return null;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentTypeController.java
package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.dto.EquipmentTreeDto;
import com.junmp.jyzb.api.bean.dto.EquipmentTypeDto;
import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
import com.junmp.jyzb.api.bean.req.UpdateEquipmentTypeReq;
import com.junmp.jyzb.service.EquipmentTypeService;
import com.junmp.jyzb.utils.HttpStatus;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.v2.common.bean.request.ValidationApi;
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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
......@@ -23,66 +28,42 @@ public class EquipmentTypeController {
@PostMapping("/AddEquipment")
@ApiOperation("添加物资")
public ResponseResult addEquipment(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = equipmentTypeService.addEquipment(msg);
return returnMsg;
public ApiRes<Boolean> addEquipment(@RequestBody @Validated(ValidationApi.add.class) UpdateEquipmentTypeReq req) {
return ApiRes.success(equipmentTypeService.addEquipment(req));
}
//添加装备时计算id
@PostMapping("/CalculationEquipmentId")
public ResponseResult calculationEquipmentId() {
ResponseResult returnMsg = equipmentTypeService.calculationEquipmentId();
return returnMsg;
}
@PostMapping("/DeleteEquipment")
@ApiOperation("删除装备信息")
public ResponseResult deleteEquipment(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = equipmentTypeService.deleteEquipment(msg);
return returnMsg;
public ApiRes<Boolean> deleteEquipment(@RequestBody @Validated(ValidationApi.delete.class) UpdateEquipmentTypeReq req) {
return ApiRes.success(equipmentTypeService.deleteEquipment(req));
}
@PostMapping("/ChangeEquipmentState")
@ApiOperation("禁用/启用装备类型")
public ResponseResult changeEquipmentState(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = equipmentTypeService.changeEquipmentState(msg);
return returnMsg;
public ApiRes<Boolean> changeEquipmentState(@RequestBody @Validated(ValidationApi.updateStatus.class) UpdateEquipmentTypeReq req) {
return ApiRes.success(equipmentTypeService.changeEquipmentState(req));
}
@PostMapping("/ShowEquipmentList")
@ApiOperation("查询类别列表")
public ApiRes<List<Map<String,Object>>> ShowEquipmentList() {
return ApiRes.success(equipmentTypeService.getEquipmentList());
public ApiRes<List<EquipmentTreeDto>> ShowEquipmentList(@RequestBody QueryEquipmentTypeReq req) {
return ApiRes.success(equipmentTypeService.getEquipmentList(req));
}
@PostMapping("/ShowAllEquipment")
@ApiOperation("查询整颗物资树")
public ResponseResult showAllEquipment() {
List<Map<String, Object>> equipmentList = equipmentTypeService.showAllEquipment();
// return new ResponseResult(HttpStatus.SUCCESS,"操作成功",equipmentList);
return null;
}
@PostMapping("/GetEquipmentDetail")
@ApiOperation("查询单个物资信息")
public ResponseResult getOneEquipment(@RequestBody Map<String, Object> msg) {
ResponseResult returnMsg = equipmentTypeService.getOneEquipment(msg);
return returnMsg;
public ApiRes<EquipmentTypeDto> getEquipment(@RequestBody QueryEquipmentTypeReq req) {
return ApiRes.success( equipmentTypeService.getEquipment(req));
}
@PostMapping("/UpdateEquipment")
@ApiOperation("修改物资信息")
public ResponseResult updateEquipment(@RequestBody Map<String,Object> msg) {
ResponseResult responseMsg = equipmentTypeService.updateEquipment(msg);
return responseMsg;
public ApiRes<Boolean> updateEquipment(@RequestBody @Validated(ValidationApi.edit.class) UpdateEquipmentTypeReq req) {
return ApiRes.success(equipmentTypeService.updateEquipment(req));
}
@PostMapping("/ShowEquipmentChildren")
@ApiOperation("根据类别查询装备")
public ResponseResult showEquipmentChildren(@RequestBody Map<String,Object> msg) {
ResponseResult responseMsg = equipmentTypeService.showEquipmentChildren(msg);
return responseMsg;
}
@PostMapping("/SetTypeParentIds")
@ApiOperation("填充装备类型的parent_ids字段")
......@@ -91,10 +72,4 @@ public class EquipmentTypeController {
return returnMsg;
}
@PostMapping("/GetEquipmentDevelop")
@ApiOperation("获取装备表所有信息(非树表)")
public ResponseResult getEquipmentDevelop() {
ResponseResult returnMsg = equipmentTypeService.getEquipmentDevelop();
return returnMsg;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/InventoryController.java
package com.junmp.jyzb.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.junmp.jyzb.api.bean.dto.InventoryDto;
import com.junmp.jyzb.api.bean.dto.InventorySumDto;
import com.junmp.jyzb.api.bean.dto.ProductBatchDto;
import com.junmp.jyzb.api.bean.req.InventoryReq;
import com.junmp.jyzb.api.bean.req.InventorySumReq;
import com.junmp.jyzb.api.bean.req.ProductBatchReq;
import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.jyzb.entity.Inventory;
import com.junmp.jyzb.api.bean.query.InventoryReq;
import com.junmp.jyzb.api.bean.query.InventorySumReq;
import com.junmp.jyzb.entity.InventorySummary;
import com.junmp.jyzb.entity.Product;
import com.junmp.jyzb.service.InventoryService;
import com.junmp.jyzb.service.InventorySummaryService;
import com.junmp.jyzb.utils.ResponseResult;
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java
package com.junmp.jyzb.controller;
import cn.hutool.core.util.ObjectUtil;
import com.junmp.jyzb.api.bean.req.CabinetReq;
import com.junmp.jyzb.api.bean.req.PolicemanReq;
import com.junmp.jyzb.api.bean.query.CabinetReq;
import com.junmp.jyzb.api.bean.query.PolicemanReq;
import com.junmp.jyzb.entity.Policeman;
import com.junmp.jyzb.service.PolicemanService;
import com.junmp.jyzb.utils.ResponseResult;
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PolicemanFingerController.java
package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.req.PolicemanFingerReq;
import com.junmp.jyzb.api.bean.query.PolicemanFingerReq;
import com.junmp.jyzb.doc.PolicemanFingerDoc;
import com.junmp.jyzb.entity.PoliceFinger;
import com.junmp.jyzb.service.PoliceFingerService;
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/ProductBatchController.java
......@@ -5,7 +5,7 @@ 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.req.ProductBatchReq;
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;
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/ProductController.java
package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.req.ProductReq;
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;
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/ProductSkuController.java
package com.junmp.jyzb.controller;
import cn.hutool.core.util.ObjectUtil;
import com.junmp.jyzb.api.bean.req.ProductSkuReq;
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;
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/ProductTagController.java
......@@ -6,7 +6,7 @@ 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.req.ProductTagReq;
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;
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PubOrgController.java
package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.req.OrgUpdateReq;
import com.junmp.jyzb.service.PubOrgService;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.v2.common.bean.response.ApiRes;
......@@ -27,27 +26,9 @@ public class PubOrgController {
@PostMapping("/ShowPubOrgList")
@ApiOperation("查询组织机构列表_简化版")
public ApiRes<List<Map<String,Object>>> ShowEquipmentList(@RequestBody Map<String, Object> orgId) {
//传入当前的组织机构id，展示所有本级及下级的
//ResponseResult returnMsg = pubOrgService.showPubOrgList(orgId);
return ApiRes.success(pubOrgService.showPubOrgList(orgId));
}
// @PostMapping("/ChangeOrgState")
// @ApiOperation("改变组织机构状态信息")
// public ResponseResult changeOrgState(@RequestBody OrgUpdateReq req) {
// //传入当前的组织机构id，展示所有本级及下级的
// ResponseResult returnMsg = pubOrgService.changeOrgState(msg);
// return returnMsg;
// }
// @PostMapping("/ShowAllPubOrgList")
// @ApiOperation("查询组织机构列表(含禁用)")
// public ResponseResult showAllPubOrgList(@RequestBody Map<String, Object> orgId) {
// //传入当前的组织机构id，展示所有本级及下级的
// ResponseResult returnMsg = pubOrgService.showAllPubOrgList(orgId);
// return returnMsg;
// }
@PostMapping("/ShowPubOrgListOld")
@ApiOperation("查询组织机构列表_完整版")
public ResponseResult showPubOrgListOld(@RequestBody Map<String, Object> orgId) {
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PublicController.java
......@@ -3,7 +3,7 @@ package com.junmp.jyzb.controller;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.AES;
import com.junmp.jyzb.api.bean.req.DbAccessReq;
import com.junmp.jyzb.api.bean.query.DbAccessReq;
import com.junmp.jyzb.api.bean.vo.AuthAccessVo;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/SupplierController.java
package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.jyzb.api.bean.req.SupplierReq;
import com.junmp.jyzb.entity.Product;
import com.junmp.jyzb.api.bean.dto.SupplierDto;
import com.junmp.jyzb.api.bean.query.QuerySupplierReq;
import com.junmp.jyzb.api.bean.req.UpdateSupplierReq;
import com.junmp.jyzb.entity.Supplier;
import com.junmp.jyzb.service.SupplierService;
import com.junmp.jyzb.service.WarehouseService;
import com.junmp.jyzb.utils.HttpStatus;
import com.junmp.jyzb.utils.RequestParam;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.v2.common.bean.request.ValidationApi;
import com.junmp.v2.common.bean.response.ApiRes;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -20,9 +17,7 @@ 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.List;
import java.util.Map;
@RestController
@Slf4j
......@@ -34,39 +29,32 @@ public class SupplierController {
@PostMapping("/AddSupplier")
@ApiOperation("添加供应商")
public ApiRes<Boolean> addSupplier(@RequestBody @Validated(SupplierReq.add.class) SupplierReq req) {
return ApiRes.success(supplierService.addSupplier(req));
public ApiRes<Boolean> AddSupplier(@RequestBody @Validated(ValidationApi.add.class) UpdateSupplierReq req) {
return ApiRes.success(supplierService.AddSupplier(req));
}
@PostMapping("/DeleteSupplier")
@ApiOperation("删除供应商信息")
public ApiRes<Boolean> deleteSupplier(@RequestBody @Validated(SupplierReq.delete.class)SupplierReq req) {
return ApiRes.success(supplierService.deleteSupplier(req));
public ApiRes<Boolean> DeleteSupplier(@RequestBody @Validated(ValidationApi.delete.class) UpdateSupplierReq req) {
return ApiRes.success(supplierService.DeleteSupplier(req));
}
@PostMapping("/ShowSupplier")
@ApiOperation("查询供应商列表")
public ApiRes<List<Supplier>> showSupplier(SupplierReq req){
return ApiRes.success(supplierService.showSupplier(req));
public ApiRes<List<SupplierDto>> ShowSupplier(QuerySupplierReq req){
return ApiRes.success(supplierService.ShowSupplier(req));
}
// @PostMapping("/GetOneSupplier")
// @ApiOperation("查询单个供应商信息")
// public ResponseResult getOneSupplier(@RequestBody Map<String, Object> msg) {
// String supplierId = msg.get("supplierId").toString();
// Map<String, Object> supplierMsg = supplierService.getOneSupplier(supplierId);
// return new ResponseResult(HttpStatus.SUCCESS,"操作成功",supplierMsg);
// }
@PostMapping("/UpdateSupplier")
@ApiOperation("修改供应商信息")
public ApiRes<Boolean> updateSupplier(@RequestBody @Validated(SupplierReq.edit.class) SupplierReq req) {
return ApiRes.success(supplierService.updateSupplier(req));
public ApiRes<Boolean> updateSupplier(@RequestBody @Validated(QuerySupplierReq.edit.class) UpdateSupplierReq req) {
return ApiRes.success(supplierService.UpdateSupplier(req));
}
@PostMapping("/ChangeSupplierState")
@ApiOperation("修改供应商状态")
public ApiRes<Boolean> changeSupplierState(@RequestBody @Validated(SupplierReq.edit.class) SupplierReq req) {
return ApiRes.success(supplierService.changeSupplierState(req));
public ApiRes<Boolean> changeSupplierState(@RequestBody @Validated(QuerySupplierReq.edit.class) UpdateSupplierReq req) {
return ApiRes.success(supplierService.ChangeSupplierState(req));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/WarehouseController.java
package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.req.*;
import com.junmp.jyzb.api.bean.query.ShelfReq;
import com.junmp.jyzb.api.bean.query.WarehouseAreaReq;
import com.junmp.jyzb.api.bean.query.WarehouseReq;
import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.service.*;
import com.junmp.v2.common.bean.response.ApiRes;
......
jyzb-biz/src/main/java/com/junmp/jyzb/doc/CompanyDoc.java
package com.junmp.jyzb.doc;
import com.junmp.jyzb.api.bean.req.CompanyReq;
import com.junmp.jyzb.api.bean.query.CompanyReq;
import com.junmp.jyzb.entity.Company;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
......
jyzb-biz/src/main/java/com/junmp/jyzb/doc/PolicemanFingerDoc.java
package com.junmp.jyzb.doc;
import com.junmp.jyzb.api.bean.req.PolicemanFingerReq;
import com.junmp.jyzb.api.bean.query.PolicemanFingerReq;
import com.junmp.jyzb.entity.PoliceFinger;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
......
jyzb-biz/src/main/java/com/junmp/jyzb/doc/ProductBatchDoc.java
......@@ -2,7 +2,7 @@ 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.req.ProductBatchReq;
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;
......
jyzb-biz/src/main/java/com/junmp/jyzb/doc/ProductDoc.java
package com.junmp.jyzb.doc;
import com.junmp.jyzb.api.bean.req.ProductReq;
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;
......
jyzb-biz/src/main/java/com/junmp/jyzb/doc/ProductSkuDoc.java
package com.junmp.jyzb.doc;
import com.junmp.jyzb.api.bean.req.ProductSkuReq;
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;
......
jyzb-biz/src/main/java/com/junmp/jyzb/doc/ProductTagDoc.java
package com.junmp.jyzb.doc;
import com.junmp.jyzb.api.bean.req.ProductTagReq;
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;
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/EquipmentSize.java
......@@ -20,13 +20,12 @@ public class EquipmentSize implements Serializable {
* 装备号型ID
*/
@ApiModelProperty(value = "装备号型ID")
@TableId(value = "id", type = IdType.ASSIGN_UUID)
@TableField("id")
private String id;
/**
* 装备类型ID
*/
@ApiModelProperty(value = "装备类型ID")
@TableField("type_id")
private String typeId;
......@@ -34,13 +33,11 @@ public class EquipmentSize implements Serializable {
/**
* 号型码
*/
@ApiModelProperty(value = "号型码")
private String code;
/**
* 号型名称
*/
@ApiModelProperty(value = "号型名称")
private String name;
/**
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/EquipmentType.java
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -64,20 +61,14 @@ public class EquipmentType implements Serializable {
@TableField("parent_ids")
private String parentIds;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
@TableField(fill = FieldFill.INSERT_UPDATE, value = "create_time")
private Date createTime;
/**
* 最后更新时间
*/
@ApiModelProperty(value = "最后更新时间")
@TableField("update_time")
@TableField(fill = FieldFill.INSERT_UPDATE, value = "update_time")
private Date updateTime;
/**
* 当前状态:0关闭/1启用
*/
......@@ -95,6 +86,11 @@ public class EquipmentType implements Serializable {
*/
@ApiModelProperty(value = "原id")
private String guid;
/**
* 类别下的最大id
*/
@TableField(value = "max_code")
private Integer maxCode;
/**
* 类型，0类别，1装备
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/Supplier.java
......@@ -9,10 +9,7 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-Supplier")
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_supplier")
public class Supplier implements Serializable {
/**
......@@ -51,23 +48,19 @@ public class Supplier implements Serializable {
@TableField(value = "phone")
private String phone;
/**
* 创建时间
*/
@TableField(value = "create_time")
@TableField(fill = FieldFill.INSERT_UPDATE, value = "create_time")
private Date createTime;
@TableField(fill = FieldFill.INSERT_UPDATE, value = "update_time")
private Date updateTime;
/**
* 创建人员
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
private String createUser;
/**
* 最后更新时间
*/
@TableField(value = "update_time", fill = FieldFill.UPDATE)
private Date updateTime;
/**
* 更新人ID
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/SupplierType.java
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;
......@@ -40,16 +41,10 @@ public class SupplierType implements Serializable {
@TableField(value = "state")
private Integer state;
/**
* 创建时间
*/
@TableField(value = "create_time")
@TableField(fill = FieldFill.INSERT_UPDATE, value = "create_time")
private Date createTime;
/**
* 最后更新时间
*/
@TableField(value = "update_time")
@TableField(fill = FieldFill.INSERT_UPDATE, value = "update_time")
private Date updateTime;
/**
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/CabinetMapper.java
......@@ -46,4 +46,8 @@ public interface CabinetMapper extends BaseMapper<Cabinet> {
void setCabinetOutSumInventory(@Param("updateId") String id);
void setCabinetPriceInventory(@Param("updateId") String id);
List<Map<String, Object>> getCabinetByOrgId(String orgId);
String getOrgByCabinet(String cabinetId);
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentSizeMapper.java
......@@ -10,21 +10,4 @@ import java.util.Map;
@Mapper
public interface EquipmentSizeMapper extends BaseMapper<EquipmentSize> {
public int addSize(EquipmentSize size);
Map<String, Object> getOneSize(String id);
void deleteSize(String id);
void updateSize(EquipmentSize size);
List<String> getAllSizeId(String orgId);
void changeSizeState(EquipmentSize size);
List<String> getSizeByCode(String code);
//String getCodeById(String id);
List<Map<String, Object>> getSizeDevelop();
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentTypeMapper.java
......@@ -11,46 +11,11 @@ import java.util.Map;
@Mapper
public interface EquipmentTypeMapper extends BaseMapper<EquipmentType> {
void addEquipment(EquipmentType equipmentType);
//Map<String, Object> getOneEquipment(String id);
void deleteEquipment(String id);
void updateEquipment(EquipmentType msg);
List<String> getAllEquipmentId(String orgId);
void changeEquipmentState(EquipmentType msg);
List<EquipmentType> selectAllEquipment();
List<Map<String,Object>> getAll();
void addData(List<Map<String, Object>> resultList);
String getIdByParentId(String parentId);
//添加商品的供应商
void addSupplier(@Param("uuid") String uuid,@Param("equipmentType") EquipmentType equipmentType, @Param("supplierList") List<String> supplierList);
void setCalculationId(@Param("numStr") String numStr,@Param("parentId") String parentId);
String getOneEquipmentId(String numStr);
void deleteSupplier(String id);
Map<String,Object> getOneEquipment(EquipmentType equipment);
List<Map<String, Object>> getSupplierByTypeId(EquipmentType equipment);
List<String> getLowestTypeId();
List<Map<String, Object>> getChildByParentId(String equipmentId);
void wipeParentIdsData();
void setTypeParentIds();
List<Map<String, Object>> getEquipmentDevelop();
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/ProductBatchMapper.java
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.junmp.jyzb.api.bean.dto.ProductBatchDto;
import com.junmp.jyzb.api.bean.dto.ProductProcessDto;
import com.junmp.jyzb.api.bean.req.ProductBatchReq;
import com.junmp.jyzb.api.bean.query.ProductBatchReq;
import com.junmp.jyzb.entity.ProductBatch;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/SupplierEquipmentMapper.java deleted 100644 → 0
package com.junmp.jyzb.mapper;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface SupplierEquipmentMapper {
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/SupplierMapper.java
......@@ -12,20 +12,4 @@ import java.util.Map;
@Mapper
public interface SupplierMapper extends BaseMapper<Supplier> {
public int addSupplier(Supplier supplier);
// Map<String, Object> getOneSupplier(String id,Object SelectName,Object SelectCode);
Map<String, Object> getOneSupplier(@Param("code") String code, @Param("SelectName") Object SelectName, @Param("SelectCode") Object SelectCode);
//Map<String, Object> getOneSupplier(@Param("id") String id);
void deleteSupplier(String id);
void updateSupplier(Supplier supplier);
List<String> getAllSupplierId();
void changeSupplierState(Supplier supplier);
List<Map<String, Object>> getAllSupplier(@Param("name") String name, @Param("shortName") String shortName);
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/SupplierTypeMapper.java
package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.entity.Supplier;
import com.junmp.jyzb.entity.SupplierType;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface SupplierTypeMapper {
public interface SupplierTypeMapper extends BaseMapper<SupplierType> {
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/service/CabinetBoxService.java
package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.req.CabinetReq;
import com.junmp.jyzb.api.bean.query.CabinetReq;
import com.junmp.jyzb.entity.CabinetBox;
import java.util.List;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/CabinetService.java
......@@ -2,8 +2,8 @@ package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.Dto.CabinetDto;
import com.junmp.jyzb.api.bean.req.CabinetBoxReq;
import com.junmp.jyzb.api.bean.req.CabinetReq;
import com.junmp.jyzb.api.bean.query.CabinetBoxReq;
import com.junmp.jyzb.api.bean.query.CabinetReq;
import com.junmp.jyzb.entity.Cabinet;
import com.junmp.jyzb.utils.ResponseResult;
......@@ -75,4 +75,11 @@ public interface CabinetService extends IService<Cabinet> {
* @return
*/
boolean boxBindPolice(CabinetBoxReq req);
/**
* 根据组织机构获取单警柜及箱号信息
* @param msg
* @return
*/
ResponseResult getCabinetByOrgId(Map<String, Object> msg);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/CompanyService.java
package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.req.CompanyReq;
import com.junmp.jyzb.api.bean.query.CompanyReq;
import com.junmp.jyzb.entity.Company;
import com.junmp.v2.db.api.page.PageResult;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/EquipmentSizeService.java
package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.req.EquipmentSizeReq;
import com.junmp.jyzb.api.bean.dto.EquipmentSizeDto;
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.Product;
import com.junmp.jyzb.utils.ResponseResult;
import java.util.List;
import java.util.Map;
public interface EquipmentSizeService extends IService<EquipmentSize> {
boolean addSize(EquipmentSizeReq req);
Boolean addSize(UpdateEquipmentSizeReq req);
EquipmentSize getOneSize(EquipmentSizeReq req);
EquipmentSize getOneSize(QueryEquipmentSizeReq req);
boolean deleteSize(EquipmentSizeReq req);
Boolean deleteSize(UpdateEquipmentSizeReq req);
boolean updateSize(EquipmentSizeReq req);
Boolean updateSize(UpdateEquipmentSizeReq req);
ResponseResult addSize(Map<String, Object> msg);
Boolean changeSizeState(UpdateEquipmentSizeReq req);
ResponseResult getOneSize(Map<String, Object> msg);
ResponseResult deleteSize(Map<String, Object> msg);
ResponseResult updateSize(Map<String, Object> msg);
List<String> getAllSizeId(Map<String, Object> orgId);
boolean changeSizeState(EquipmentSizeReq req);
List<EquipmentSize> getAllSize(EquipmentSizeReq req);
ResponseResult changeSizeState(Map<String, Object> msg);
ResponseResult getAllSize(Map<String, Object> msg);
ResponseResult getSizeDevelop();
List<EquipmentSizeDto> getAllSize(QueryEquipmentSizeReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/EquipmentTypeService.java
package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.entity.EquipmentSize;
import com.junmp.jyzb.api.bean.dto.EquipmentTreeDto;
import com.junmp.jyzb.api.bean.dto.EquipmentTypeDto;
import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
import com.junmp.jyzb.api.bean.req.UpdateEquipmentTypeReq;
import com.junmp.jyzb.entity.EquipmentType;
import com.junmp.jyzb.utils.ResponseResult;
......@@ -10,25 +13,20 @@ import java.util.Map;
public interface EquipmentTypeService extends IService<EquipmentType> {
ResponseResult addEquipment(Map<String, Object> msg);
Boolean addEquipment(UpdateEquipmentTypeReq req );
ResponseResult calculationEquipmentId();
ResponseResult deleteEquipment(Map<String, Object> msg);
Boolean deleteEquipment(UpdateEquipmentTypeReq req);
ResponseResult updateEquipment(Map<String, Object> msg);
Boolean updateEquipment(UpdateEquipmentTypeReq msg);
ResponseResult changeEquipmentState(Map<String, Object> msg);
Boolean changeEquipmentState(UpdateEquipmentTypeReq req);
List<Map<String,Object>> getEquipmentList();
List<EquipmentTreeDto> getEquipmentList(QueryEquipmentTypeReq req);
ResponseResult getOneEquipment(Map<String, Object> msg);
EquipmentTypeDto getEquipment(QueryEquipmentTypeReq req );
ResponseResult showEquipmentChildren(Map<String, Object> msg);
ResponseResult setTypeParentIds();
List<Map<String, Object>> showAllEquipment();
ResponseResult getEquipmentDevelop();
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/InventoryService.java
......@@ -2,10 +2,9 @@ package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.dto.InventoryDto;
import com.junmp.jyzb.api.bean.req.InventoryReq;
import com.junmp.jyzb.api.bean.query.InventoryReq;
import com.junmp.jyzb.entity.Inventory;
import com.junmp.jyzb.entity.ProductSku;
import com.junmp.jyzb.utils.ResponseResult;
import java.util.Map;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/InventorySummaryService.java
package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.dto.InventorySumDto;
import com.junmp.jyzb.api.bean.req.InventorySumReq;
import com.junmp.jyzb.entity.Inventory;
import com.junmp.jyzb.api.bean.query.InventorySumReq;
import com.junmp.jyzb.entity.InventorySummary;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.v2.db.api.page.PageResult;
public interface InventorySummaryService extends IService<InventorySummary> {
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/PoliceFingerService.java
package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.req.PolicemanFingerReq;
import com.junmp.jyzb.api.bean.query.PolicemanFingerReq;
import com.junmp.jyzb.entity.PoliceFinger;
import com.junmp.v2.db.api.page.PageResult;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/PolicemanService.java
package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.req.CabinetReq;
import com.junmp.jyzb.api.bean.req.PolicemanReq;
import com.junmp.jyzb.api.bean.query.CabinetReq;
import com.junmp.jyzb.api.bean.query.PolicemanReq;
import com.junmp.jyzb.entity.PoliceFinger;
import com.junmp.jyzb.entity.Policeman;
import com.junmp.jyzb.utils.ResponseResult;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/ProductBatchService.java
......@@ -3,7 +3,7 @@ package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.dto.ProductBatchDto;
import com.junmp.jyzb.api.bean.dto.ProductProcessDto;
import com.junmp.jyzb.api.bean.req.ProductBatchReq;
import com.junmp.jyzb.api.bean.query.ProductBatchReq;
import com.junmp.jyzb.entity.ProductBatch;
import com.junmp.v2.db.api.page.PageResult;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/ProductService.java
package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.jyzb.api.bean.query.ProductReq;
import com.junmp.jyzb.entity.Product;
import com.junmp.v2.db.api.page.PageResult;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/ProductSkuService.java
package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.req.ProductSkuReq;
import com.junmp.jyzb.api.bean.query.ProductSkuReq;
import com.junmp.jyzb.entity.ProductSku;
import com.junmp.v2.db.api.page.PageResult;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/ProductTagService.java
......@@ -2,7 +2,7 @@ package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.dto.ProductTagDto;
import com.junmp.jyzb.api.bean.req.ProductTagReq;
import com.junmp.jyzb.api.bean.query.ProductTagReq;
import com.junmp.jyzb.entity.ProductTag;
import com.junmp.v2.db.api.page.PageResult;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/PubOrgService.java
package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.req.OrgUpdateReq;
import com.junmp.jyzb.entity.Inventory;
import com.junmp.jyzb.api.bean.query.OrgUpdateReq;
import com.junmp.jyzb.utils.ResponseResult;
import java.util.List;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/ShelfService.java
package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.req.ShelfReq;
import com.junmp.jyzb.api.bean.query.ShelfReq;
import com.junmp.jyzb.entity.Shelf;
import java.util.List;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/SupplierEquipmentService.java deleted 100644 → 0
package com.junmp.jyzb.service;
public interface SupplierEquipmentService{
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/SupplierService.java
package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.jyzb.api.bean.req.SupplierReq;
import com.junmp.jyzb.entity.Product;
import com.junmp.jyzb.api.bean.dto.SupplierDto;
import com.junmp.jyzb.api.bean.query.QuerySupplierReq;
import com.junmp.jyzb.api.bean.req.UpdateSupplierReq;
import com.junmp.jyzb.entity.Supplier;
import com.junmp.jyzb.utils.ResponseResult;
import java.util.List;
import java.util.Map;
public interface SupplierService extends IService<Supplier> {
/**
......@@ -16,37 +14,42 @@ public interface SupplierService extends IService<Supplier> {
*
* @param req
*/
boolean addSupplier(SupplierReq req);
boolean AddSupplier(UpdateSupplierReq req);
Map<String,Object> getOneSupplier(String id,Object name,Object code);
/**
* @Author: Zhaojw
* @Description: 检查供应商是否存在
* @DateTime: 2023/7/29 10:49
* @Params:
* @Return
*/
public List<String> CheckSupplierList(List<String> req);
/**
* 删除
*
* @param req
*/
boolean deleteSupplier(SupplierReq req);
boolean DeleteSupplier(UpdateSupplierReq req);
/**
* 编辑
*
* @param req
*/
boolean updateSupplier(SupplierReq req);
List<String> getAllSupplierId();
boolean UpdateSupplier(UpdateSupplierReq req);
/**
* 列表信息
*
* @param req
*/
List<Supplier> showSupplier(SupplierReq req);
List<SupplierDto> ShowSupplier(QuerySupplierReq req);
/**
* 更改状态
*
* @param req
*/
boolean changeSupplierState(SupplierReq req);
Boolean ChangeSupplierState(UpdateSupplierReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/SupplierTypeService.java
package com.junmp.jyzb.service;
public interface SupplierTypeService{
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.entity.SupplierType;
public interface SupplierTypeService extends IService<SupplierType> {
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/WarehouseAreaService.java
package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.req.WarehouseAreaReq;
import com.junmp.jyzb.entity.Warehouse;
import com.junmp.jyzb.api.bean.query.WarehouseAreaReq;
import com.junmp.jyzb.entity.WarehouseArea;
import java.util.List;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/WarehouseService.java
package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.req.WarehouseReq;
import com.junmp.jyzb.api.bean.query.WarehouseReq;
import com.junmp.jyzb.entity.Warehouse;
import com.junmp.jyzb.utils.ResponseResult;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/CabinetBoxServiceImpl.java
......@@ -3,23 +3,16 @@ package com.junmp.jyzb.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.req.CabinetReq;
import com.junmp.jyzb.entity.Cabinet;
import com.junmp.jyzb.api.bean.query.CabinetReq;
import com.junmp.jyzb.entity.CabinetBox;
import com.junmp.jyzb.mapper.CabinetBoxMapper;
import com.junmp.jyzb.mapper.CabinetMapper;
import com.junmp.jyzb.service.CabinetBoxService;
import com.junmp.jyzb.utils.HttpStatus;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.jyzb.utils.ReturnMsg;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
@Service
public class CabinetBoxServiceImpl extends ServiceImpl<CabinetBoxMapper, CabinetBox> implements CabinetBoxService {
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/CabinetServiceImpl.java
......@@ -4,8 +4,8 @@ import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.Dto.CabinetDto;
import com.junmp.jyzb.api.bean.req.CabinetBoxReq;
import com.junmp.jyzb.api.bean.req.CabinetReq;
import com.junmp.jyzb.api.bean.query.CabinetBoxReq;
import com.junmp.jyzb.api.bean.query.CabinetReq;
import com.junmp.jyzb.entity.Cabinet;
import com.junmp.jyzb.entity.CabinetBox;
import com.junmp.jyzb.entity.Policeman;
......@@ -254,74 +254,7 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
List<Map<String, Object>> allCabinet = new ArrayList<>();
// // 构建 Redis 缓存键
// String redisKey = REDIS_CABINET;
// // 从 Redis 中获取数据
// List<Map<String, Object>> cachedData = redisUtils.findCachedData(redisKey);
// List<Map<String, Object>> cabinetList = new ArrayList<>();
// if (cachedData != null) {
// cabinetList = cachedData;
// }else {
// cabinetList = cabinetMapper.getAllCabinet();
// redisUtils.set(redisKey, cabinetList);
// }
// // 构建 Redis 缓存键
// String redisKey = REDIS_CABINET + msg.get("IncludeLowerLevel").toString() +'_'+ msg.get("orgId").toString();
// // 从 Redis 中获取数据
// List<Map<String, Object>> cachedData = redisUtils.findCachedData(redisKey);
// if (cachedData != null) {
// //将Long类型的数据转化为Date
//// for (Map<String,Object> one:cachedData){
//// Long dataMsg = (Long) one.get("updateTime");
//// one.put("updateTime", redisUtils.getDate(dataMsg));
//// allCabinet.add(one);
//// }
// return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,cachedData);
// }
//如果组织机构是浙江省公安厅
// if (msg.get("orgId").toString().equals("1369509498032808905") && msg.get("IncludeLowerLevel").toString().equals("true")) {
// allCabinet = cabinetMapper.getAllCabinet();
// //将查询结果存入 Redis 中
// //redisUtils.set(redisKey, allCabinet);
// return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS, allCabinet);
// }
//获取该组织机构下所有仓库的id
// List<String> allOrgId = getAllOrgId(msg);
// if (allOrgId.isEmpty()) {
// return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, "未查询到相关信息");
// }
//
// allCabinet = getAllCabinetByOrg(msg, allOrgId);
//List<Map<String, Object>> selectedCabinets = new ArrayList<>(); // 存放匹配到的柜子信息的列表
// 遍历allOrgId
// for (String orgId : allOrgId) {
// // 遍历allCabinet中的每个柜子信息
// for (Map<String, Object> cabinet : cabinetList) {
// // 检查柜子信息中的orgId是否与当前遍历的orgId匹配
// if (cabinet.containsKey("orgId") && cabinet.get("orgId").equals(orgId)) {
// // 匹配到了柜子信息，将其添加到selectedCabinets中
// selectedCabinets.add(cabinet);
// }
// }
// }
// String orgId = msg.get("orgId").toString();
// List<String> allCabinetId =getAllCabinetId(msg);
// for (String cabinetId :allCabinetId){
// Map<String, Object> cabinetMsg = cabinetMapper.getOneCabinet(cabinetId);
// if (cabinetMsg!=null){
// allCabinet.add(cabinetMsg);
// }
// }
//
//将查询结果存入 Redis 中
//redisUtils.set(redisKey, allCabinet);
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS, allCabinet);
}
......@@ -654,6 +587,30 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
return policemanService.updateById(one2);
}
@Override
public ResponseResult getCabinetByOrgId(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("orgId"), "orgId不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, e.getMessage());
}
// 根据组织机构获取该组织机构下所有单警柜
List<Map<String,Object>> allCabinet = new ArrayList<>();
allCabinet = cabinetMapper.getCabinetByOrgId(msg.get("orgId").toString());
// 遍历allCabinet
for (Map<String,Object> oneCabinet:allCabinet){
String cabinetId = oneCabinet.get("id").toString();
// 根据单警柜id获取箱号信息
List<Map<String,Object>> allBox = new ArrayList<>();
allBox = cabinetBoxMapper.getBoxMsg(cabinetId);
oneCabinet.put("allBoxMsg",allBox);
}
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS, allCabinet);
}
//查询的各种条件信息
//单警柜主柜查询条件
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/CompanyServiceImpl.java
......@@ -6,7 +6,7 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.req.CompanyReq;
import com.junmp.jyzb.api.bean.query.CompanyReq;
import com.junmp.jyzb.api.exception.enums.CompanyExceptionEnum;
import com.junmp.jyzb.api.util.GenCodeUtil;
import com.junmp.jyzb.entity.Company;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java
......@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.dto.InventoryDto;
import com.junmp.jyzb.api.bean.req.InventoryReq;
import com.junmp.jyzb.api.bean.query.InventoryReq;
import com.junmp.jyzb.entity.Inventory;
import com.junmp.jyzb.service.*;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventorySummaryServiceImpl.java
package com.junmp.jyzb.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.dto.InventoryDto;
import com.junmp.jyzb.api.bean.dto.InventorySumDto;
import com.junmp.jyzb.api.bean.req.InventorySumReq;
import com.junmp.jyzb.api.bean.query.InventorySumReq;
import com.junmp.jyzb.entity.InventorySummary;
import com.junmp.jyzb.service.InventorySummaryService;
import com.junmp.v2.db.api.factory.PageFactory;
......@@ -16,9 +13,6 @@ import com.junmp.v2.db.api.page.PageResult;
import org.springframework.stereotype.Service;
import com.junmp.jyzb.mapper.InventorySummaryMapper;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
@Service
public class InventorySummaryServiceImpl extends ServiceImpl<InventorySummaryMapper, InventorySummary> implements InventorySummaryService {
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PoliceFingerServiceImpl.java
......@@ -4,7 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.req.PolicemanFingerReq;
import com.junmp.jyzb.api.bean.query.PolicemanFingerReq;
import com.junmp.jyzb.entity.PoliceFinger;
import com.junmp.jyzb.exception.enums.PolicemanFingerExceptionEnum;
import com.junmp.jyzb.service.PoliceFingerService;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
package com.junmp.jyzb.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.req.CabinetReq;
import com.junmp.jyzb.api.bean.req.PolicemanReq;
import com.junmp.jyzb.api.bean.query.CabinetReq;
import com.junmp.jyzb.api.bean.query.PolicemanReq;
import com.junmp.jyzb.entity.Cabinet;
import com.junmp.jyzb.entity.CabinetBox;
import com.junmp.jyzb.entity.PoliceFinger;
import com.junmp.jyzb.exception.enums.PolicemanExceptionEnum;
import com.junmp.jyzb.mapper.*;
......@@ -16,7 +14,6 @@ import com.junmp.jyzb.service.PolicemanService;
import com.junmp.jyzb.service.PubOrgService;
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 org.springframework.stereotype.Service;
......@@ -657,53 +654,115 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
}
@Override
public ResponseResult getPoliceData(Map<String, Object> cabinetId) {
public ResponseResult getPoliceData(Map<String, Object> msg) {
try {
checkNotBlank(cabinetId.get("cabinetId"), "cabinetId不能为空");
checkNotBlank(msg.get("cabinetId"), "cabinetId不能为空");
checkNotBlank(msg.get("type"), "type不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
//如果没有找到该单警柜，返回对应信息
String cabinetMsg = cabinetId.get("cabinetId").toString();
String cabinetMsg = msg.get("cabinetId").toString();
Map<String, Object> oneCabinet = cabinetMapper.getOneCabinet(cabinetMsg);
if (oneCabinet.isEmpty()){
return new ResponseResult(HttpStatus.ERROR,ReturnMsg.NO_DATA,ReturnData.NO_DATA);
}
// 构建 Redis 缓存键
String redisKey = "getPoliceData" + cabinetId.get("cabinetId").toString();
// 从 Redis 中获取数据
Map<String, Object> cachedData = redisUtils.findCachedData(redisKey);
if (cachedData != null) {
//将Long类型的数据转化为Date
// for (Map<String,Object> one:cachedData){
// Long dataMsg = (Long) one.get("updateTime");
// one.put("updateTime", redisUtils.getDate(dataMsg));
// allPoliceman.add(one);
// }
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,cachedData);
}
String type = msg.get("type").toString();
//存放返回的数据
Map<String, Object> allMsg = new HashMap<>();
allMsg.put("cabinetName",oneCabinet.get("name"));
List<Map<String, Object>> allBoxMsg = cabinetBoxMapper.getBoxMsg(cabinetMsg);
List<Map<String, Object>> policeMsg = new ArrayList<>();
for (Map<String, Object> boxMsg:allBoxMsg){
String cabinetBoxId = boxMsg.get("cabinetBoxId").toString();
List<String> allPoliceIdByBoxId = policemanMapper.getAllPoliceIdByBoxId(cabinetBoxId);
for(String policeId:allPoliceIdByBoxId){
Map<String, Object> onePolice = policemanMapper.getOnePolice(policeId);
List<Map<String, Object>> fingerprints= policeFingerMapper.getFingersByUserId(policeId);
onePolice.put("fingerMsg",fingerprints);
policeMsg.add(onePolice);
if (type.equals("all")){
//根据单警柜id获取组织机构id
String orgId = cabinetMapper.getOrgByCabinet(msg.get("cabinetId").toString());
//根据组织机构id,查询所有的警员
List<Map<String, Object>> allPolicemanByOrg = policemanMapper.getAllPolicemanByOrg(orgId);
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,allPolicemanByOrg);
}else if(type.equals("single")){
allMsg.put("id",oneCabinet.get("id"));
allMsg.put("cabinetNum",oneCabinet.get("cabinetNum"));
allMsg.put("name",oneCabinet.get("name"));
allMsg.put("orgId",oneCabinet.get("orgId"));
allMsg.put("orgName",oneCabinet.get("orgName"));
allMsg.put("location",oneCabinet.get("location"));
List<Map<String, Object>> allBoxMsg = cabinetBoxMapper.getBoxMsg(cabinetMsg);
List<Map<String, Object>> policeMsg = new ArrayList<>();
for (Map<String, Object> boxMsg:allBoxMsg){
String cabinetBoxId = boxMsg.get("cabinetBoxId").toString();
List<String> allPoliceIdByBoxId = policemanMapper.getAllPoliceIdByBoxId(cabinetBoxId);
for(String policeId:allPoliceIdByBoxId){
Map<String, Object> onePolice = policemanMapper.getOnePolice(policeId);
List<Map<String, Object>> fingerprints= policeFingerMapper.getFingersByUserId(policeId);
onePolice.put("fingerMsg",fingerprints);
policeMsg.add(onePolice);
}
}
allMsg.put("policeList",policeMsg);
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,allMsg);
}else if(type.equals("allBind")){
//构建存放返回信息的List
List<Map<String,Object>> returnMsg = new ArrayList<>();
//根据单警柜id获取组织机构id
String orgId = cabinetMapper.getOrgByCabinet(msg.get("cabinetId").toString());
//根据组织机构id获取下面的所有单警柜
List<Map<String, Object>> allCabinet = cabinetMapper.getCabinetByOrgId(orgId);
//根据单警柜的List,查询所有绑定的警员信息
for (Map<String, Object> one:allCabinet){
//构建cabinet的map
Map<String, Object> cabinetMap = new HashMap<>();
cabinetMap.put("id",one.get("id"));
cabinetMap.put("cabinetNum",one.get("cabinetNum"));
cabinetMap.put("name",one.get("name"));
cabinetMap.put("orgId",one.get("orgId"));
cabinetMap.put("orgName",one.get("orgName"));
cabinetMap.put("location",one.get("location"));
List<Map<String, Object>> allBoxMsg = cabinetBoxMapper.getBoxMsg(one.get("id").toString());
List<Map<String, Object>> policeMsg = new ArrayList<>();
for (Map<String, Object> boxMsg:allBoxMsg){
String cabinetBoxId = boxMsg.get("cabinetBoxId").toString();
List<String> allPoliceIdByBoxId = policemanMapper.getAllPoliceIdByBoxId(cabinetBoxId);
for(String policeId:allPoliceIdByBoxId){
Map<String, Object> onePolice = policemanMapper.getOnePolice(policeId);
List<Map<String, Object>> fingerprints= policeFingerMapper.getFingersByUserId(policeId);
onePolice.put("fingerMsg",fingerprints);
policeMsg.add(onePolice);
}
}
cabinetMap.put("policeList",policeMsg);
//将cabinetMap放入list
returnMsg.add(cabinetMap);
}
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,returnMsg);
}else {
return new ResponseResult(HttpStatus.ERROR,ReturnMsg.ERROR,"传入的type有误");
}
allMsg.put("policeList",policeMsg);
// // 构建 Redis 缓存键
// String redisKey = "getPoliceData" + cabinetId.get("cabinetId").toString();
// // 从 Redis 中获取数据
// Map<String, Object> cachedData = redisUtils.findCachedData(redisKey);
// if (cachedData != null) {
// //将Long类型的数据转化为Date
//// for (Map<String,Object> one:cachedData){
//// Long dataMsg = (Long) one.get("updateTime");
//// one.put("updateTime", redisUtils.getDate(dataMsg));
//// allPoliceman.add(one);
//// }
// return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,cachedData);
// }
//将查询结果存入 Redis 中
redisUtils.set(redisKey, allMsg);
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,allMsg);
//redisUtils.set(redisKey, allMsg);
}
/**
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ProductBatchServiceImpl.java
......@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.dto.ProductBatchDto;
import com.junmp.jyzb.api.bean.dto.ProductProcessDto;
import com.junmp.jyzb.api.bean.req.ProductBatchReq;
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.entity.ProductBatch;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ProductServiceImpl.java
......@@ -4,7 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.jyzb.api.bean.query.ProductReq;
import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
import com.junmp.jyzb.api.util.GenCodeUtil;
import com.junmp.jyzb.entity.Product;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ProductSkuServiceImpl.java
......@@ -5,7 +5,7 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.req.ProductSkuReq;
import com.junmp.jyzb.api.bean.query.ProductSkuReq;
import com.junmp.jyzb.api.exception.JYZBAppException;
import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
import com.junmp.jyzb.api.util.GenCodeUtil;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论