Skip to content

J
jyzb_platformV2
Commit 2961416a by 赵剑炜
Options

调整基础信息

parent 81c51629
正在显示 包含 716 行增加 和 808 行删除
.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-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/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/EquipmentSizeReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/EquipmentSizeReq.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.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;
}
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/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.NotNull;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
public class QueryEquipmentTypeReq extends BaseRequest {
@NotNull(message = "装备主键不能为空", groups = {ValidationApi.edit.class, ValidationApi.delete.class, ValidationApi.detail.class})
private String id;
@NotNull(message = "状态不能为空", groups = { ValidationApi.delete.class})
private String state;
private String unitType;
private String code;
private String name;
private String note;
private String parentId;
private int warrantyPeriod;
private int maintenancePeriod;
private int type;
private List<String> supplierList;
}
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/req/SupplierReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/SupplierReq.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.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;
}
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/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.NotNull;
@Data
public class UpdateEquipmentTypeReq {
@NotNull(message = "装备主键不能为空", groups = {ValidationApi.edit.class, ValidationApi.delete.class, ValidationApi.detail.class})
private String id;
@NotNull(message = "状态不能为空", groups = { ValidationApi.delete.class})
private String 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/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;
......
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.query.EquipmentSizeReq;
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.response.ApiRes;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -19,9 +15,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
......
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,11 +28,11 @@ 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(QueryEquipmentTypeReq.add.class) QueryEquipmentTypeReq req) {
return ApiRes.success(equipmentTypeService.addEquipment(req));
}
//添加装备时计算id
@PostMapping("/CalculationEquipmentId")
public ResponseResult calculationEquipmentId() {
......@@ -37,44 +42,33 @@ public class EquipmentTypeController {
@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) QueryEquipmentTypeReq 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 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) QueryEquipmentTypeReq req) {
return ApiRes.success(equipmentTypeService.updateEquipment(req));
}
@PostMapping("/ShowEquipmentChildren")
......
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;
......
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.query.SupplierReq;
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.response.ApiRes;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -20,9 +14,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
......
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/EquipmentType.java
......@@ -95,6 +95,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 {
/**
......@@ -57,6 +54,7 @@ public class Supplier implements Serializable {
@TableField(value = "create_time")
private Date createTime;
/**
* 创建人员
*/
......
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/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;
......
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.query.EquipmentSizeReq;
import com.junmp.jyzb.entity.EquipmentSize;
import com.junmp.jyzb.entity.Product;
import com.junmp.jyzb.utils.ResponseResult;
import java.util.List;
......
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,24 @@ import java.util.Map;
public interface EquipmentTypeService extends IService<EquipmentType> {
ResponseResult addEquipment(Map<String, Object> msg);
Boolean addEquipment(QueryEquipmentTypeReq req );
ResponseResult calculationEquipmentId();
ResponseResult deleteEquipment(Map<String, Object> msg);
Boolean deleteEquipment(QueryEquipmentTypeReq req);
ResponseResult updateEquipment(Map<String, Object> msg);
Boolean updateEquipment(QueryEquipmentTypeReq 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/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.query.SupplierReq;
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> {
/**
......@@ -18,7 +14,14 @@ public interface SupplierService extends IService<Supplier> {
*/
boolean addSupplier(SupplierReq 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);
/**
* 删除
......
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);
}
......
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/EquipmentSizeServiceImpl.java
......@@ -3,12 +3,9 @@ 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.EquipmentSizeReq;
import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.jyzb.api.bean.query.EquipmentSizeReq;
import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
import com.junmp.jyzb.api.util.GenCodeUtil;
import com.junmp.jyzb.entity.EquipmentSize;
import com.junmp.jyzb.entity.Product;
import com.junmp.jyzb.mapper.EquipmentTypeMapper;
import com.junmp.jyzb.service.EquipmentSizeService;
import com.junmp.jyzb.utils.DateTimeUtil;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java
package com.junmp.jyzb.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.entity.EquipmentType;
import com.fasterxml.jackson.databind.ObjectMapper;
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.api.exception.JYZBAppException;
import com.junmp.jyzb.api.exception.enums.EquipmentTypeExceptionEnum;
import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.mapper.SupplierMapper;
import com.junmp.jyzb.service.EquipmentTypeService;
import com.junmp.jyzb.service.SupplierService;
import com.junmp.jyzb.service.SupplierTypeService;
import com.junmp.jyzb.utils.*;
import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.util.BeanPlusUtil;
import org.springframework.data.annotation.Id;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import com.junmp.jyzb.mapper.EquipmentTypeMapper;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
......@@ -22,209 +38,123 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
@Resource
private EquipmentTypeMapper equipmentTypeMapper;
@Resource
private SupplierMapper supplierMapper;
@Resource
private SupplierService supplierService;
@Resource
private SupplierTypeService supplierTypeService;
private static final String REDIS_TYPE = "Type_";
@Override
public List<Map<String, Object>> getEquipmentList() {
List<EquipmentType> menuList = equipmentTypeMapper.selectAllEquipment();
List<Map<String, Object>> topList = new ArrayList<>();
List<Map<String, Object>> resultList = new ArrayList<>();
Map<String, List<Map<String, Object>>> childrenMap = new HashMap<>();
public List<EquipmentTreeDto> getEquipmentList(QueryEquipmentTypeReq req) {
String selfCode="00000000-0000-0000-0000-000000000000";
// 构建子菜单映射表
for (EquipmentType menu : menuList) {
Map<String, Object> map = new HashMap<>();
map.put("id", menu.getId());
map.put("name", menu.getName());
map.put("unit", menu.getUnit());
map.put("unitType", menu.getUnitType());
map.put("code", menu.getCode());
map.put("parentId", menu.getParentId());
map.put("state", menu.getState());
map.put("note", menu.getNote());
map.put("createTime", menu.getCreateTime());
map.put("updateTime", menu.getUpdateTime());
map.put("type",menu.getType());
//如果是id和parentId都为 00000 的超级根，就将它放在映射为-1的数据中
if (menu.getId().equals("00000000-0000-0000-0000-000000000000") && menu.getParentId().equals("00000000-0000-0000-0000-000000000000")){
childrenMap.put("-1", new ArrayList<>());
childrenMap.get("-1").add(map);
continue;
}
if (!childrenMap.containsKey(menu.getParentId())) {
childrenMap.put(menu.getParentId(), new ArrayList<>());
}
childrenMap.get(menu.getParentId()).add(map);
List<EquipmentTreeDto> equipmentTypeDTOList = new ArrayList<>();
LambdaQueryWrapper<EquipmentType> wrapper = new LambdaQueryWrapper<>();
String setNewCode="";
if (ObjectUtil.isNotEmpty(req.getCode())) {
{
setNewCode=req.getCode().replaceAll("0+$", "");
}
}
wrapper.likeRight(ObjectUtil.isNotEmpty(req.getCode()), EquipmentType::getCode, setNewCode);
List<EquipmentType> equipmentList = this.list(wrapper);
// 创建一个 Map 来存储 Equipment ID 和对应的 DTO 对象
Map<String, EquipmentTreeDto> equipmentDtoMap = new HashMap<>();
// 创建一个 Map 来存储父类的 parentid 和对应的父类节点
Map<String, EquipmentTreeDto> parentDtoMap = new HashMap<>();
if (ObjectUtil.isNotEmpty(req.getCode())&&!req.getCode().equals("00000000-0000-0000-0000-000000000000"))
{ LambdaQueryWrapper<EquipmentType> wrapper2 = new LambdaQueryWrapper<>();
if (ObjectUtil.isNotEmpty(req.getCode()))
{
selfCode=req.getCode();
}
wrapper2.eq(ObjectUtil.isNotEmpty(req.getCode()), EquipmentType::getCode, selfCode);
String id= this.getOne(wrapper2).getId();
selfCode=id;
EquipmentType et=this.getById(id);
EquipmentTreeDto equipmentTypeDTO = new EquipmentTreeDto();
equipmentTypeDTO.setName(et.getName());
equipmentTypeDTO.setCode(et.getCode());
equipmentTypeDTO.setType(et.getType());
equipmentDtoMap.put(et.getId(),equipmentTypeDTO);
}
// 获取顶级菜单(最高一级的parentId 为 -1)
List<Map<String, Object>> topMenus = childrenMap.get("-1");
// 迭代构建菜单树
if (topMenus != null) {
for (Map<String, Object> topMenu : topMenus) {
Stack<Map<String, Object>> stack = new Stack<>();
stack.push(topMenu);
// 第一轮遍历：创建 EquipmentTreeDto 对象并将其加入到 Map 中
for (EquipmentType equipment : equipmentList) {
EquipmentTreeDto equipmentTypeDTO = new EquipmentTreeDto();
equipmentTypeDTO.setName(equipment.getName());
equipmentTypeDTO.setCode(equipment.getCode());
equipmentTypeDTO.setType(equipment.getType());
equipmentDtoMap.put(equipment.getId(), equipmentTypeDTO);
// 如果 parentid 是传进来的值，则将其作为顶级节点添加到 equipmentTypeDTOList 中
if (equipment.getId().equals(selfCode)) {
equipmentTypeDTOList.add(equipmentTypeDTO);
}
}
// 使用栈进行深度优先遍历
while (!stack.isEmpty()) {
Map<String, Object> currentMenu = stack.pop();
String currentMenuId = currentMenu.get("id").toString();
// 第二轮遍历：将子节点连接到父节点
boolean isStartAddingChildren = false;
for (EquipmentType equipment : equipmentList) {
String parentId = equipment.getParentId();
EquipmentTreeDto equipmentTypeDTO = equipmentDtoMap.get(equipment.getId());
if (childrenMap.containsKey(currentMenuId)) {
List<Map<String, Object>> children = childrenMap.get(currentMenuId);
currentMenu.put("children", children);
// 如果找到传入的ID对应的节点，则开始添加子节点
if (equipment.getId().equals(selfCode)) {
isStartAddingChildren = true;
}
for (int i = children.size() - 1; i >= 0; i--) {
stack.push(children.get(i));
}
}
}
resultList.add(topMenu);
// 如果 isStartAddingChildren 为 true，并且 parentDtoMap 中有对应的父类节点，则将节点连接到父节点
if (isStartAddingChildren && parentDtoMap.containsKey(parentId)) {
EquipmentTreeDto parentDto = parentDtoMap.get(parentId);
parentDto.addChild(equipmentTypeDTO);
}
// 将当前节点添加到 parentDtoMap 中，以便后续节点连接
parentDtoMap.put(equipment.getId(), equipmentTypeDTO);
}
// 返回结果
return resultList;
return equipmentTypeDTOList;
}
// @Override
// public List<Map<String, Object>> getEquipmentList() {
// List<EquipmentType> menuList = equipmentTypeMapper.selectAllEquipment();
// List<Map<String, Object>> resultList = new ArrayList<>();
// for (EquipmentType menu : menuList) {
// //System.out.println(menu.getIdByParentId()+" "+menu.getName()+" "+menu.getParentId());
// //00000000-0000-0000-0000-000000000000
// //List<Map<String, Object>> children = getChildMenus(menu.getId(), menuList);
// if (!menu.getName().equals("超级根") && menu.getParentId().equals("00000000-0000-0000-0000-000000000000")) {
// //List<Map<String, Object>> children = getChildMenus(menu.getId(), menuList);
// Map<String, Object> map = new HashMap<>();
// map.put("id", menu.getId());
// map.put("name", menu.getName());
// map.put("unit", menu.getUnit());
// map.put("unitType", menu.getUnitType());
// map.put("code", menu.getCode());
// map.put("parentId", menu.getParentId());
// map.put("state", menu.getState());
// map.put("note", menu.getNote());
// map.put("createTime", menu.getCreateTime());
// map.put("updateTime", menu.getUpdateTime());
//
// //map.put("children", children);
// List<Map<String, Object>> children = getChildMenus(menu.getId(),menuList);
// if (!children.isEmpty()) {
// map.put("children", children);
// }
//
// resultList.add(map);
// }
// }
///*
// //将查询结果存入 Redis 中
// redisUtils.set(redisKey, resultList);
//*/
// return resultList;
// }
// private List<Map<String, Object>> getChildMenus(String parentId, List<EquipmentType> menuList) {
// List<Map<String, Object>> childList = new ArrayList<>();
// for (EquipmentType menu : menuList) {
// if (menu.getParentId().equals(parentId)) {
// Map<String, Object> map = new HashMap<>();
// map.put("id", menu.getId());
// map.put("name", menu.getName());
// map.put("unit", menu.getUnit());
// map.put("unitType", menu.getUnitType());
// map.put("code", menu.getCode());
// map.put("parentId", menu.getParentId());
// map.put("state", menu.getState());
// map.put("note", menu.getNote());
// map.put("createTime", menu.getCreateTime());
// map.put("updateTime", menu.getUpdateTime());
//
// List<Map<String, Object>> children = getChildMenus(menu.getId(), menuList);
// if (!children.isEmpty()) {
// map.put("children", children);
// }
//
// childList.add(map);
// }
// }
// return childList;
// }
@Transactional
@Override
public ResponseResult addEquipment(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("name"), "name不能为空");
checkNotBlank(msg.get("parentId"), "parentId不能为空");
checkNotBlank(msg.get("supplierList"), "supplierList不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, e.getMessage());
}
public Boolean addEquipment(QueryEquipmentTypeReq req) {
//parentId只能是倒数第二级，因为插入的装备只能是最后一级
String resultId = equipmentTypeMapper.getIdByParentId((String) msg.get("parentId"));
if (resultId == null || resultId.equals("")) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, "传入的parentId有误，新的装备类型只能加在最后一级");
}
//判断传入的组织机构是否存在
List<String> supplierFlag = new ArrayList<>();
List<String> supplierList = (List<String>) msg.get("supplierList");
for (String supplierId : supplierList) {
Map<String, Object> oneSupplier = supplierMapper.getOneSupplier(supplierId, null, null);
if (oneSupplier == null || oneSupplier.isEmpty()) {
supplierFlag.add(supplierId);
}
}
if (!supplierFlag.isEmpty()) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, "传入的部分供应商不存在：" + supplierFlag);
}
EquipmentType equipmentType = new EquipmentType();
//生成加入supplier-type表的uuid
String uuid = UUID.randomUUID().toString().replaceAll("-", "");
//生成时间
Date currentDate = DateTimeUtil.getCurrentDateTime();
equipmentType.setCreateTime(currentDate);
equipmentType.setUpdateTime(currentDate);
//计算出新的装备类型id，在原来的基础上+1
int num = Integer.parseInt(resultId);
String numStr = String.valueOf(num + 1);
//读取json中的相关数据
equipmentType.setId(numStr);
equipmentType.setName((String) msg.get("name"));
equipmentType.setUnitType((String) msg.get("unitType"));
equipmentType.setCode(numStr);
equipmentType.setParentId((String) msg.get("parentId"));
equipmentType.setNote((String) msg.get("note"));
//计算出id后，判断数据库中是否已存在该id
String oneEquipment = equipmentTypeMapper.getOneEquipmentId(numStr);
if (!(oneEquipment == null)) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, "添加异常，装备id已存在");
}
EquipmentType type = new EquipmentType();
//读取装备的供应商列表,将相关数据加入到supplier_type表
equipmentTypeMapper.addSupplier(uuid, equipmentType, supplierList);
//更新base_equipment_id表
equipmentTypeMapper.setCalculationId(numStr, (String) msg.get("parentId"));
List<String> chekResult = supplierService.CheckSupplierList(req.getSupplierList());
if (chekResult.size() == 0) {
equipmentTypeMapper.addEquipment(equipmentType);
//先增加code码
BeanPlusUtil.copyProperties(req, type);
EquipmentType parentType = this.getById(this.getById(req.getId()).getParentId());
int newcode = parentType.getMaxCode() + 1;
type.setId(String.valueOf(newcode));
parentType.setMaxCode(newcode);
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS, numStr);
List<SupplierType> supplierType = new ArrayList<>();
req.getSupplierList().forEach(supply -> {
SupplierType st = new SupplierType();
st.setId(String.valueOf(UUID.randomUUID()));
st.setState(0);
st.setSupplierId(supply);
st.setTypeId(String.valueOf(newcode));
supplierType.add(st);
}
);
supplierTypeService.saveBatch(supplierType);
this.save(parentType);
return this.save(type);
} else {
throw new JYZBAppException(EquipmentTypeExceptionEnum.SUPPLIER_NOT_EXIST, String.join(",", chekResult));
}
}
@Override
......@@ -246,126 +176,51 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
}
@Override
public ResponseResult deleteEquipment(Map<String, Object> msg) {
// 进行参数校验
try {
checkNotBlank(msg.get("equipmentList"), "equipmentList不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, e.getMessage());
public Boolean deleteEquipment(QueryEquipmentTypeReq req) {
LambdaQueryWrapper<EquipmentType> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ObjectUtil.isNotEmpty(req.getId()), EquipmentType::getParentId, req.getParentId());
List<EquipmentType> eqList = list(wrapper);
if (eqList.size() > 0) {
throw new ServiceException(EquipmentTypeExceptionEnum.EQUIPMENT_CHILDREN_EXIST);
} else {
this.removeById(req.getId());
}
List<Object> equipmentList = (List<Object>) msg.get("equipmentList");
for (Object equipmentId : equipmentList) {
//判断装备id在数据库中是否存在
equipmentTypeMapper.deleteEquipment(equipmentId.toString());
}
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
return true;
}
@Override
public ResponseResult updateEquipment(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("id"), "id不能为空");
checkNotBlank(msg.get("name"), "name不能为空");
checkNotBlank(msg.get("parentId"), "parentId不能为空");
checkNotBlank(msg.get("supplierList"), "supplierList不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, e.getMessage());
}
public Boolean updateEquipment(QueryEquipmentTypeReq req) {
EquipmentType type = this.queryEqType(req);
BeanPlusUtil.copyProperties(req, type);
return this.updateById(type);
}
// //parentId只能是倒数第二级，因为插入的装备只能是最后一级
// String resultId = equipmentTypeMapper.getIdByParentId((String) msg.get("parentId"));
// if (resultId == null || resultId.equals("")){
// return new ResponseResult(HttpStatus.ERROR,ReturnMsg.ERROR,"传入的parentId有误，新的装备类型只能加在最后一级");
// }
//判断传入的供应商是否存在
List<String> supplierFlag = new ArrayList<>();
List<String> supplierList = (List<String>) msg.get("supplierList");
for (String supplierId : supplierList) {
Map<String, Object> oneSupplier = supplierMapper.getOneSupplier(supplierId, null, null);
if (oneSupplier == null || oneSupplier.isEmpty()) {
supplierFlag.add(supplierId);
}
}
if (supplierFlag != null) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, "传入的部分供应商不存在：" + supplierFlag);
}
private EquipmentType queryEqType(QueryEquipmentTypeReq req) {
EquipmentType type = this.getById(req.getId());
//计算出id后，判断数据库中是否已存在该id
String oneEquipment = equipmentTypeMapper.getOneEquipmentId(msg.get("id").toString());
if (oneEquipment == null || oneEquipment.equals("")) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, "未查询到相应的装备类型");
if (ObjectUtil.isNull(type)) {
throw new ServiceException(EquipmentTypeExceptionEnum.EQUIPMENT_TYPE_NOT_EXIST);
}
EquipmentType equipmentType = new EquipmentType();
//生成加入supplier-type表的uuid
String uuid = UUID.randomUUID().toString().replaceAll("-", "");
//修改警员相关信息
//生成当前时间
Date currentDate = DateTimeUtil.getCurrentDateTime();
equipmentType.setCreateTime(currentDate);
equipmentType.setUpdateTime(currentDate);
//police.setId(uuid);
equipmentType.setId((String) msg.get("id"));
equipmentType.setName((String) msg.get("name"));
equipmentType.setUnitType((String) msg.get("unitType"));
//equipmentType.setCode((String) msg.get("code"));
equipmentType.setParentId((String) msg.get("parentId"));
equipmentType.setNote((String) msg.get("note"));
// equipmentType.set((String) msg.get("updateUser"));
// equipmentType.setLocation((String) msg.get("location"));
// equipmentType.setPhone((String) msg.get("phone"));
// equipmentType.setUpdateTime(currentDate);
// equipmentType.setOrgId((String) msg.get("orgId"));
//删除装备的所有供应商信息，在将相关数据加入到supplier_type表
equipmentTypeMapper.deleteSupplier(equipmentType.getId());
//读取装备的供应商列表,将相关数据加入到supplier_type表
equipmentTypeMapper.addSupplier(uuid, equipmentType, supplierList);
equipmentTypeMapper.updateEquipment(equipmentType);
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
return type;
}
@Override
public ResponseResult changeEquipmentState(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("id"), "id不能为空");
Objects.requireNonNull(msg.get("state"), "state不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, e.getMessage());
public Boolean changeEquipmentState(UpdateEquipmentTypeReq req) {
EquipmentType equipment = this.getById(req.getId());
if (equipment != null) {
equipment.setState(Integer.valueOf(req.getState()));
}
EquipmentType equipment = new EquipmentType();
equipment.setId(msg.get("id").toString());
equipment.setState((Integer) msg.get("state"));
equipmentTypeMapper.changeEquipmentState(equipment);
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
return true;
}
@Override
public ResponseResult getOneEquipment(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("typeId"), "typeId不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, e.getMessage());
}
EquipmentType equipment = new EquipmentType();
equipment.setId(msg.get("typeId").toString());
Map<String, Object> oneEquipment = equipmentTypeMapper.getOneEquipment(equipment);
//返回对应的供应商信息
List<Map<String, Object>> supplierMsg = equipmentTypeMapper.getSupplierByTypeId(equipment);
oneEquipment.put("supplierList", supplierMsg);
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS, oneEquipment);
public EquipmentTypeDto getEquipment(QueryEquipmentTypeReq req) {
EquipmentTypeDto equipment = new EquipmentTypeDto();
BeanPlusUtil.copyProperties(this.getById(req.getId()), equipment);
return equipment;
}
@Override
......@@ -391,43 +246,11 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
}
@Override
public List<Map<String, Object>> showAllEquipment() {
List<EquipmentType> menuList = equipmentTypeMapper.selectAllEquipment();
List<Map<String, Object>> resultList = new ArrayList<>();
for (EquipmentType menu : menuList) {
//System.out.println(menu.getIdByParentId()+" "+menu.getName()+" "+menu.getParentId());
//00000000-0000-0000-0000-000000000000
//List<Map<String, Object>> children = getChildMenus(menu.getId(), menuList);
if (!menu.getName().equals("超级根") && menu.getParentId().equals("00000000-0000-0000-0000-000000000000")) {
//List<Map<String, Object>> children = getChildMenus(menu.getId(), menuList);
Map<String, Object> map = new HashMap<>();
map.put("id", menu.getId());
map.put("name", menu.getName());
map.put("unit", menu.getUnit());
map.put("unitType", menu.getUnitType());
map.put("code", menu.getCode());
map.put("parentId", menu.getParentId());
map.put("state", menu.getState());
map.put("note", menu.getNote());
map.put("createTime", menu.getCreateTime());
map.put("updateTime", menu.getUpdateTime());
//去掉最后一级children只能加两次
//map.put("children", children);
List<Map<String, Object>> children = getChildMenus(menu.getId(), menuList);
if (!children.isEmpty()) {
map.put("children", children);
}
resultList.add(map);
}
}
return resultList;
}
@Override
public ResponseResult getEquipmentDevelop() {
List<Map<String,Object>> returnMsg = equipmentTypeMapper.getEquipmentDevelop();
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,returnMsg);
List<Map<String, Object>> returnMsg = equipmentTypeMapper.getEquipmentDevelop();
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS, returnMsg);
}
private List<Map<String, Object>> getChildMenus(String parentId, List<EquipmentType> menuList) {
......@@ -456,5 +279,23 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
}
return childList;
}
private LambdaQueryWrapper<EquipmentType> createWrapper(QueryEquipmentTypeReq req) {
LambdaQueryWrapper<EquipmentType> wrapper = new LambdaQueryWrapper<>();
if (ObjectUtil.isEmpty(req)) {
return wrapper;
}
wrapper.like(ObjectUtil.isNotEmpty(req.getName()), EquipmentType::getName, req.getName());
wrapper.orderByDesc(EquipmentType::getCreateTime);
return wrapper;
}
}
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,8 +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 com.sun.jna.platform.win32.ObjBase;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
......
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;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ProductTagServiceImpl.java
......@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.dto.ProductTagDto;
import com.junmp.jyzb.api.bean.dto.SimpleTagDto;
import com.junmp.jyzb.api.bean.req.ProductTagReq;
import com.junmp.jyzb.api.bean.query.ProductTagReq;
import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
import com.junmp.jyzb.entity.ProductTag;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java
......@@ -3,23 +3,19 @@ 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.OrgUpdateReq;
import com.junmp.jyzb.api.bean.req.ProductTagReq;
import com.junmp.jyzb.entity.ProductSku;
import com.junmp.jyzb.entity.ProductTag;
import com.junmp.jyzb.api.bean.query.OrgUpdateReq;
import com.junmp.jyzb.api.bean.query.ProductTagReq;
import com.junmp.jyzb.entity.PubOrg;
import com.junmp.jyzb.utils.HttpStatus;
import com.junmp.jyzb.utils.RedisUtils;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.jyzb.utils.ReturnMsg;
import com.junmp.v2.common.util.BeanPlusUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import com.junmp.jyzb.mapper.PubOrgMapper;
import com.junmp.jyzb.service.PubOrgService;
import java.math.BigInteger;
import java.util.*;
import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ShelfServiceImpl.java
......@@ -3,16 +3,9 @@ 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.ProductReq;
import com.junmp.jyzb.api.bean.req.ShelfReq;
import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
import com.junmp.jyzb.api.bean.query.ShelfReq;
import com.junmp.jyzb.api.exception.enums.ShelfExceptionEnum;
import com.junmp.jyzb.api.util.GenCodeUtil;
import com.junmp.jyzb.entity.Product;
import com.junmp.jyzb.entity.Shelf;
import com.junmp.jyzb.entity.WarehouseArea;
import com.junmp.jyzb.mapper.WarehouseAreaMapper;
import com.junmp.jyzb.service.WarehouseAreaService;
import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.util.BeanPlusUtil;
import org.springframework.stereotype.Service;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/SupplierServiceImpl.java
......@@ -3,14 +3,9 @@ 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.ProductReq;
import com.junmp.jyzb.api.bean.req.SupplierReq;
import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
import com.junmp.jyzb.api.bean.query.SupplierReq;
import com.junmp.jyzb.api.exception.enums.SupplierExceptionEnum;
import com.junmp.jyzb.api.util.GenCodeUtil;
import com.junmp.jyzb.entity.Product;
import com.junmp.jyzb.entity.Supplier;
import com.junmp.jyzb.mapper.ProductMapper;
import com.junmp.jyzb.service.SupplierService;
import com.junmp.jyzb.utils.*;
import com.junmp.v2.common.exception.base.ServiceException;
......@@ -93,11 +88,7 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,uuid);
}
@Override
public Map<String,Object> getOneSupplier(String id,Object name,Object code) {
//读取msg中的检索信息
return supplierMapper.getOneSupplier(id,name,code);
}
@Override
public boolean deleteSupplier(SupplierReq req) {
......@@ -162,6 +153,33 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
}
public List<String> CheckSupplierList(List<String> req){
LambdaQueryWrapper<Supplier> wp = new LambdaQueryWrapper<>();
wp.in(ObjectUtil.isNotEmpty(req), Supplier::getId, req);
List<Supplier> st = list(wp);
List<String> nonexistentSuppliers = new ArrayList<>();
for (String supplierId : req) {
boolean found = false;
for (Supplier supplier : st) {
if (supplier.getId().equals(supplierId)) {
found = true;
break;
}
}
if (!found) {
nonexistentSuppliers.add(supplierId);
}
}
return nonexistentSuppliers;
}
@Override
public List<String> getAllSupplierId() {
List<String> msg = supplierMapper.getAllSupplierId();
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/SupplierTypeServiceImpl.java
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.query.SupplierTypeReq;
import com.junmp.jyzb.entity.SupplierType;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import com.junmp.jyzb.mapper.SupplierTypeMapper;
import com.junmp.jyzb.service.SupplierTypeService;
@Service
public class SupplierTypeServiceImpl implements SupplierTypeService{
public class SupplierTypeServiceImpl extends ServiceImpl<SupplierTypeMapper, SupplierType> implements SupplierTypeService{
@Resource
private SupplierTypeMapper supplierTypeMapper;
private LambdaQueryWrapper<SupplierType> createWrapper(SupplierTypeReq req) {
LambdaQueryWrapper<SupplierType> wrapper = new LambdaQueryWrapper<>();
if (ObjectUtil.isEmpty(req)) {
return wrapper;
}
//根据供应商短码查询查询
wrapper.in(ObjectUtil.isNotEmpty(req.getSupplierId()), SupplierType::getSupplierId, req.getSupplierId());
//供应商ID模糊查询
wrapper.in(ObjectUtil.isNotEmpty(req.getTypeId()), SupplierType::getTypeId, req.getTypeId());
//根据创建时间降序
wrapper.orderByDesc(SupplierType::getCreateTime);
return wrapper;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/WarehouseAreaServiceImpl.java
......@@ -3,14 +3,9 @@ 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.ProductReq;
import com.junmp.jyzb.api.bean.req.WarehouseAreaReq;
import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
import com.junmp.jyzb.api.bean.query.WarehouseAreaReq;
import com.junmp.jyzb.api.exception.enums.WarehouseAreaExceptionEnum;
import com.junmp.jyzb.entity.Product;
import com.junmp.jyzb.entity.Warehouse;
import com.junmp.jyzb.entity.WarehouseArea;
import com.junmp.jyzb.mapper.ProductMapper;
import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.util.BeanPlusUtil;
import org.springframework.stereotype.Service;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/WarehouseServiceImpl.java
......@@ -3,9 +3,9 @@ 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.WarehouseAreaReq;
import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.jyzb.api.bean.req.WarehouseReq;
import com.junmp.jyzb.api.bean.query.WarehouseAreaReq;
import com.junmp.jyzb.api.bean.query.ProductReq;
import com.junmp.jyzb.api.bean.query.WarehouseReq;
import com.junmp.jyzb.api.exception.enums.WarehouseExceptionEnum;
import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.mapper.*;
......
jyzb-process/src/main/java/com/junmp/junmpProcess/controller/BpmnController.java
package com.junmp.junmpProcess.controller;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.junmp.junmpProcess.common.R;
import com.junmp.junmpProcess.common.Result;
import com.junmp.junmpProcess.dto.*;
import com.junmp.junmpProcess.dto.json.JunmpUserInfo;
import com.junmp.junmpProcess.dto.json.UserInfo;
import com.junmp.junmpProcess.entity.ProcessTemplates;
import com.junmp.junmpProcess.exception.WorkFlowException;
import com.junmp.junmpProcess.service.Repository.ProcessTemplateService;
import com.junmp.junmpProcess.utils.BpmnConvert;
import com.junmp.junmpProcess.utils.FormAndOrder;
import com.junmp.junmpProcess.vo.*;
import com.junmp.jyzb.api.bean.req.ProcessReq.FormReq;
import com.junmp.jyzb.api.bean.req.ProcessReq.SuspendOrActivateDefinitionReq;
import com.junmp.jyzb.api.bean.req.ProductSkuReq;
import com.junmp.jyzb.api.bean.vo.TagInfoVo;
import com.junmp.jyzb.entity.ProductSku;
import com.junmp.jyzb.api.bean.query.ProcessReq.FormReq;
import com.junmp.jyzb.api.bean.query.ProcessReq.SuspendOrActivateDefinitionReq;
import com.junmp.jyzb.utils.HttpStatus;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.jyzb.utils.ReturnMsg;
......@@ -32,28 +15,11 @@ import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import com.junmp.junmpProcess.service.Bussiness.WorkProcessService;
import org.flowable.bpmn.model.BpmnModel;
import org.flowable.bpmn.model.FlowElement;
import org.flowable.common.engine.impl.identity.Authentication;
import org.flowable.engine.*;
import org.flowable.engine.repository.Deployment;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.runtime.ActivityInstance;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.engine.runtime.ProcessInstanceBuilder;
import org.flowable.task.api.DelegationState;
import org.flowable.task.api.Task;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.sql.DataSource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......
jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/WorkProcessService.java
package com.junmp.junmpProcess.service.Bussiness;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.junmp.junmpProcess.common.Result;
import com.junmp.junmpProcess.dto.*;
import com.junmp.junmpProcess.entity.ProcessTemplates;
import com.junmp.junmpProcess.vo.*;
import com.junmp.jyzb.api.bean.req.ProcessReq.FormReq;
import com.junmp.jyzb.api.bean.req.ProcessReq.SuspendOrActivateDefinitionReq;
import com.junmp.jyzb.entity.ProductSku;
import com.junmp.jyzb.api.bean.query.ProcessReq.FormReq;
import com.junmp.jyzb.api.bean.query.ProcessReq.SuspendOrActivateDefinitionReq;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.v2.common.bean.request.BaseRequest;
import com.junmp.v2.common.bean.response.ApiRes;
......
jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java
......@@ -27,9 +27,8 @@ import com.junmp.junmpProcess.service.Repository.ProcessTemplateService;
import com.junmp.junmpProcess.utils.IdWorker;
import com.junmp.junmpProcess.utils.SpringContextHolder;
import com.junmp.junmpProcess.vo.*;
import com.junmp.jyzb.api.bean.req.ProcessReq.FormReq;
import com.junmp.jyzb.api.bean.req.ProcessReq.SuspendOrActivateDefinitionReq;
import com.junmp.jyzb.entity.Inventory;
import com.junmp.jyzb.api.bean.query.ProcessReq.FormReq;
import com.junmp.jyzb.api.bean.query.ProcessReq.SuspendOrActivateDefinitionReq;
import com.junmp.jyzb.utils.HttpStatus;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.jyzb.utils.ReturnMsg;
......@@ -58,7 +57,6 @@ import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.runtime.Execution;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.engine.runtime.ProcessInstanceBuilder;
import org.flowable.engine.runtime.ProcessInstanceQuery;
import org.flowable.engine.task.Attachment;
import org.flowable.engine.task.Comment;
import org.flowable.task.api.DelegationState;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论