Skip to content

J
jyzb_platformV2
Commit 13a1290d by 李小惠
Options

提交单警柜和人脸指纹接口

parents 19a1f042 2d1905eb
正在显示 包含 4143 行增加 和 743 行删除
.gitignore
......@@ -45,14 +45,18 @@ Thumbs.db
/.idea/artifacts/jyzb3.xml
/jyzb-mq/jyzb-mq-consumer/target/classes/application.yml
/jyzb-mq/jyzb-mq-producer/target/classes/application.yml
/jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventoryMapper.java.orig
/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java.orig
/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java.orig
/jyzb-boot/pom.xml.orig
/jyzb-mq/jyzb-mq-consumer/src/main/java/com/junmp/jyzb/config/DirectReceiver.java.orig
/jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController111.java
/jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController111.java
/jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController111.java
/jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController111.java
/jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController111.java
/jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController111.java
/jyzb-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
.gitignore.orig deleted 100644 → 0
<<<<<<< HEAD
/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/*
=======
/jyzb-boot/target
>>>>>>> develop
.idea/encodings.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$APPLICATION_HOME_DIR$/jbr/bin/src/main/java" charset="UTF-8" />
<file url="file://$APPLICATION_HOME_DIR$/jbr/bin/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-api/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-biz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-biz/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-boot/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-boot/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-common/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-common/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-mq/jyzb-mq-consumer/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-mq/jyzb-mq-consumer/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-mq/jyzb-mq-producer/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-mq/jyzb-mq-producer/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-mq/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-mq/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-process/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-process/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
.idea/jarRepositories.xml
......@@ -9,12 +9,12 @@
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
<option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
......
.idea/modules.xml
......@@ -7,6 +7,7 @@
<module fileurl="file://$PROJECT_DIR$/jyzb-boot/jyzb-boot.iml" filepath="$PROJECT_DIR$/jyzb-boot/jyzb-boot.iml" />
<module fileurl="file://$PROJECT_DIR$/jyzb-mq/jyzb-mq-consumer/jyzb-mq-consumer.iml" filepath="$PROJECT_DIR$/jyzb-mq/jyzb-mq-consumer/jyzb-mq-consumer.iml" />
<module fileurl="file://$PROJECT_DIR$/jyzb-mq/jyzb-mq-producer/jyzb-mq-producer.iml" filepath="$PROJECT_DIR$/jyzb-mq/jyzb-mq-producer/jyzb-mq-producer.iml" />
<module fileurl="file://$PROJECT_DIR$/jyzb-process/jyzb-process.iml" filepath="$PROJECT_DIR$/jyzb-process/jyzb-process.iml" />
</modules>
</component>
</project>
\ No newline at end of file
jyzb-api/jyzb-api.iml
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.20" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:junmp-v2-common:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.github.oshi:oshi-core:6.3.2" level="project" />
<orderEntry type="library" name="Maven: net.java.dev.jna:jna:5.12.1" level="project" />
<orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:5.12.1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.4.4" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.6.3" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.27" level="project" />
<orderEntry type="library" name="Maven: com.github.whvcse:easy-captcha:1.6.2" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-validator-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-db-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-config-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.2" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.10" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.4.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.4" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.5" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.2.4" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.7.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.4" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
<orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
</component>
</module>
\ No newline at end of file
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentSizeDto.java deleted 100644 → 0
//package com.junmp.jyzb.api.bean.dto;
//
//import lombok.Data;
//
//@Data
//public class EquipmentSizeDto {
// /**
// * 号型ID
// */
// private String id;
//
// /**
// * 号型名称
// */
// private String name;
//}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentSupplierDto.java deleted 100644 → 0
//package com.junmp.jyzb.api.bean.dto;
//
//import lombok.Data;
//
//@Data
//public class EquipmentSupplierDto {
// /**
// * 类型ID
// */
// private String id;
//
// /**
// * 类型名称
// */
// private String name;
//}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentTypeDto.java deleted 100644 → 0
//package com.junmp.jyzb.api.bean.dto;
//
//import lombok.Data;
//
//@Data
//public class EquipmentTypeDto {
// /**
// * 类型ID
// */
// private String id;
//
// /**
// * 类型名称
// */
// private String name;
//
//}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/InventorySumDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto;
import lombok.Data;
@Data
public class InventorySumDto {
/**
* 组织机构
*/
private String OrgName;
/**
* 位置
*/
private String locationType;
/**
*总数
*/
private int Num;
/**
*总价
*/
private int totalPrice;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/EquipmentSizeReq.java 0 → 100644
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;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/InventoryReq.java
......@@ -99,8 +99,4 @@ public class InventoryReq extends BaseRequest {
* 是否遗失
*/
private int lostFlag ;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/InventorySumReq.java 0 → 100644
package com.junmp.jyzb.api.bean.req;
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
@EqualsAndHashCode(callSuper = false)
public class InventorySumReq {
/**
* 批次主键
*/
@NotBlank(message = "组织机构号不能为空", groups = {ValidationApi.edit.class})
private Long orgId;
/**
* 位置ID
*/
private String orgName;
/**
* 位置ID
*/
private String locationId;
/**
* 位置信息
*/
private String locationName;
/**
* 类型ID
*/
private String typeId;
/**
* 号型ID
*/
private String sizeId;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/OrgUpdateReq.java 0 → 100644
package com.junmp.jyzb.api.bean.req;
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 java.util.List;
@Data
@EqualsAndHashCode(callSuper = false)
public class OrgUpdateReq extends BaseRequest {
/**
* 状态
*/
@NotBlank(message = "状态不能为空", groups = {ValidationApi.edit.class})
private String statusFlag;
/**
* 组织机构列表
*/
private List<orgIdList> orgIdList;
private class orgIdList {
/**
* 状态
*/
@NotBlank(message = "组织机构id不能为空", groups = {ValidationApi.edit.class})
private int id;
}
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/PolicemanReq.java.orig 0 → 100644
<<<<<<< HEAD
package com.junmp.jyzb.api.bean.req;
import com.baomidou.mybatisplus.annotation.TableField;
import com.junmp.v2.common.bean.request.BaseRequest;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
public class PolicemanReq extends BaseRequest {
@NotNull(message = "警员主键不能为空", groups = {edit.class, delete.class, detail.class})
private String id;
@NotNull(message = "警员名字不能为空", groups = {edit.class, delete.class, detail.class})
private String name;
private String cabinetBoxId;
@NotNull(message = "组织机构不能为空", groups = {edit.class, delete.class, detail.class})
private String orgId;
private Long orgIdInt;
private Long departmentId;
private String policeCode;
private String sex;
private String faceInfo;
private Boolean isCreatedAccount;
private String doorCode;
private String password;
private String photo;
private String phone;
private Date createTime;
private Date updateTime;
private String idCard;
private String updateUser;
private Integer state;
private static final long serialVersionUID = 1L;
}
=======
package com.junmp.jyzb.api.bean.req;
import com.baomidou.mybatisplus.annotation.TableField;
import com.junmp.v2.common.bean.request.BaseRequest;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = false)
public class PolicemanReq extends BaseRequest {
@NotNull(message = "警员主键不能为空", groups = {edit.class, delete.class, detail.class})
private String id;
private String name;
private String cabinetBoxId;
private Long orgIdInt;
private String orgId;
private Long departmentId;
private String policeCode;
private String sex;
private String faceInfo;
private Boolean isCreatedAccount;
private String doorCode;
private String password;
private String photo;
private String phone;
private Date createTime;
private Date updateTime;
private String idCard;
private String updateUser;
private Integer state;
}
>>>>>>> 2d1905eb57c664c7853f98789c36483e5ba60371
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ProcessReq/FormReq.java 0 → 100644
package com.junmp.jyzb.api.bean.req.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
//@EqualsAndHashCode(callSuper = true)
public class FormReq {
/**
* 表单名称
*/
@NotNull(message = "表单名字不能为空", groups = {ValidationApi.edit.class, ValidationApi.delete.class, ValidationApi.detail.class})
private String formName;
/**
* 备注信息
*/
private String remark;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ProcessReq/ProcessBaseReq.java 0 → 100644
package com.junmp.jyzb.api.bean.req.ProcessReq;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class ProcessBaseReq {
/**********************任务相关的参数**********************/
/**
* 任务id 必填
*/
private String taskId;
/**
* 审批意见 必填
*/
private String message;
/**
* 流程实例的id 必填
*/
// @NotNull(“流程实”)
private String processInstanceId;
private String type;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ProcessReq/SuspendOrActivateDefinitionReq.java 0 → 100644
package com.junmp.jyzb.api.bean.req.ProcessReq;
import com.junmp.v2.common.bean.request.ValidationApi;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class SuspendOrActivateDefinitionReq {
/**
* 流程定义ID
*/
@NotNull(message = "流程定义不能为空", groups = {ValidationApi.edit.class, ValidationApi.delete.class, ValidationApi.detail.class})
private String processDefinitionId;
/**
* 表单
*/
private String TemplateId;
/**
* 备注信息
*/
private Boolean isStop;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ShelfReq.java 0 → 100644
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;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/SupplierReq.java 0 → 100644
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;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/WarehouseAreaReq.java 0 → 100644
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;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/WarehouseReq.java 0 → 100644
package com.junmp.jyzb.api.bean.req;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.junmp.v2.common.bean.request.BaseRequest;
import io.swagger.annotations.ApiModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
public class WarehouseReq extends BaseRequest {
@NotNull(message = "仓库主键不能为空", groups = {edit.class, delete.class, detail.class})
private String id;
private Long departmentId;
private String name;
private String location;
private String phone;
private String video;
private Date createTime;
private Date updateTime;
private String updateUser;
@JsonProperty(value = "orgId")
private Long orgId;
private Boolean isLocked;
private Integer sum;
private Integer outSum;
private Integer inSum;
private BigDecimal priceTotal;
private Integer state;
private Long orderId;
@JsonProperty(value = "IncludeLowerLevel")
private String IncludeLowerLevel;
}
\ No newline at end of file
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/ProductExceptionEnum.java
......@@ -26,6 +26,11 @@ public enum ProductExceptionEnum implements IExceptionEnum {
PRODUCT_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 12, "产品信息不存在"),
/**
* 号型信息不存在
*/
SIZE_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/ShelfExceptionEnum.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 ShelfExceptionEnum implements IExceptionEnum {
/**
* 货架信息不存在
*/
SHELF_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, "号型不存在"),
/**
* 批次信息不存在
*/
BATCH_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 14, "批次不存在"),
/**
* 批次信息不存在
*/
BATCH_PROCESSED(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 15, "批次已生产"),
/**
* 批次生产已完成
*/
BATCH_PROCESSED_DONE(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 16, "批次生产已完成"),
/**
* 批次生产已完成
*/
MODIFY_NUM_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 17, "批次生产已完成,数量不能小于原数量"),
/**
* 标签信息不存在
*/
TAG_INFO_NOT_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 19, "标签信息不存在"),
/**
* 标签信息初始化完成
*/
TAG_INFO_INIT_DONE(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 20, "检查标签信息是否绑定完成"),
/**
* 标签已绑定
*/
TAG_INFO_HAD_BINDING(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 21, "标签已绑定"),
/**
* 确认绑定是否已完成
*/
TAG_UID_BINDING_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 22, "确认绑定是否已完成"),
/**
* 标签重复
*/
TAG_INFO_REPEAT_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 23, "标签重复"),
;
/**
* 错误编码
*/
private final Integer code;
/**
* 提示用户信息
*/
private final String message;
ShelfExceptionEnum(Integer code, String message) {
this.code = code;
this.message = message;
}
}
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/SupplierExceptionEnum.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 SupplierExceptionEnum implements IExceptionEnum {
/**
* 供应商信息不存在
*/
SUPPLIER_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, "号型不存在"),
/**
* 批次信息不存在
*/
BATCH_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 14, "批次不存在"),
/**
* 批次信息不存在
*/
BATCH_PROCESSED(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 15, "批次已生产"),
/**
* 批次生产已完成
*/
BATCH_PROCESSED_DONE(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 16, "批次生产已完成"),
/**
* 批次生产已完成
*/
MODIFY_NUM_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 17, "批次生产已完成,数量不能小于原数量"),
/**
* 标签信息不存在
*/
TAG_INFO_NOT_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 19, "标签信息不存在"),
/**
* 标签信息初始化完成
*/
TAG_INFO_INIT_DONE(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 20, "检查标签信息是否绑定完成"),
/**
* 标签已绑定
*/
TAG_INFO_HAD_BINDING(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 21, "标签已绑定"),
/**
* 确认绑定是否已完成
*/
TAG_UID_BINDING_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 22, "确认绑定是否已完成"),
/**
* 标签重复
*/
TAG_INFO_REPEAT_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 23, "标签重复"),
;
/**
* 错误编码
*/
private final Integer code;
/**
* 提示用户信息
*/
private final String message;
SupplierExceptionEnum(Integer code, String message) {
this.code = code;
this.message = message;
}
}
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/WarehouseAreaExceptionEnum.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 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, "号型不存在"),
/**
* 批次信息不存在
*/
BATCH_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 14, "批次不存在"),
/**
* 批次信息不存在
*/
BATCH_PROCESSED(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 15, "批次已生产"),
/**
* 批次生产已完成
*/
BATCH_PROCESSED_DONE(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 16, "批次生产已完成"),
/**
* 批次生产已完成
*/
MODIFY_NUM_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 17, "批次生产已完成,数量不能小于原数量"),
/**
* 标签信息不存在
*/
TAG_INFO_NOT_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 19, "标签信息不存在"),
/**
* 标签信息初始化完成
*/
TAG_INFO_INIT_DONE(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 20, "检查标签信息是否绑定完成"),
/**
* 标签已绑定
*/
TAG_INFO_HAD_BINDING(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 21, "标签已绑定"),
/**
* 确认绑定是否已完成
*/
TAG_UID_BINDING_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 22, "确认绑定是否已完成"),
/**
* 标签重复
*/
TAG_INFO_REPEAT_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 23, "标签重复"),
;
/**
* 错误编码
*/
private final Integer code;
/**
* 提示用户信息
*/
private final String message;
WarehouseAreaExceptionEnum(Integer code, String message) {
this.code = code;
this.message = message;
}
}
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/WarehouseExceptionEnum.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 WarehouseExceptionEnum implements IExceptionEnum {
/**
* 仓库信息不存在
*/
WAREHOUSE_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, "号型不存在"),
/**
* 批次信息不存在
*/
BATCH_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 14, "批次不存在"),
/**
* 批次信息不存在
*/
BATCH_PROCESSED(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 15, "批次已生产"),
/**
* 批次生产已完成
*/
BATCH_PROCESSED_DONE(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 16, "批次生产已完成"),
/**
* 批次生产已完成
*/
MODIFY_NUM_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 17, "批次生产已完成,数量不能小于原数量"),
/**
* 标签信息不存在
*/
TAG_INFO_NOT_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 19, "标签信息不存在"),
/**
* 标签信息初始化完成
*/
TAG_INFO_INIT_DONE(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 20, "检查标签信息是否绑定完成"),
/**
* 标签已绑定
*/
TAG_INFO_HAD_BINDING(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 21, "标签已绑定"),
/**
* 确认绑定是否已完成
*/
TAG_UID_BINDING_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 22, "确认绑定是否已完成"),
/**
* 标签重复
*/
TAG_INFO_REPEAT_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 23, "标签重复"),
;
/**
* 错误编码
*/
private final Integer code;
/**
* 提示用户信息
*/
private final String message;
WarehouseExceptionEnum(Integer code, String message) {
this.code = code;
this.message = message;
}
}
jyzb-biz/jyzb-biz.iml
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<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" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.4.4" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.44" level="project" />
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.44" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.5" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-db-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-config-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.2" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.10" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.4.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.4" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.5" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.2.4" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:junmp-v2-common:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.github.oshi:oshi-core:6.3.2" level="project" />
<orderEntry type="library" name="Maven: net.java.dev.jna:jna:5.12.1" level="project" />
<orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:5.12.1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.27" level="project" />
<orderEntry type="library" name="Maven: com.github.whvcse:easy-captcha:1.6.2" level="project" />
<orderEntry type="module" module-name="jyzb-api" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-validator-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.7.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
<orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:auth-sdk:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:auth-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-cache-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-cache-memory:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:security-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-cache-redis:1.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.4.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.4.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.4.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.5" level="project" />
<orderEntry type="library" name="Maven: redis.clients:jedis:3.3.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.9.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-jwt-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:system-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:scanner-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:message-api:1.0.0" level="project" />
<orderEntry type="module" module-name="jyzb-common" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-log-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-job-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:31.1-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.12.0" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.11.0" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
</component>
</module>
\ No newline at end of file
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.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;
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;
......@@ -28,50 +33,47 @@ public class EquipmentSizeController {
@PostMapping("/AddSize")
@ApiOperation("添加号型信息")
public ResponseResult addSize(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = equipmentSizeService.addSize(msg);
return returnMsg;
public ApiRes<Boolean> addSize(@RequestBody @Validated(EquipmentSizeReq.add.class) EquipmentSizeReq req) {
return ApiRes.success(equipmentSizeService.addSize(req));
}
@PostMapping("/DeleteSize")
@ApiOperation("删除号型信息")
public ResponseResult deleteSize(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = equipmentSizeService.deleteSize(msg);
return returnMsg;
public ApiRes<Boolean> deleteSize(@RequestBody @Validated(EquipmentSizeReq.delete.class)EquipmentSizeReq req) {
// ResponseResult returnMsg = equipmentSizeService.deleteSize(msg);
// return returnMsg;
return ApiRes.success(equipmentSizeService.deleteSize(req));
}
@PostMapping("/GetOneSize")
@ApiOperation("查询单个号型信息")
public ResponseResult getOneSize(@RequestBody Map<String, Object> msg) {
ResponseResult returnMsg = equipmentSizeService.getOneSize(msg);
return returnMsg;
public ApiRes<EquipmentSize> getOneSize(@RequestBody EquipmentSizeReq req) {
//ResponseResult returnMsg =
return ApiRes.success(equipmentSizeService.getOneSize(req));
}
@PostMapping("/ShowSize")
@ApiOperation("根据装备类型查询号型")
public ResponseResult getAllSize(@RequestBody Map<String, Object> msg){
ResponseResult returnMsg = equipmentSizeService.getAllSize(msg);
return returnMsg;
public ApiRes<List<EquipmentSize>> getAllSize(@RequestBody EquipmentSizeReq req){
return ApiRes.success(equipmentSizeService.getAllSize(req));
}
@PostMapping("/UpdateSize")
@ApiOperation("修改号型信息")
public ResponseResult updateSize(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = equipmentSizeService.updateSize(msg);
return returnMsg;
public ApiRes<Boolean> updateSize(@RequestBody @Validated(EquipmentSizeReq.edit.class) EquipmentSizeReq req) {
return ApiRes.success(equipmentSizeService.updateSize(req));
}
@PostMapping("/ChangeSizeState")
@ApiOperation("禁用/启用装备号型")
public ResponseResult changeSizeState(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = equipmentSizeService.changeSizeState(msg);
return returnMsg;
public ApiRes<Boolean> changeSizeState(@RequestBody @Validated(EquipmentSizeReq.edit.class) EquipmentSizeReq req) {
return ApiRes.success(equipmentSizeService.changeSizeState(req));
}
@PostMapping("/GetSizeDevelop")
@ApiOperation("获取号型表所有信息(非树表)")
public ResponseResult getSizeDevelop() {
public ApiRes<EquipmentSize> getSizeDevelop() {
ResponseResult returnMsg = equipmentSizeService.getSizeDevelop();
return returnMsg;
return null;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentTypeController.java
......@@ -3,6 +3,7 @@ package com.junmp.jyzb.controller;
import com.junmp.jyzb.service.EquipmentTypeService;
import com.junmp.jyzb.utils.HttpStatus;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.v2.common.bean.response.ApiRes;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
......@@ -35,7 +36,7 @@ public class EquipmentTypeController {
}
@PostMapping("/DeleteEquipment")
@ApiOperation("删除仓库信息")
@ApiOperation("删除装备信息")
public ResponseResult deleteEquipment(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = equipmentTypeService.deleteEquipment(msg);
return returnMsg;
......@@ -50,16 +51,16 @@ public class EquipmentTypeController {
@PostMapping("/ShowEquipmentList")
@ApiOperation("查询类别列表")
public ResponseResult ShowEquipmentList() {
ResponseResult returnMsg = equipmentTypeService.getEquipmentList();
return returnMsg;
public ApiRes<List<Map<String,Object>>> ShowEquipmentList() {
return ApiRes.success(equipmentTypeService.getEquipmentList());
}
@PostMapping("/ShowAllEquipment")
@ApiOperation("查询整颗物资树")
public ResponseResult showAllEquipment() {
List<Map<String, Object>> equipmentList = equipmentTypeService.showAllEquipment();
return new ResponseResult(HttpStatus.SUCCESS,"操作成功",equipmentList);
// return new ResponseResult(HttpStatus.SUCCESS,"操作成功",equipmentList);
return null;
}
@PostMapping("/GetEquipmentDetail")
......
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.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;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
......@@ -27,12 +34,13 @@ import java.util.Map;
public class InventoryController {
@Resource
public InventoryService inventoryService;
@Resource
public InventorySummaryService inventorySummaryService;
@PostMapping("/GetEquipmentInfo")
@ApiOperation("根据组织机构或者仓库查询库存信息")
public ResponseResult getEquipmentInfo(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = inventoryService.getEquipmentInfo(msg);
return returnMsg;
@ApiOperation("根据组织机构查询库存信息")
public ApiRes<PageResult<InventorySummary>> getEquipmentInfo(@RequestBody InventorySumReq req) {
return ApiRes.success(inventorySummaryService.getEquipmentInfo(req));
}
@PostMapping("/SetInventoryMsg")
......@@ -43,7 +51,7 @@ public class InventoryController {
}
@PostMapping("/GetInventoryList")
@ApiOperation("查询库存详细信息")
@ApiOperation("查询库存汇总信息")
public ResponseResult getInventoryList(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = inventoryService.getInventoryList(msg);
return returnMsg;
......@@ -54,6 +62,12 @@ public class InventoryController {
public ApiRes<InventoryDto> getDetail(@RequestBody InventoryReq req) {
return ApiRes.success(inventoryService.getInventoryDetail(req));
}
@PostMapping("/getEquipmentInfo")
@ApiOperation("查询库存明细信息")
public ResponseResult getEquipmentInfo(@RequestBody Map<String, Object> msg) {
ResponseResult returnMsg = inventoryService.getEquipmentInfo(msg);
return returnMsg;
}
@PostMapping("/UpdateInventoryNum")
@ApiOperation("手动重置库存数量信息")
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/OrderController.java
......@@ -25,27 +25,27 @@ public class OrderController {
@ApiOperation("新增任务单")
public ResponseResult addOrder(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = orderService.addOrder(msg);
return returnMsg;
return null;
}
@PostMapping("/ShowOrder")
@ApiOperation("查询任务列表")
public ResponseResult showOrder(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = orderService.showOrder(msg);
return returnMsg;
return null;
}
@PostMapping("/UpdateOrder")
@ApiOperation("修改任务单")
public ResponseResult updateOrder(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg =orderService.updateOrder(msg);
return returnMsg;
return null;
}
@PostMapping("/GetOrderDetail")
@ApiOperation("根据订单id查看业务明细")
public ResponseResult getOrderDetail(@RequestBody Map<String, Object> msg){
ResponseResult returnMsg = orderService.getOrderDetail(msg);
return returnMsg;
return null;
}
}
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;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
......@@ -24,19 +26,19 @@ public class PubOrgController {
@PostMapping("/ShowPubOrgList")
@ApiOperation("查询组织机构列表_简化版")
public ResponseResult ShowEquipmentList(@RequestBody Map<String, Object> orgId) {
public ApiRes<List<Map<String,Object>>> ShowEquipmentList(@RequestBody Map<String, Object> orgId) {
//传入当前的组织机构id，展示所有本级及下级的
ResponseResult returnMsg = pubOrgService.showPubOrgList(orgId);
return returnMsg;
//ResponseResult returnMsg = pubOrgService.showPubOrgList(orgId);
return ApiRes.success(pubOrgService.showPubOrgList(orgId));
}
@PostMapping("/ChangeOrgState")
@ApiOperation("改变组织机构状态信息")
public ResponseResult changeOrgState(@RequestBody Map<String, Object> msg) {
//传入当前的组织机构id，展示所有本级及下级的
ResponseResult returnMsg = pubOrgService.changeOrgState(msg);
return returnMsg;
}
// @PostMapping("/ChangeOrgState")
// @ApiOperation("改变组织机构状态信息")
// public ResponseResult changeOrgState(@RequestBody OrgUpdateReq req) {
// //传入当前的组织机构id，展示所有本级及下级的
// ResponseResult returnMsg = pubOrgService.changeOrgState(msg);
// return returnMsg;
// }
// @PostMapping("/ShowAllPubOrgList")
// @ApiOperation("查询组织机构列表(含禁用)")
......@@ -46,13 +48,13 @@ public class PubOrgController {
// return returnMsg;
// }
// @PostMapping("/ShowPubOrgListOld")
// @ApiOperation("查询组织机构列表_完整版")
// public ResponseResult showPubOrgListOld(@RequestBody Map<String, Object> orgId) {
// //传入当前的组织机构id，展示所有本级及下级的
// ResponseResult returnMsg = pubOrgService.showPubOrgListOld(orgId);
// return returnMsg;
// }
@PostMapping("/ShowPubOrgListOld")
@ApiOperation("查询组织机构列表_完整版")
public ResponseResult showPubOrgListOld(@RequestBody Map<String, Object> orgId) {
//传入当前的组织机构id，展示所有本级及下级的
ResponseResult returnMsg = pubOrgService.showPubOrgListOld(orgId);
return returnMsg;
}
@PostMapping("/SetOrgParentIds")
@ApiOperation("填充组织机构的parent_ids字段")
......
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.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;
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;
......@@ -28,23 +34,20 @@ public class SupplierController {
@PostMapping("/AddSupplier")
@ApiOperation("添加供应商")
public ResponseResult addSupplier(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = supplierService.addSupplier(msg);
return returnMsg;
public ApiRes<Boolean> addSupplier(@RequestBody @Validated(SupplierReq.add.class) SupplierReq req) {
return ApiRes.success(supplierService.addSupplier(req));
}
@PostMapping("/DeleteSupplier")
@ApiOperation("删除供应商信息")
public ResponseResult deleteSupplier(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = supplierService.deleteSupplier(msg);
return returnMsg;
public ApiRes<Boolean> deleteSupplier(@RequestBody @Validated(SupplierReq.delete.class)SupplierReq req) {
return ApiRes.success(supplierService.deleteSupplier(req));
}
@PostMapping("/ShowSupplier")
@ApiOperation("查询供应商列表")
public ResponseResult getAllSupplier(@RequestBody Map<String,Object> msg){
ResponseResult returnMsg = supplierService.getAllSupplier(msg);
return returnMsg;
public ApiRes<List<Supplier>> showSupplier(SupplierReq req){
return ApiRes.success(supplierService.showSupplier(req));
}
// @PostMapping("/GetOneSupplier")
......@@ -57,15 +60,13 @@ public class SupplierController {
@PostMapping("/UpdateSupplier")
@ApiOperation("修改供应商信息")
public ResponseResult updateSupplier(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = supplierService.updateSupplier(msg);
return returnMsg;
public ApiRes<Boolean> updateSupplier(@RequestBody @Validated(SupplierReq.edit.class) SupplierReq req) {
return ApiRes.success(supplierService.updateSupplier(req));
}
@PostMapping("/ChangeSupplierState")
@ApiOperation("修改警员状态")
public ResponseResult changeSupplierState(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = supplierService.changeSupplierState(msg);
return returnMsg;
@ApiOperation("修改供应商状态")
public ApiRes<Boolean> changeSupplierState(@RequestBody @Validated(SupplierReq.edit.class) SupplierReq 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.service.PoliceFingerService;
import com.junmp.jyzb.service.PolicemanService;
import com.junmp.jyzb.service.WarehouseService;
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.jyzb.api.bean.req.*;
import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.service.*;
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;
@RestController
@Slf4j
......@@ -28,32 +24,50 @@ public class WarehouseController {
@Resource
public WarehouseService warehouseService;
@Resource
public WarehouseAreaService warehouseAreaService;
@Resource
public ShelfService shelfService;
// @PostMapping("/AddWarehouse")
// @ApiOperation("添加仓库")
// public ResponseResult addWarehouse(@RequestBody Map<String,Object> msg) {
// ResponseResult returnMsg = warehouseService.addWarehouse(msg);
// return returnMsg;
// }
@PostMapping("/AddWarehouse")
@ApiOperation("添加仓库")
public ResponseResult addWarehouse(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = warehouseService.addWarehouse(msg);
return returnMsg;
public ApiRes<Boolean> addWarehouse(@RequestBody @Validated(WarehouseReq.add.class) WarehouseReq req) {
//ResponseResult returnMsg = warehouseService.addWarehouse(msg);
return ApiRes.success(warehouseService.addWarehouse(req));
}
// @PostMapping("/DeleteWarehouse")
// @ApiOperation("删除仓库信息")
// public ResponseResult deleteWarehouse(@RequestBody Map<String,Object> msg) {
// ResponseResult returnMsg = warehouseService.deleteWarehouse(msg);
// return returnMsg;
// }
@PostMapping("/DeleteWarehouse")
@ApiOperation("删除仓库信息")
public ResponseResult deleteWarehouse(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = warehouseService.deleteWarehouse(msg);
return returnMsg;
public ApiRes<Boolean> deleteWarehouse(@RequestBody @Validated(WarehouseReq.delete.class)WarehouseReq req) {
//ResponseResult returnMsg = warehouseService.deleteWarehouse(msg);
return ApiRes.success(warehouseService.deleteWarehouse(req));
}
@PostMapping("/ChangeWarehouseState")
@ApiOperation("禁用/启用仓库")
public ResponseResult changeWarehouseState(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = warehouseService.changeWarehouseState(msg);
return returnMsg;
public ApiRes<Boolean> changeWarehouseState(@RequestBody @Validated(WarehouseReq.edit.class) WarehouseReq req) {
return ApiRes.success(warehouseService.changeWarehouseState(req));
}
@PostMapping("/ShowWarehouse")
@ApiOperation("查询仓库列表")
public ResponseResult getAllWarehouse(@RequestBody Map<String, Object> orgId){
ResponseResult returnMsg = warehouseService.getAllWarehouse(orgId);
return returnMsg;
public ApiRes<List<Warehouse>> getAllWarehouse(@RequestBody WarehouseReq req){
return ApiRes.success(warehouseService.getAllWarehouse(req));
// //获取该组织机构下所有警员的id
// List<Map<String, Object>> allWarehouse=new ArrayList<>();
......@@ -67,72 +81,62 @@ public class WarehouseController {
@PostMapping("/GetWarehouseDetail")
@ApiOperation("查询单个仓库信息")
public ResponseResult getOneWarehouse(@RequestBody Map<String, Object> msg) {
ResponseResult returnMsg = warehouseService.getOneWarehouse(msg);
return returnMsg;
public ApiRes<Warehouse> getOneWarehouse(@RequestBody @Validated(WarehouseReq.detail.class)WarehouseReq req) {
return ApiRes.success(warehouseService.getOneWarehouse(req));
}
@PostMapping("/UpdateWarehouse")
@ApiOperation("修改仓库信息")
public ResponseResult updateWarehouse(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = warehouseService.updateWarehouse(msg);
return returnMsg;
public ApiRes<Boolean> updateWarehouse(@RequestBody @Validated(WarehouseReq.edit.class) WarehouseReq req) {
return ApiRes.success(warehouseService.updateWarehouse(req));
}
@PostMapping("/AddArea")
@ApiOperation("添加区域")
public ResponseResult addArea(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = warehouseService.addArea(msg);
return returnMsg;
public ApiRes<Boolean> addArea(@RequestBody @Validated(WarehouseAreaReq.add.class) WarehouseAreaReq req) {
return ApiRes.success(warehouseAreaService.addArea(req));
}
@PostMapping("/UpdateArea")
@ApiOperation("修改区域")
public ResponseResult updateArea(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = warehouseService.updateArea(msg);
return returnMsg;
public ApiRes<Boolean> updateArea(@RequestBody @Validated(WarehouseAreaReq.edit.class) WarehouseAreaReq req) {
return ApiRes.success(warehouseAreaService.updateArea(req));
}
@PostMapping("/DeleteArea")
@ApiOperation("删除区域")
public ResponseResult deleteArea(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = warehouseService.deleteArea(msg);
return returnMsg;
public ApiRes<Boolean> deleteArea(@RequestBody @Validated(WarehouseAreaReq.delete.class) WarehouseAreaReq req) {
return ApiRes.success(warehouseAreaService.deleteArea(req));
}
@PostMapping("/GetAreaList")
@ApiOperation("查询区域信息")
public ResponseResult getAreaList(@RequestBody Map<String, Object> msg){
ResponseResult returnMsg = warehouseService.getAreaList(msg);
return returnMsg;
public ApiRes<List<WarehouseArea>> getAreaList(@RequestBody WarehouseAreaReq req){
return ApiRes.success(warehouseAreaService.getAreaList(req));
}
@PostMapping("/AddShelf")
@ApiOperation("添加货架")
public ResponseResult addShelf(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = warehouseService.addShelf(msg);
return returnMsg;
public ApiRes<Boolean> addShelf(@RequestBody @Validated(ShelfReq.add.class) ShelfReq req) {
return ApiRes.success(shelfService.addShelf(req));
}
@PostMapping("/UpdateShelf")
@ApiOperation("修改货架")
public ResponseResult updateShelf(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = warehouseService.updateShelf(msg);
return returnMsg;
public ApiRes<Boolean> updateShelf(@RequestBody @Validated(ShelfReq.edit.class) ShelfReq req) {
return ApiRes.success(shelfService.updateShelf(req));
}
@PostMapping("/DeleteShelf")
@ApiOperation("删除货架")
public ResponseResult deleteShelf(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = warehouseService.deleteShelf(msg);
return returnMsg;
public ApiRes<Boolean> deleteShelf(@RequestBody @Validated(ShelfReq.delete.class) ShelfReq req) {
return ApiRes.success(shelfService.deleteShelf(req));
}
@PostMapping("/GetShelfList")
@ApiOperation("查询区域信息")
public ResponseResult getShelfList(@RequestBody Map<String, Object> msg){
ResponseResult returnMsg = warehouseService.getShelfList(msg);
return returnMsg;
public ApiRes<List<Shelf>> getShelfList(@RequestBody ShelfReq req){
return ApiRes.success(shelfService.getShelfList(req));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/entity/EquipmentSize.java
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
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;
......@@ -21,6 +20,7 @@ public class EquipmentSize implements Serializable {
* 装备号型ID
*/
@ApiModelProperty(value = "装备号型ID")
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
/**
......@@ -47,14 +47,14 @@ public class EquipmentSize implements Serializable {
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间")
@TableField("update_time")
@TableField(value = "update_time", fill = FieldFill.UPDATE)
private Date updateTime;
/**
......
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -20,6 +22,7 @@ public class EquipmentType implements Serializable {
* 装备类型ID
*/
@ApiModelProperty(value = "装备类型ID")
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
/**
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/Inventory.java
......@@ -71,7 +71,7 @@ public class Inventory implements Serializable {
* 组织机构ID
*/
@TableField("org_id_int")
private long orgId;
private Long orgId;
/**
* 规格尺寸
......@@ -79,12 +79,12 @@ public class Inventory implements Serializable {
private String state;
/**
* 业务状态
* 业务状�
*/
private String bussiness_state;
/**
* 位置状态
* 位置状�
*/
@TableField("location_state")
private String locationState;
......@@ -97,13 +97,13 @@ public class Inventory implements Serializable {
private Date productionDate;
/**
* 质保期
* 质保�
*/
@TableField("warranty_period")
private Integer warrantyPeriod;
private long warrantyPeriod;
/**
* 维保期
* 维保�
*/
@TableField("maintenance_period")
private Integer maintenancePeriod;
......@@ -113,7 +113,11 @@ public class Inventory implements Serializable {
*/
@TableField("fix_count")
private Integer fixCount;
/**
* 维修次数
*/
@TableField("term_state")
private int TermState;
/**
* 位置类型
*/
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/InventorySummary.java
......@@ -27,7 +27,7 @@ public class InventorySummary implements Serializable {
* 组织机构id
*/
@ApiModelProperty(value = "组织机构id")
@TableField("org_id")
@TableField("org_id_int")
private String orgId;
/**
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/PoliceFinger.java
......@@ -17,7 +17,6 @@ import javax.validation.constraints.NotNull;
@ApiModel(value = "com-junmp-jyzb-domain-PoliceFinger")
@Data
@TableName("base_police_finger")
@AllArgsConstructor
@NoArgsConstructor
public class PoliceFinger implements Serializable {
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/PubOrg.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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -13,7 +15,6 @@ import lombok.NoArgsConstructor;
/**
* 组织机构信息
*/
@ApiModel(value="com-junmp-jyzb-domain-PubOrg")
@Data
@AllArgsConstructor
@NoArgsConstructor
......@@ -22,7 +23,7 @@ public class PubOrg implements Serializable {
/**
* 主键
*/
@TableField(value = "org_id")
@TableId(type = IdType.AUTO, value = "org_id")
private Long orgId;
/**
......@@ -193,5 +194,5 @@ public class PubOrg implements Serializable {
@TableField(value = "org_name")
private String orgName;
private static final long serialVersionUID = 1L;
// private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/entity/Shelf.java
package com.junmp.jyzb.entity;
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;
......@@ -15,76 +15,49 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@TableName("base_shelf")
public class Shelf implements Serializable {
/**
* 货架id
*/
@ApiModelProperty(value="货架id")
@TableId(value = "shelf_id", type = IdType.ASSIGN_UUID)
private String shelfId;
/**
* 货架名称
*/
@ApiModelProperty(value="货架名称")
@TableField("area_id")
private Long areaId;
@TableField("shelf_name")
private String shelfName;
/**
* 编码
*/
@ApiModelProperty(value="编码")
@TableField("code")
private String code;
/**
* 货架类型Normal:普通货架Smart:智能货架
*/
@ApiModelProperty(value="货架类型Normal:普通货架Smart:智能货架")
@TableField("type")
private String type;
/**
* 仓库
*/
@ApiModelProperty(value="仓库")
@TableField("warehouse_id")
private String warehouseId;
/**
* 货架层数
*/
@ApiModelProperty(value="货架层数")
@TableField("shelf_rows")
private Integer shelfRows;
/**
* 单层货架列数
*/
@ApiModelProperty(value="单层货架列数")
@TableField("shelf_columns")
private Integer shelfColumns;
/**
* 货架排数（智能货架多货架拼接）
*/
@ApiModelProperty(value="货架排数（智能货架多货架拼接）")
@TableField("shelf_ranges")
private Integer shelfRanges;
/**
* 智能货架地址
*/
@ApiModelProperty(value="智能货架地址")
@TableField("url")
private String url;
/**
* 型号
*/
@ApiModelProperty(value="型号")
@TableField("size_info")
private String sizeInfo;
@ApiModelProperty(value="")
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
@ApiModelProperty(value="")
@TableField(value = "update_time", fill = FieldFill.UPDATE)
private Date updateTime;
@ApiModelProperty(value="")
@TableField("create_user")
private String createUser;
@ApiModelProperty(value="")
@TableField("update_user")
private String updateUser;
private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/Supplier.java
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
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;
......@@ -19,7 +18,7 @@ public class Supplier implements Serializable {
/**
* 供应商ID
*/
@TableField(value = "id")
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
/**
......@@ -61,13 +60,13 @@ public class Supplier implements Serializable {
/**
* 创建人员
*/
@TableField(value = "create_user")
@TableField(value = "create_time", fill = FieldFill.INSERT)
private String createUser;
/**
* 最后更新时间
*/
@TableField(value = "update_time")
@TableField(value = "update_time", fill = FieldFill.UPDATE)
private Date updateTime;
/**
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/Warehouse.java
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
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;
......@@ -17,7 +16,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@TableName("base_warehouse")
public class Warehouse implements Serializable {
@TableField("id")
@TableId(value = "id" , type = IdType.ASSIGN_UUID)
private String id;
@TableField("department_id")
......@@ -35,10 +34,10 @@ public class Warehouse implements Serializable {
@TableField("video")
private String video;
@TableField("create_time")
@TableField(value = "create_time", fill = FieldFill.INSERT_UPDATE)
private Date createTime;
@TableField("update_time")
@TableField(value = "update_time", fill = FieldFill.UPDATE)
private Date updateTime;
@TableField("update_user")
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/WarehouseArea.java
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
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;
......@@ -16,8 +15,8 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@TableName("base_warehouse_area")
public class WarehouseArea implements Serializable {
@TableField("area_id")
private String areaId;
@TableId(value = "area_id", type = IdType.ASSIGN_UUID)
private String id;
@TableField("area_name")
private String areaName;
......@@ -31,10 +30,10 @@ public class WarehouseArea implements Serializable {
@TableField("photo")
private String photo;
@TableField("create_time")
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
@TableField("update_time")
@TableField(value = "update_time", fill = FieldFill.UPDATE)
private Date updateTime;
@TableField("create_user")
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventoryMapper.java.orig 0 → 100644
package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
<<<<<<< HEAD
import com.junmp.jyzb.entity.Inventory;
=======
import com.junmp.jyzb.entity.EquipmentSize;
import com.junmp.jyzb.entity.Inventory;
>>>>>>> develop
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@Mapper
<<<<<<< HEAD
public interface InventoryMapper extends BaseMapper<Inventory> {
=======
public interface InventoryMapper extends BaseMapper<Inventory> {
>>>>>>> develop
Map<String, Object> getSum(String queryType, String typeId);
Map<String, Object> getOrgNum(String typeId);
List<Map<String, Object>> getLocationInventory(@Param("queryType")String queryType, @Param("idMsg")String idMsg);
void deleteAllMsg();
void setOrgInventory();
void setCabinetInventory();
void setWarehouseInventory();
List<Map<String, Object>> getInventoryList(@Param("queryType")String queryType,@Param("typeCode") String typeCode,@Param("typeId") String typeId,@Param("sizeId") String sizeId);
List<Map<String, Object>> getInventoryByOrgId(String orgId);
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventorySummaryMapper.java
package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.entity.InventorySummary;
import com.junmp.jyzb.entity.ProductBatch;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface InventorySummaryMapper {
public interface InventorySummaryMapper extends BaseMapper<InventorySummary> {
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/ShelfMapper.java
package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.entity.Shelf;
import com.junmp.jyzb.entity.WarehouseArea;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import java.util.Map;
@Mapper
public interface ShelfMapper {
public interface ShelfMapper extends BaseMapper<Shelf> {
void addShelf(Shelf shelf);
void updateShelf(Shelf shelf);
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/SupplierMapper.java
package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.entity.Product;
import com.junmp.jyzb.entity.Supplier;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -8,7 +10,7 @@ import java.util.List;
import java.util.Map;
@Mapper
public interface SupplierMapper {
public interface SupplierMapper extends BaseMapper<Supplier> {
public int addSupplier(Supplier supplier);
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/WarehouseAreaMapper.java
package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.entity.Product;
import com.junmp.jyzb.entity.Shelf;
import com.junmp.jyzb.entity.WarehouseArea;
import org.apache.ibatis.annotations.Mapper;
......@@ -8,7 +10,7 @@ import java.util.List;
import java.util.Map;
@Mapper
public interface WarehouseAreaMapper {
public interface WarehouseAreaMapper extends BaseMapper<WarehouseArea> {
void addArea(WarehouseArea warehouseArea);
void updateArea(WarehouseArea warehouseArea);
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/WarehouseMapper.java
package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.entity.Product;
import com.junmp.jyzb.entity.Warehouse;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -8,7 +10,7 @@ import java.util.List;
import java.util.Map;
@Mapper
public interface WarehouseMapper {
public interface WarehouseMapper extends BaseMapper<Warehouse> {
public int addWarehouse(Warehouse warehouse);
......@@ -26,7 +28,7 @@ public interface WarehouseMapper {
List<Map<String, Object>> getAllWarehouse();
List<Map<String, Object>> getAllWarehouseByOrgList(List<String> allOrgId);
List<Warehouse> getAllWarehouseByOrgList(List<String> allOrgId);
void setWarehouseSumInventory(@Param("updateId") String id);
......
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.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{
ResponseResult addSize(Map<String, Object> msg);
public interface EquipmentSizeService extends IService<EquipmentSize> {
boolean addSize(EquipmentSizeReq req);
ResponseResult getOneSize(Map<String,Object> id);
EquipmentSize getOneSize(EquipmentSizeReq req);
ResponseResult deleteSize(Map<String, Object> msg);
boolean deleteSize(EquipmentSizeReq req);
ResponseResult updateSize(Map<String, Object> msg);
boolean updateSize(EquipmentSizeReq req);
List<String> getAllSizeId(Map<String, Object> orgId);
ResponseResult changeSizeState(Map<String, Object> msg);
boolean changeSizeState(EquipmentSizeReq req);
ResponseResult getAllSize(Map<String, Object> msg);
List<EquipmentSize> getAllSize(EquipmentSizeReq req);
ResponseResult getSizeDevelop();
}
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.entity.EquipmentType;
import com.junmp.jyzb.utils.ResponseResult;
import java.util.List;
import java.util.Map;
public interface EquipmentTypeService{
public interface EquipmentTypeService extends IService<EquipmentType> {
ResponseResult addEquipment(Map<String, Object> msg);
......@@ -17,7 +20,7 @@ public interface EquipmentTypeService{
ResponseResult changeEquipmentState(Map<String, Object> msg);
ResponseResult getEquipmentList();
List<Map<String,Object>> getEquipmentList();
ResponseResult getOneEquipment(Map<String, Object> msg);
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/InventorySummaryService.java
package com.junmp.jyzb.service;
public interface InventorySummaryService{
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.entity.InventorySummary;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.v2.db.api.page.PageResult;
public interface InventorySummaryService extends IService<InventorySummary> {
PageResult<InventorySummary> getEquipmentInfo(InventorySumReq req);
}
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.utils.ResponseResult;
......@@ -10,7 +11,7 @@ import com.junmp.jyzb.entity.PubOrg;
public interface PubOrgService extends IService<PubOrg> {
ResponseResult showPubOrgList(Map<String, Object> orgId);
List<Map<String,Object>> showPubOrgList(Map<String, Object> orgId);
ResponseResult showPubOrgListOld(Map<String, Object> orgId);
......@@ -22,5 +23,5 @@ public interface PubOrgService extends IService<PubOrg> {
ResponseResult getOrgDetail(Map<String, Object> orgId);
ResponseResult changeOrgState(Map<String, Object> msg);
ResponseResult changeOrgState(OrgUpdateReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/ShelfService.java
package com.junmp.jyzb.service;
public interface ShelfService{
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.req.ShelfReq;
import com.junmp.jyzb.entity.Shelf;
import java.util.List;
public interface ShelfService extends IService<Shelf> {
boolean addShelf(ShelfReq msg);
boolean updateShelf(ShelfReq msg);
boolean deleteShelf(ShelfReq msg);
List<Shelf> getShelfList(ShelfReq msg);
}
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.entity.Supplier;
import com.junmp.jyzb.utils.ResponseResult;
import java.util.List;
import java.util.Map;
public interface SupplierService{
ResponseResult addSupplier(Map<String, Object> msg);
public interface SupplierService extends IService<Supplier> {
/**
* 新增
*
* @param req
*/
boolean addSupplier(SupplierReq req);
Map<String,Object> getOneSupplier(String id,Object name,Object code);
ResponseResult deleteSupplier(Map<String, Object> msg);
/**
* 删除
*
* @param req
*/
boolean deleteSupplier(SupplierReq req);
ResponseResult updateSupplier(Map<String, Object> msg);
/**
* 编辑
*
* @param req
*/
boolean updateSupplier(SupplierReq req);
List<String> getAllSupplierId();
ResponseResult getAllSupplier(Map<String, Object> msg);
ResponseResult changeSupplierState(Map<String, Object> msg);
/**
* 列表信息
*
* @param req
*/
List<Supplier> showSupplier(SupplierReq req);
/**
* 更改状态
*
* @param req
*/
boolean changeSupplierState(SupplierReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/WarehouseAreaService.java
package com.junmp.jyzb.service;
public interface WarehouseAreaService{
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.entity.WarehouseArea;
import java.util.List;
public interface WarehouseAreaService extends IService<WarehouseArea> {
boolean addArea(WarehouseAreaReq msg);
boolean updateArea(WarehouseAreaReq msg);
boolean deleteArea(WarehouseAreaReq msg);
List<WarehouseArea> getAreaList(WarehouseAreaReq msg);
}
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.entity.Warehouse;
import com.junmp.jyzb.utils.ResponseResult;
import java.util.List;
import java.util.Map;
public interface WarehouseService{
ResponseResult addWarehouse(Map<String, Object> msg);
ResponseResult getOneWarehouse(Map<String, Object> id);
ResponseResult deleteWarehouse(Map<String, Object> msg);
ResponseResult updateWarehouse(Map<String, Object> msg);
List<String> getAllWarehouseId(Map<String, Object> orgId);
ResponseResult changeWarehouseState(Map<String, Object> msg);
ResponseResult getAllWarehouse(Map<String, Object> orgId);
public interface WarehouseService extends IService<Warehouse> {
//ResponseResult addWarehouse(Map<String, Object> msg);
/**
* 新增8接口
* */
ResponseResult addArea(Map<String, Object> msg);
* 新增
*
* @param req
*/
boolean addWarehouse(WarehouseReq req);
ResponseResult updateArea(Map<String, Object> msg);
/**
* 查询单个仓库信息
*
* @param req
*/
Warehouse getOneWarehouse(WarehouseReq req);
ResponseResult deleteArea(Map<String, Object> msg);
// ResponseResult deleteWarehouse(Map<String, Object> msg);
boolean deleteWarehouse(WarehouseReq req);
ResponseResult getAreaList(Map<String, Object> msg);
/**
* 编辑
*
* @param req
*/
boolean updateWarehouse(WarehouseReq req);
ResponseResult addShelf(Map<String, Object> msg);
List<String> getAllWarehouseId(Map<String, Object> orgId);
ResponseResult updateShelf(Map<String, Object> msg);
boolean changeWarehouseState(WarehouseReq req);
ResponseResult deleteShelf(Map<String, Object> msg);
List<Warehouse> getAllWarehouse(WarehouseReq orgId);
ResponseResult getShelfList(Map<String, Object> msg);
ResponseResult setWarehouseInventory(Map<String, Object> msg);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentSizeServiceImpl.java
......@@ -12,7 +12,6 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import com.junmp.jyzb.mapper.EquipmentSizeMapper;
import java.math.BigDecimal;
import java.util.*;
import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
......@@ -66,7 +65,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
size.setCode((String) msg.get("code"));
size.setName((String) msg.get("name"));
size.setNote((String) msg.get("note"));
size.setPrice((BigDecimal) msg.get("price"));
size.setPrice((Double) msg.get("price"));
size.setEpcType((Integer) msg.get("epcType"));
equipmentSizeMapper.addSize(size);
......@@ -133,7 +132,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
size.setName((String) msg.get("name"));
size.setNote((String) msg.get("note"));
size.setUpdateTime(currentDate);
size.setPrice((BigDecimal) msg.get("price"));
size.setPrice((Double) msg.get("price"));
//size.setState((Integer) msg.get("state"));
size.setEpcType((Integer) msg.get("epcType"));
equipmentSizeMapper.updateSize(size);
......@@ -188,3 +187,4 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,returnMsg);
}
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentSizeServiceImpl.java.orig 0 → 100644
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.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;
import com.junmp.jyzb.utils.HttpStatus;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.jyzb.utils.ReturnMsg;
import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.util.BeanPlusUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import com.junmp.jyzb.mapper.EquipmentSizeMapper;
import java.math.BigDecimal;
import java.util.*;
import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
@Service
public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, EquipmentSize> implements EquipmentSizeService {
@Resource
private EquipmentSizeMapper equipmentSizeMapper;
@Resource
private EquipmentTypeMapper equipmentTypeMapper;
private static final String REDIS_SIZE = "Size_";
//@Override
public ResponseResult addSize(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("typeId"), "typeId不能为空");
checkNotBlank(msg.get("code"), "code不能为空");
checkNotBlank(msg.get("name"), "name不能为空");
//checkNotBlank((String) msg.get("note"), "note不能为空");
//Objects.requireNonNull(msg.get("price"), "price不能为空");
Objects.requireNonNull(msg.get("epcType"), "epcType不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
//TODO 查询是否有重复的code
// List<String> sizeCodeFlag = equipmentSizeMapper.getSizeByCode((String) msg.get("code"));
// if (!sizeCodeFlag.isEmpty()){
// return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,"装备号型码已存在");
// }
//todo typeId只能是最下级的
// List<String> resultId = equipmentTypeMapper.getLowestTypeId();
// if (!resultId.contains(msg.get("typeId"))){
// return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,"typeId只能是最下一级");
// }
EquipmentSize size =new EquipmentSize();
//生成一个uuid
String uuid = UUID.randomUUID().toString().replaceAll("-", "");
//生成当前时间
Date currentDate = DateTimeUtil.getCurrentDateTime();
size.setId(uuid);
size.setCreateTime(currentDate);
size.setUpdateTime(currentDate);
size.setTypeId((String) msg.get("typeId"));
size.setCode((String) msg.get("code"));
size.setName((String) msg.get("name"));
size.setNote((String) msg.get("note"));
<<<<<<< HEAD
size.setPrice((BigDecimal) msg.get("price"));
=======
// size.setPrice((Double) msg.get("price"));
>>>>>>> 2d1905eb57c664c7853f98789c36483e5ba60371
size.setEpcType((Integer) msg.get("epcType"));
equipmentSizeMapper.addSize(size);
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,uuid);
}
//@Override
public ResponseResult getOneSize(Map<String,Object> msg) {
try {
checkNotBlank(msg.get("id"), "id不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
String sizeId = msg.get("id").toString();
Map<String, Object> oneSize = equipmentSizeMapper.getOneSize(sizeId);
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,oneSize);
}
//@Override
public ResponseResult deleteSize(Map<String, Object> msg) {
// 进行参数校验
try {
checkNotBlank(msg.get("sizeList"), "sizeList不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
List<Object> sizeList = (List<Object>) msg.get("sizeList");
for (Object sizeId:sizeList){
equipmentSizeMapper.deleteSize(sizeId.toString());
}
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS);
}
//@Override
public ResponseResult updateSize(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("id"), "id不能为空");
checkNotBlank(msg.get("typeId"), "typeId不能为空");
checkNotBlank(msg.get("code"), "code不能为空");
checkNotBlank(msg.get("name"), "name不能为空");
Objects.requireNonNull(msg.get("epcType"), "epcType不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
//todo 判断code是否重复
// //查询是否有重复的code
// List<String> sizeCodeFlag = equipmentSizeMapper.getSizeByCode((String) msg.get("code"));
// //判断code是否有变动
// String oldCode = equipmentSizeMapper.getCodeById(msg.get("id").toString());
// if ()
// if (!sizeCodeFlag.isEmpty()){
// return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,"装备号型码已存在");
// }
EquipmentSize size =new EquipmentSize();
Date currentDate = DateTimeUtil.getCurrentDateTime();
//police.setId(uuid);
size.setId((String) msg.get("id"));
size.setTypeId((String) msg.get("typeId"));
size.setCode((String) msg.get("code"));
size.setName((String) msg.get("name"));
size.setNote((String) msg.get("note"));
size.setUpdateTime(currentDate);
<<<<<<< HEAD
size.setPrice((BigDecimal) msg.get("price"));
=======
// size.setPrice((Double) msg.get("price"));
>>>>>>> 2d1905eb57c664c7853f98789c36483e5ba60371
//size.setState((Integer) msg.get("state"));
size.setEpcType((Integer) msg.get("epcType"));
equipmentSizeMapper.updateSize(size);
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS);
}
//@Override
public ResponseResult changeSizeState(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("id"), "id不能为空");
checkNotBlank(msg.get("state"), "state不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
EquipmentSize size =new EquipmentSize();
size.setId(msg.get("id").toString());
size.setState((Integer) msg.get("state"));
equipmentSizeMapper.changeSizeState(size);
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
}
//@Override
public ResponseResult getAllSize(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("typeId"), "typeId不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
List<Map<String, Object>> allSize=new ArrayList<>();
List<String> allSizeId =getAllSizeId(msg);
for (String sizeId :allSizeId){
Map<String, Object> sizeMsg = equipmentSizeMapper.getOneSize(sizeId);
allSize.add(sizeMsg);
}
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,allSize);
}
@Override
public List<String> getAllSizeId(Map<String, Object> typeId) {
List<String> msg = equipmentSizeMapper.getAllSizeId(typeId.get("typeId").toString());
return msg;
}
@Override
public ResponseResult getSizeDevelop() {
List<Map<String,Object>> returnMsg = equipmentSizeMapper.getSizeDevelop();
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,returnMsg);
}
@Override
public boolean addSize(EquipmentSizeReq req) {
EquipmentSize size = new EquipmentSize();
BeanPlusUtil.copyProperties(req, size);
return this.save(size);
}
@Override
public EquipmentSize getOneSize(EquipmentSizeReq req) {
//LambdaQueryWrapper<EquipmentSize> wrapper = createWrapperById(req);
return this.getById(req);
}
private LambdaQueryWrapper<EquipmentSize> createWrapperById(EquipmentSizeReq req) {
LambdaQueryWrapper<EquipmentSize> wrapper = new LambdaQueryWrapper<>();
if (ObjectUtil.isEmpty(req)) {
return wrapper;
}
//根据id编码查询
wrapper.eq(ObjectUtil.isNotEmpty(req.getId()), EquipmentSize::getId, req.getId());
wrapper.orderByDesc(EquipmentSize::getCreateTime);
return wrapper;
}
@Override
public boolean deleteSize(EquipmentSizeReq req) {
EquipmentSize size = querySize(req);
this.removeById(req.getId());
return true;
}
@Override
public boolean updateSize(EquipmentSizeReq req) {
EquipmentSize size = this.querySize(req);
BeanPlusUtil.copyProperties(req, size);
return this.updateById(size);
}
@Override
public boolean changeSizeState(EquipmentSizeReq req) {
EquipmentSize size = this.querySize(req);
BeanPlusUtil.copyProperties(req, size);
return this.updateById(size);
}
@Override
public List<EquipmentSize> getAllSize(EquipmentSizeReq req) {
LambdaQueryWrapper<EquipmentSize> wrapper = createWrapper(req);
return this.list(wrapper);
}
private EquipmentSize querySize(EquipmentSizeReq req) {
EquipmentSize app = this.getById(req.getId());
if (ObjectUtil.isNull(app)) {
throw new ServiceException(ProductExceptionEnum.SIZE_NOT_EXIST);
}
return app;
}
private LambdaQueryWrapper<EquipmentSize> createWrapper(EquipmentSizeReq req) {
LambdaQueryWrapper<EquipmentSize> wrapper = new LambdaQueryWrapper<>();
if (ObjectUtil.isEmpty(req)) {
return wrapper;
}
//根据业务编码查询
wrapper.like(ObjectUtil.isNotEmpty(req.getTypeId()), EquipmentSize::getTypeId, req.getTypeId());
//根据名称模糊查询
wrapper.like(ObjectUtil.isNotEmpty(req.getName()), EquipmentSize::getName, req.getName());
wrapper.orderByDesc(EquipmentSize::getCreateTime);
return wrapper;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java
......@@ -28,7 +28,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
private static final String REDIS_TYPE = "Type_";
@Override
public ResponseResult getEquipmentList() {
public List<Map<String, Object>> getEquipmentList() {
List<EquipmentType> menuList = equipmentTypeMapper.selectAllEquipment();
List<Map<String, Object>> topList = new ArrayList<>();
......@@ -92,13 +92,9 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
}
}
// 返回结果
return new ResponseResult(HttpStatus.SUCCESS, "操作成功", resultList);
return resultList;
}
// @Override
// public List<Map<String, Object>> getEquipmentList() {
// List<EquipmentType> menuList = equipmentTypeMapper.selectAllEquipment();
......@@ -228,24 +224,6 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
equipmentTypeMapper.addEquipment(equipmentType);
// // 将uuid、创建时间、更新时间加入到msg中
// msg.put("id",numStr);
// long timestamp = currentDate.getTime(); // 将Date对象转换为long类型的时间戳
// msg.put("updateTime",timestamp);
//
// /**
// * 更新缓存
// * */
// //构建Redis缓存键
// String redisKey = REDIS_TYPE;
// // 从 Redis 中获取数据
// List<Map<String, Object>> cachedData = redisUtils.findCachedData(redisKey);
// if (cachedData != null) {
// cachedData.add(0,msg);
// //将查询结果存入 Redis 中
// redisUtils.set(redisKey, cachedData);
//
// }
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS, numStr);
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java
......@@ -9,9 +9,7 @@ import com.junmp.jyzb.api.bean.dto.InventoryDto;
import com.junmp.jyzb.api.bean.req.InventoryReq;
import com.junmp.jyzb.entity.Inventory;
import com.junmp.jyzb.service.CabinetService;
import com.junmp.jyzb.service.InventoryService;
import com.junmp.jyzb.service.WarehouseService;
import com.junmp.jyzb.service.*;
import com.junmp.jyzb.utils.HttpStatus;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.jyzb.utils.ReturnData;
......@@ -33,13 +31,13 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
@Resource
private InventoryMapper inventoryMapper;
@Resource
private EquipmentTypeServiceImpl equipmentTypeService;
private EquipmentTypeService equipmentTypeService;
@Resource
private EquipmentSizeServiceImpl equipmentSizeService;
private EquipmentSizeService equipmentSizeService;
@Resource
private WarehouseService warehouseService;
@Resource
private PubOrgServiceImpl PubOrgService;
private PubOrgService PubOrgService;
@Resource
private CabinetService cabinetService;
......@@ -62,7 +60,6 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
// 填充其他关联信息的字段和对象引用
return bean;
}
@Override
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java.orig 0 → 100644
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.InventoryReq;
import com.junmp.jyzb.entity.EquipmentSize;
import com.junmp.jyzb.entity.EquipmentType;
import com.junmp.jyzb.entity.PubOrg;
import com.junmp.jyzb.entity.Inventory;
import com.junmp.jyzb.service.CabinetService;
import com.junmp.jyzb.service.InventoryService;
import com.junmp.jyzb.service.WarehouseService;
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 org.springframework.stereotype.Service;
import javax.annotation.Resource;
import com.junmp.jyzb.mapper.InventoryMapper;
import java.math.BigDecimal;
import java.util.*;
import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
@Service
public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory> implements InventoryService {
@Resource
private InventoryMapper inventoryMapper;
@Resource
private EquipmentTypeServiceImpl equipmentTypeService;
@Resource
private PubOrgServiceImpl PubOrgService;
@Resource
private EquipmentSizeServiceImpl equipmentSizeService;
@Resource
private WarehouseService warehouseService;
@Resource
private CabinetService cabinetService;
@Override
public InventoryDto getInventoryDetail(InventoryReq req) {
Inventory invMap=this.getById(req.getID());
if (invMap == null) {
return null;
}
InventoryDto bean = BeanUtil.toBean(invMap, InventoryDto.class);
// 查询与库存表关联的其他数据
String orgName= PubOrgService.getById(invMap.getOrgId()).getOrgName();
String TypeName = equipmentTypeService.getById(invMap.getTypeId()).getName();
String SizeName = equipmentSizeService.getById(invMap.getSizeId()).getName();
// 创建并填充对象
bean.setSizeName(SizeName);
bean.setTypeName(TypeName);
bean.setOrgName(orgName);
// 填充其他关联信息的字段和对象引用
return bean;
}
@Override
public ResponseResult getEquipmentInfo(Map<String, Object> inMsg) {
//参数校验
try {
checkNotBlank(inMsg.get("queryType"), "queryType不能为空");
checkNotBlank(inMsg.get("typeId"), "typeId不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
//解析json中的信息
String queryType = inMsg.get("queryType").toString();
String idMsg = inMsg.get("typeId").toString();
//根据传入的queryType来辨别要查询什么信�
if (queryType.equals("org") || queryType.equals("warehouse") || queryType.equals("cabinet")){
Map<String,Object> returnMsg = getLocationEquipmentInfo(queryType,idMsg);
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,returnMsg);
}else {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,"输入的queryType信息有误");
}
}
private Map<String, Object> getLocationEquipmentInfo(String queryType, String idMsg) {
List<Map<String, Object>> allMsg = inventoryMapper.getLocationInventory(queryType,idMsg);
Map<String, Object> resultMap = new HashMap<>();
for (Map<String, Object> msg : allMsg) {
String locationId = msg.get("locationId").toString();
String locationName = msg.get("locationName").toString();
String typeId = msg.get("typeId").toString();
String typeName = msg.get("typeName").toString();
String sizeId = msg.get("sizeId").toString();
String sizeName = msg.get("sizeName").toString();
int number = (int) msg.get("number");
BigDecimal priceBigDecimal = (BigDecimal) msg.get("price");
float price = priceBigDecimal.floatValue();
//检查resultMap中是否存在orgId
if (resultMap.containsKey(locationId)) {
// 获取现有组织级数�
Map<String, Object> orgData = (Map<String, Object>) resultMap.get(locationId);
List<Map<String, Object>> orgTypeList = (List<Map<String, Object>>) orgData.get("typeList");
// 检查组织类型列表中是否存在typeId
boolean typeExist = false;
for (Map<String, Object> typeData : orgTypeList) {
if (typeId.equals(typeData.get("typeId"))) {
// 获取现有的类型级别数�
List<Map<String, Object>> sizeList = (List<Map<String, Object>>) typeData.get("sizeList");
sizeList.add(createSizeData(sizeId,sizeName, number,price)); //向sizeList中记录number的信�
int typeNumber = (int) typeData.get("typeNum");
float typePrice = (float) typeData.get("typeTotalPrice");
typeData.put("typeNum", typeNumber + number); //计算装备数量
typeData.put("typeTotalPrice", typePrice + price);
typeExist = true;
break;
}
}
// 如果 orgTypeList 中不包含 typeId，则创建新的类型级别数据
if (!typeExist) {
Map<String, Object> typeData = new HashMap<>();
typeData.put("typeId", typeId);
typeData.put("typeName", typeName);
typeData.put("typeNum", number);
typeData.put("typeTotalPrice", price);
List<Map<String, Object>> sizeList = new ArrayList<>();
sizeList.add(createSizeData(sizeId,sizeName, number,price));
typeData.put("sizeList", sizeList);
orgTypeList.add(typeData);
}
// 更新组织级别数据
int orgNumber = (int) orgData.get("locationNum");
float orgPrice = (float) orgData.get("totalPrice");
orgData.put("locationNum", orgNumber + number);
orgData.put("totalPrice", orgPrice + price);
} else {
// 创建新的组织级别数据
Map<String, Object> orgData = new HashMap<>();
orgData.put("locationType", queryType);
orgData.put("locationId", locationId);
orgData.put("locationName", locationName);
orgData.put("locationNum", number);
orgData.put("totalPrice", price);
List<Map<String, Object>> orgTypeList = new ArrayList<>();
Map<String, Object> typeData = new HashMap<>();
typeData.put("typeId", typeId);
typeData.put("typeName", typeName);
typeData.put("typeNum", number);
typeData.put("typeTotalPrice", price);
List<Map<String, Object>> sizeList = new ArrayList<>();
sizeList.add(createSizeData(sizeId,sizeName, number,price));
typeData.put("sizeList", sizeList);
orgTypeList.add(typeData);
orgData.put("typeList", orgTypeList);
resultMap.put(locationId, orgData);
}
}
Map<String,Object> returnMsg = (Map<String, Object>) resultMap.get(idMsg);
return returnMsg;
}
private static Map<String, Object> createSizeData(String sizeId,String sizeName, int number,float price) {
Map<String, Object> sizeData = new HashMap<>();
sizeData.put("sizeId", sizeId);
sizeData.put("sizeName", sizeName);
sizeData.put("sizeNum", number);
sizeData.put("sizeTotalPrice", price);
return sizeData;
}
@Override
public ResponseResult setInventoryMsg(){
inventoryMapper.deleteAllMsg(); //清空数据库中已存在的信息
inventoryMapper.setOrgInventory(); //放入组织机构信息汇�
inventoryMapper.setCabinetInventory(); //放入组织机构信息汇�
inventoryMapper.setWarehouseInventory(); //放入组织机构信息汇�
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
}
@Override
public ResponseResult updateInventoryNum(Map<String, Object> msg) {
//参数校验
try {
checkNotBlank(msg.get("locationType"), "locationType不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
String locationType = msg.get("locationType").toString();
if (!locationType.equals("warehouse") && !locationType.equals("cabinet")){
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,"输入的locationType值有�");
}else if(locationType.equals("warehouse")){
warehouseService.setWarehouseInventory(msg);
}else if(locationType.equals("cabinet")){
cabinetService.setCabinetInventory(msg);
}
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
}
@Override
public ResponseResult getInventoryList(Map<String, Object> msg) {
//参数校验
try {
checkNotBlank(msg.get("queryType"), "queryType不能为空");
checkNotBlank(msg.get("typeCode"), "typeCode不能为空");
checkNotBlank(msg.get("typeId"), "typeId不能为空");
checkNotBlank(msg.get("sizeId"), "sizeId不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
//解析json中的信息
String queryType = msg.get("queryType").toString();
String typeCode = msg.get("typeCode").toString();
String typeId = msg.get("typeId").toString();
String sizeId = msg.get("sizeId").toString();
//根据传入的queryType来辨别要查询什么信�
if (queryType.equals("org") || queryType.equals("warehouse") || queryType.equals("cabinet")){
List<Map<String,Object>> returnMsg = inventoryMapper.getInventoryList(queryType,typeCode,typeId,sizeId);
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,returnMsg);
}else {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,"输入的queryType信息有误");
}
}
@Override
public ResponseResult getInventoryByOrgId(Map<String, Object> msg) {
//参数校验
try {
checkNotBlank(msg.get("orgId"), "orgId不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
String orgId = msg.get("orgId").toString();
List<Map<String, Object>> returnMsg = inventoryMapper.getInventoryByOrgId(orgId);
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,returnMsg);
}
@Override
public ResponseResult getInventoryDevelop() {
return null;
}
@Override
public ResponseResult InvertoryBindBox(Map<String, Object> msg) {
//参数校验
try {
checkNotBlank(msg.get("inventoryId"), "inventoryId不能为空");
checkNotBlank(msg.get("locationId"), "locationId不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
//将装备和箱门进行绑定（简单来 说就是更新数据库中的单条记录信息）
Inventory inventory = inventoryMapper.selectOne(new LambdaQueryWrapper<Inventory>()
.eq(Inventory::getID, msg.get("inventoryId"))
.eq(Inventory::getLocationId, msg.get("locationId")));
if (Objects.isNull(inventory)){
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR, ReturnData.NO_DATA);
}
inventory.setLocationId((String) msg.get("locationId"));
inventoryMapper.updateById(inventory);
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,"绑定成功");
}
/**
* @Author: Zhaojw
* @Description: 生成lambda表达式
* @DateTime: 2023/7/20 13:08
* @Params:
* @Return
*/
private LambdaQueryWrapper<Inventory> createWrapper(InventoryReq req) {
LambdaQueryWrapper<Inventory> wrapper = new LambdaQueryWrapper<>();
if (ObjectUtil.isEmpty(req)) {
return wrapper;
}
//根据库存ID查询
wrapper.eq(ObjectUtil.isNotEmpty(req.getID()), Inventory::getID, req.getID());
//根据epc模糊查询
wrapper.like(ObjectUtil.isNotEmpty(req.getEpc()), Inventory::getEpc, req.getEpc());
//根据位置
wrapper.eq(ObjectUtil.isNotEmpty(req.getLocationId()), Inventory::getLocationId, req.getLocationId());
wrapper.orderByDesc(Inventory::getUpdateTime);
return wrapper;
}
}
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.entity.InventorySummary;
import com.junmp.jyzb.service.InventorySummaryService;
import com.junmp.v2.db.api.factory.PageFactory;
import com.junmp.v2.db.api.factory.PageResultFactory;
import com.junmp.v2.db.api.page.PageResult;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import com.junmp.jyzb.mapper.InventorySummaryMapper;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
@Service
public class InventorySummaryServiceImpl implements InventorySummaryService {
public class InventorySummaryServiceImpl extends ServiceImpl<InventorySummaryMapper, InventorySummary> implements InventorySummaryService {
@Override
public PageResult<InventorySummary> getEquipmentInfo(InventorySumReq req) {
LambdaQueryWrapper<InventorySummary> wp = createWrapper(req);//取出仓库中总数并计算
Page<InventorySummary> sumList= this.page(PageFactory.getDefaultPage(),wp);
return PageResultFactory.createPageResult(sumList);
}
private LambdaQueryWrapper<InventorySummary> createWrapper(InventorySumReq req) {
LambdaQueryWrapper<InventorySummary> wrapper = new LambdaQueryWrapper<>();
if (ObjectUtil.isEmpty(req)) {
return wrapper;
}
//根据组织机构号查询
wrapper.eq(ObjectUtil.isNotEmpty(req.getOrgId()), InventorySummary::getOrgId, req.getOrgId());
//根据组织机构名模糊查询
wrapper.like(ObjectUtil.isNotEmpty(req.getOrgName()), InventorySummary::getOrgName, req.getOrgName());
//位置信息
wrapper.eq(ObjectUtil.isNotEmpty(req.getLocationId()), InventorySummary::getLocationId, req.getLocationId());
wrapper.like(ObjectUtil.isNotEmpty(req.getLocationName()), InventorySummary::getLocationName, req.getLocationName());
//根据类别
wrapper.eq(ObjectUtil.isNotEmpty(req.getTypeId()), InventorySummary::getTypeId, req.getTypeId());
//号型
wrapper.eq(ObjectUtil.isNotEmpty(req.getSizeId()), InventorySummary::getSizeId, req.getSizeId());
@Resource
private InventorySummaryMapper inventorySummaryMapper;
wrapper.orderByDesc(InventorySummary::getUpdateTime);
return wrapper;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ProductServiceImpl.java
......@@ -68,6 +68,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
public boolean del(ProductReq req) {
Product product = queryProduct(req);
this.removeById(req.getProductId());
//删除关联信息
productSkuService.delByProductId(product.getProductId());
return true;
}
......@@ -89,6 +90,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
private Product queryProduct(ProductReq req) {
Product app = this.getById(req.getProductId());
if (ObjectUtil.isNull(app)) {
throw new ServiceException(ProductExceptionEnum.PRODUCT_NOT_EXIST);
}
......@@ -105,6 +107,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
wrapper.like(ObjectUtil.isNotEmpty(req.getProductCode()), Product::getProductCode, req.getProductCode());
//根据企业名称模糊查询
wrapper.like(ObjectUtil.isNotEmpty(req.getName()), Product::getName, req.getName());
wrapper.orderByDesc(Product::getCreateTime);
return wrapper;
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ProductSkuServiceImpl.java
......@@ -78,6 +78,7 @@ public class ProductSkuServiceImpl extends ServiceImpl<ProductSkuMapper, Product
@Override
public boolean del(ProductSkuReq req) {
ProductSku sku = queryProductSku(req);
return removeById(sku.getSpecId());
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.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.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.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;
......@@ -26,13 +33,13 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg> implem
@Autowired
private RedisUtils redisUtils;
public ResponseResult showPubOrgList(Map<String, Object> orgId) {
// 构建 Redis 缓存�
public List<Map<String,Object>> showPubOrgList(Map<String, Object> orgId) {
// 构建 Redis 缓存键
String redisKey = "showPubOrgList";
Long orgInfo = Long.valueOf(orgId.get("orgId").toString());//获取输入的组织机构id信息
// �Redis 中获取数�
// 从 Redis 中获取数据
List<PubOrg> cachedData = redisUtils.findCachedData(redisKey);
List<PubOrg> menuList = new ArrayList<>();
if (cachedData != null) {
......@@ -54,19 +61,21 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg> implem
map.put("parentId", menu.getOrgParentId());
map.put("findCode", menu.getFindCode());
map.put("orgName", menu.getDName());
map.put("statusFlag",menu.getStatusFlag());
if (!childrenMap.containsKey(menu.getOrgParentId())) {
childrenMap.put(menu.getOrgParentId(), new ArrayList<>());
}
childrenMap.get(menu.getOrgParentId()).add(map);
//构建最顶级的菜�
//构建最顶级的菜单
if (menu.getOrgId().equals(orgInfo)){
Map<String, Object> topMap = new HashMap<>();
topMap.put("id", menu.getOrgId());
topMap.put("parentId", menu.getOrgParentId());
topMap.put("findCode", menu.getFindCode());
topMap.put("orgName", menu.getDName());
topMap.put("statusFlag",menu.getStatusFlag());
topList.add(topMap);
}
}
......@@ -74,14 +83,14 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg> implem
// 获取顶级菜单
List<Map<String, Object>> topMenus = childrenMap.get(orgInfo);
// 迭代构建菜单�
// 迭代构建菜单树
if (topMenus != null) {
for (Map<String, Object> topMenu : topMenus) {
Stack<Map<String, Object>> stack = new Stack<>();
stack.push(topMenu);
// 使用栈进行深度优先遍�
// 使用栈进行深度优先遍历
while (!stack.isEmpty()) {
Map<String, Object> currentMenu = stack.pop();
Long currentMenuId = (Long) currentMenu.get("id");
......@@ -100,52 +109,60 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg> implem
}
if (orgInfo == -1) {
// 如果输入的是浙江省公安厅,就将下级的组织机构进行排�
//modifyList(resultList);
// 如果输入的是浙江省公安厅,就将下级的组织机构进行排序
for (Map<String, Object> orgMsg : resultList) {
List<Map<String, Object>> children = (List<Map<String, Object>>) orgMsg.get("children");
// 根据findCode从小到大排序
children.sort(Comparator.comparing(m -> m.get("findCode").toString()));
}
return new ResponseResult(HttpStatus.SUCCESS, "操作成功", resultList);
}
if (orgInfo.equals(1369509498032808905L)){ //排序
// 根据findCode从小到大排序
resultList.sort(Comparator.comparing(m -> m.get("findCode").toString()));
return resultList;
}
//将resultList的内容放在顶级菜单的resultList中
for (Map<String,Object> oneMap:topList){
oneMap.put("children",resultList);
}
//topList = setParentMsg(topList);
// 遍历并添加父类的相关信息到children的第一个位�
traverseList(topList);
// 返回结果
return new ResponseResult(HttpStatus.SUCCESS, "操作成功", topList);
}
// 遍历并添加父类的相关信息到children的第一个位置
modifyList(topList);
//将父类信息放在children的第一个位�
public static List<Map<String,Object>> setParentMsg(List<Map<String,Object>> resultList){
// 遍历并添加父类的相关信息到children的第一个位�
for (Map<String, Object> data : resultList) {
List<Map<String, Object>> children = (List<Map<String, Object>>) data.get("children");
if (!children.isEmpty()) {
Map<String, Object> parentInfo = new HashMap<>(data);
children.add(0, parentInfo);
if (orgInfo.equals(1369509498032808905L)) {
// 如果输入的是浙江省公安厅,就将下级的组织机构进行排序
for (Map<String, Object> orgMsg : topList) {
List<Map<String, Object>> children = (List<Map<String, Object>>) orgMsg.get("children");
// 根据findCode从小到大排序
children.sort(Comparator.comparing(m -> m.get("findCode").toString()));
}
return topList;
}
return resultList;
// 返回结果
return topList;
}
public static void traverseList(List<Map<String, Object>> list) {
for (Map<String, Object> data : list) {
List<Map<String, Object>> children = (List<Map<String, Object>>) data.get("children");
if (!children.isEmpty()) {
Map<String, Object> parentInfo = new HashMap<>(data);
children.add(0, parentInfo);
traverseList(children);
//将父类信息放在children的第一个位置
private static void modifyList(List<Map<String, Object>> list) {
for (Map<String, Object> item : list) {
// 获取当前节点的ID
Map<String,Object> setMsg = new HashMap<>();
setMsg.put("id", item.get("id").toString() + "-0"); //在最后面加个 -0 来表示列表的唯一id
setMsg.put("parentId", item.get("parentId").toString());
setMsg.put("findCode", item.get("findCode").toString());
setMsg.put("orgName", item.get("orgName").toString());
setMsg.put("statusFlag",item.get("statusFlag"));
// 将当前节点的ID添加到子节点的第一个位置
@SuppressWarnings("unchecked")
List<Map<String, Object>> children = (List<Map<String, Object>>) item.get("children");
if (children != null && children.size() > 0) {
//将父类的相关信息放在children的第一个位置
children.add(0,setMsg);
// 递归处理子节点
modifyList(children);
}
}
}
......@@ -189,10 +206,10 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg> implem
* */
@Override
public ResponseResult showPubOrgListOld(Map<String, Object> orgId) {
//构建 Redis 缓存�
//构建 Redis 缓存键
String redisKey = "showPubOrgList";
// �Redis 中获取数�
// 从 Redis 中获取数据
List<PubOrg> cachedData = redisUtils.findCachedData(redisKey);
List<PubOrg> menuList = new ArrayList<>();
if (cachedData!=null){
......@@ -439,19 +456,40 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg> implem
return new ResponseResult(HttpStatus.SUCCESS, "操作成功", resultList);
}
@Override
public ResponseResult changeOrgState(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("statusFlag"), "statusFlag不能为空");
checkNotBlank(msg.get("orgIdList"), "orgIdList不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
List<String> orgIdList = (List<String>) msg.get("orgIdList");
Integer statusFlag = (Integer) msg.get("statusFlag");
pubOrgMapper.changeOrgState(statusFlag,orgIdList);
public ResponseResult changeOrgState(OrgUpdateReq req) {
LambdaQueryWrapper<PubOrg> wrapper = new LambdaQueryWrapper<>();
// wrapper.in(ObjectUtil.isNotEmpty(req.getOrgIdList()), PubOrg::getOrgId, req.getOrgIdList());
// PubOrg entity = this.list(req);
// BeanPlusUtil.copyProperties(req, entity);
// return this.updateById(entity);
// List<String> orgIdList = (List<String>) msg.get("orgIdList");
// Integer statusFlag = (Integer) msg.get("statusFlag");
// pubOrgMapper.changeOrgState(statusFlag,orgIdList);
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS);
}
private LambdaQueryWrapper<PubOrg> createWrapper(ProductTagReq req) {
LambdaQueryWrapper<PubOrg> wrapper = new LambdaQueryWrapper<>();
if (ObjectUtil.isEmpty(req)) {
return wrapper;
}
// //根据业务编码查询
// wrapper.eq(ObjectUtil.isNotEmpty(req.getProductCode()), ProductTag::getProductCode, req.getProductCode());
// wrapper.eq(ObjectUtil.isNotEmpty(req.getTagUid()), ProductTag::getTagUid, req.getTagUid());
// wrapper.eq(ObjectUtil.isNotEmpty(req.getBatchId()), ProductTag::getBatchId, req.getBatchId());
// wrapper.eq(ObjectUtil.isNotEmpty(req.getTagId()), ProductTag::getTagId, req.getTagId());
//
//
// wrapper.eq(ProductTag::getHasInit, true);
// wrapper.orderByDesc(ProductTag::getCheckTime);
return wrapper;
}
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java.orig 0 → 100644
package com.junmp.jyzb.service.impl;
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.sun.javafx.collections.MappingChange;
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;
@Service
public class PubOrgServiceImpl implements PubOrgService{
@Resource
private PubOrgMapper pubOrgMapper;
@Autowired
private RedisUtils redisUtils;
public ResponseResult showPubOrgList(Map<String, Object> orgId) {
// 构建 Redis 缓存键
String redisKey = "showPubOrgList";
Long orgInfo = Long.valueOf(orgId.get("orgId").toString());//获取输入的组织机构id信息
// 从 Redis 中获取数据
List<PubOrg> cachedData = redisUtils.findCachedData(redisKey);
List<PubOrg> menuList = new ArrayList<>();
if (cachedData != null) {
menuList = cachedData;
} else {
// 从数据库获取数据并将结果存入 Redis 缓存
menuList = pubOrgMapper.selectAllOrg();
redisUtils.set(redisKey, menuList);
}
List<Map<String, Object>> topList = new ArrayList<>();
List<Map<String, Object>> resultList = new ArrayList<>();
Map<Long, List<Map<String, Object>>> childrenMap = new HashMap<>();
// 构建子菜单映射表
for (PubOrg menu : menuList) {
Map<String, Object> map = new HashMap<>();
map.put("id", menu.getOrgId());
map.put("parentId", menu.getOrgParentId());
map.put("findCode", menu.getFindCode());
map.put("orgName", menu.getDName());
map.put("statusFlag",menu.getStatusFlag());
if (!childrenMap.containsKey(menu.getOrgParentId())) {
childrenMap.put(menu.getOrgParentId(), new ArrayList<>());
}
childrenMap.get(menu.getOrgParentId()).add(map);
//构建最顶级的菜单
if (menu.getOrgId().equals(orgInfo)){
Map<String, Object> topMap = new HashMap<>();
topMap.put("id", menu.getOrgId());
topMap.put("parentId", menu.getOrgParentId());
topMap.put("findCode", menu.getFindCode());
topMap.put("orgName", menu.getDName());
topMap.put("statusFlag",menu.getStatusFlag());
topList.add(topMap);
}
}
// 获取顶级菜单
List<Map<String, Object>> topMenus = childrenMap.get(orgInfo);
// 迭代构建菜单树
if (topMenus != null) {
for (Map<String, Object> topMenu : topMenus) {
Stack<Map<String, Object>> stack = new Stack<>();
stack.push(topMenu);
// 使用栈进行深度优先遍历
while (!stack.isEmpty()) {
Map<String, Object> currentMenu = stack.pop();
Long currentMenuId = (Long) currentMenu.get("id");
if (childrenMap.containsKey(currentMenuId)) {
List<Map<String, Object>> children = childrenMap.get(currentMenuId);
currentMenu.put("children", children);
for (int i = children.size() - 1; i >= 0; i--) {
stack.push(children.get(i));
}
}
}
resultList.add(topMenu);
}
}
if (orgInfo == -1) {
modifyList(resultList);
// 如果输入的是浙江省公安厅,就将下级的组织机构进行排序
for (Map<String, Object> orgMsg : resultList) {
List<Map<String, Object>> children = (List<Map<String, Object>>) orgMsg.get("children");
// 根据findCode从小到大排序
children.sort(Comparator.comparing(m -> m.get("findCode").toString()));
}
return new ResponseResult(HttpStatus.SUCCESS, "操作成功", resultList);
}
//将resultList的内容放在顶级菜单的resultList中
for (Map<String,Object> oneMap:topList){
oneMap.put("children",resultList);
}
// 遍历并添加父类的相关信息到children的第一个位置
<<<<<<< HEAD
//traverseList(topList);
=======
modifyList(topList);
if (orgInfo.equals(1369509498032808905L)) {
// 如果输入的是浙江省公安厅,就将下级的组织机构进行排序
for (Map<String, Object> orgMsg : topList) {
List<Map<String, Object>> children = (List<Map<String, Object>>) orgMsg.get("children");
// 根据findCode从小到大排序
children.sort(Comparator.comparing(m -> m.get("findCode").toString()));
}
return new ResponseResult(HttpStatus.SUCCESS, "操作成功", topList);
}
>>>>>>> develop
// 返回结果
return new ResponseResult(HttpStatus.SUCCESS, "操作成功", topList);
}
//将父类信息放在children的第一个位置
private static void modifyList(List<Map<String, Object>> list) {
for (Map<String, Object> item : list) {
// 获取当前节点的ID
Map<String,Object> setMsg = new HashMap<>();
setMsg.put("id", item.get("id").toString() + "-0"); //在最后面加个 -0 来表示列表的唯一id
setMsg.put("parentId", item.get("parentId").toString());
setMsg.put("findCode", item.get("findCode").toString());
setMsg.put("orgName", item.get("orgName").toString());
setMsg.put("statusFlag",item.get("statusFlag"));
// 将当前节点的ID添加到子节点的第一个位置
@SuppressWarnings("unchecked")
List<Map<String, Object>> children = (List<Map<String, Object>>) item.get("children");
if (children != null && children.size() > 0) {
//将父类的相关信息放在children的第一个位置
children.set(0,setMsg);
// 递归处理子节点
modifyList(children);
}
}
}
//删除前缀
public static Map<String,Object> removeFront(Map<String,Object> map, String name1,List<String> name2,List<String> name3) {
String orgName = map.get("orgName").toString();
orgName = removeStringAndBefore(orgName,name1);
for (String name:name2){
orgName = removePrefix(orgName,name);
for (String staticName:name3){
orgName = removePrefix(orgName,staticName);
}
}
map.put("orgName",orgName);
return map;
}
//找到字符串出现的位置，删掉字符串及前缀
public static String removeStringAndBefore(String name, String deleteMsg) {
int index = name.indexOf(deleteMsg);
if (index != -1) {
return name.substring(index + deleteMsg.length());
}
return name;
}
//例：传入abc,a ==>bc 删掉开头的字符串，不是就不删除
public static String removePrefix(String name, String deleteName) {
if (name.startsWith(deleteName)) {
return name.substring(deleteName.length());
} else {
return name;
}
}
/**
* 组织机构名称不进行删减的代码
* */
@Override
public ResponseResult showPubOrgListOld(Map<String, Object> orgId) {
//构建 Redis 缓存键
String redisKey = "showPubOrgList";
// 从 Redis 中获取数据
List<PubOrg> cachedData = redisUtils.findCachedData(redisKey);
List<PubOrg> menuList = new ArrayList<>();
if (cachedData!=null){
menuList = cachedData;
}else {
menuList = pubOrgMapper.selectAllOrg();
redisUtils.set(redisKey, menuList);
}
List<Map<String, Object>> resultList = new ArrayList<>();
Map<Long, List<Map<String, Object>>> childrenMap = new HashMap<>();
// 构建子菜单映射表
for (PubOrg menu : menuList) {
Map<String, Object> map = new HashMap<>();
map.put("id", menu.getOrgId());
map.put("parentId", menu.getOrgParentId());
map.put("orgName", menu.getOrgName());
if (!childrenMap.containsKey(menu.getOrgParentId())) {
childrenMap.put(menu.getOrgParentId(), new ArrayList<>());
}
childrenMap.get(menu.getOrgParentId()).add(map);
}
Long orgInfo=Long.valueOf(orgId.get("orgId").toString());
// 获取顶级菜单
List<Map<String, Object>> topMenus = childrenMap.get(orgInfo);
// 迭代构建菜单树
if (topMenus != null) {
for (Map<String, Object> topMenu : topMenus) {
Stack<Map<String, Object>> stack = new Stack<>();
stack.push(topMenu);
while (!stack.isEmpty()) {
Map<String, Object> currentMenu = stack.pop();
Long currentMenuId = (Long) currentMenu.get("id");
if (childrenMap.containsKey(currentMenuId)) {
List<Map<String, Object>> children = childrenMap.get(currentMenuId);
currentMenu.put("children", children);
for (int i = children.size() - 1; i >= 0; i--) {
stack.push(children.get(i));
}
}
}
resultList.add(topMenu);
}
}
//redisUtils.set(redisKey, resultList);
return new ResponseResult(HttpStatus.SUCCESS,"操作成功",resultList);
}
@Override
public List<String> getLowerOrg(String orgId) {
//构建 Redis 缓存键
String redisKey = "getLowerOrg";
// 从 Redis 中获取数据
List<PubOrg> cachedData = redisUtils.findCachedData(redisKey);
List<PubOrg> menuList = new ArrayList<>();
if (cachedData!=null){
menuList = cachedData;
}else {
menuList = pubOrgMapper.selectAllOrg();
redisUtils.set(redisKey, menuList);
}
List<String> resultList = new ArrayList<>(); // 存储最终的菜单树结果
Map<Long, List<String>> childrenMap = new HashMap<>(); // 存储每个菜单项的子菜单映射
resultList.add(orgId); //将自己加入到返回的List中
// 构建子菜单映射表
for (PubOrg menu : menuList) {
String org = menu.getOrgId().toString();
if (!childrenMap.containsKey(menu.getOrgParentId())) { // 如果父菜单还不存在于映射表中
childrenMap.put(menu.getOrgParentId(), new ArrayList<>()); // 创建一个新的子菜单列表
}
childrenMap.get(menu.getOrgParentId()).add(org); // 将当前菜单项放入对应的子菜单列表中
}
Long orgInfo = Long.valueOf(orgId);//获取输入的组织机构id信息
//Long orgInfo = new BigInteger(orgId); // 获取顶级菜单的标识符
// 获取顶级菜单
List<String> topMenus = childrenMap.get(orgInfo);
// 迭代构建菜单树
if (topMenus != null) {
Queue<String> queue = new LinkedList<>(); // 使用队列结构辅助构建菜单树
queue.addAll(topMenus); // 将当前顶级菜单项放入队列中
while (!queue.isEmpty()) {
String currentMenu = queue.poll(); // 取出队首的当前菜单项
//Long currentMenuId = currentMenu; // 获取当前菜单项的标识符
if (childrenMap.containsKey(currentMenu)) { // 如果当前菜单项有子菜单
List<String> children = childrenMap.get(currentMenu); // 获取子菜单列表
//currentMenu.put("children", children); // 将子菜单列表放入当前菜单项中的"children"字段
queue.addAll(children); // 将子菜单项放入队列中
}
resultList.add(currentMenu); // 将已经处理完的当前菜单项添加到结果列表中
}
}
//redisUtils.set(redisKey, resultList);
return resultList;
}
@Override
public ResponseResult setOrgParentIds() {
//清空parent_ids字段
pubOrgMapper.wipeParentIdsData();
//更新parent_ids字段
pubOrgMapper.setOrgParentIds();
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
}
@Override
public ResponseResult setShortName(Map<String, Object> orgId) {
List<PubOrg> menuList = pubOrgMapper.selectAllOrg();
List<Map<String, Object>> resultList = new ArrayList<>();
for (PubOrg menu : menuList) {
if (menu.getOrgParentId().toString().equals((orgId.get("orgId")))) {
Map<String, Object> map = new HashMap<>();
map.put("id", menu.getOrgId());
map.put("parentId", menu.getOrgParentId());
//去掉前缀
String name1 = menu.getOrgName(); //name1 ,获得“浙江省公安厅”
//List<String> name2 = null;
List<String> name2 = new ArrayList<>();
//name3为固定字段
List<String> name3 = new ArrayList<>();
name3.add("公安局");
name3.add("公安");
name3.add("分局");
if (menu.getOrgName().length()>3 && name2.size() <2 && (menu.getOrgName().charAt(2)=='省' ||menu.getOrgName().charAt(2)=='市')){
String nameHistory = menu.getOrgName().substring(0,3); //name2 ,获得“浙江省”
name2.add(nameHistory);
name2.add(" ");
name2.add(" ");
}
if (menu.getOrgName().length()>3 && (menu.getOrgName().charAt(2)=='区')){
name2.remove(2);
String nameHistory = menu.getOrgName().substring(0,3);
name2.add(2,nameHistory);
}
map.put("orgName", name1);
List<Map<String, Object>> children = getChildMenus(menu.getOrgId(),menuList,name1,name2,name3);//name为要删掉的前缀
if (!children.isEmpty()) {
map.put("children", children);
for (Map<String,Object> msg:children){
Long id = (Long) msg.get("id");
String orgName = msg.get("orgName").toString();
pubOrgMapper.setMsg(id,orgName);
}
}
//map.put("children", getChildMenus(menu.getOrgId(),menuList,name1,name2,name3));
resultList.add(map);
}
}
return new ResponseResult(HttpStatus.SUCCESS,"操作成功",resultList);
}
private List<Map<String, Object>> getChildMenus(Long parentId, List<PubOrg> menuList,String deleteName1,List<String> deleteName2,List<String> deleteName3) {
List<Map<String, Object>> childList = new ArrayList<>();
for (PubOrg menu : menuList) {
//if (menu.getParentId() != null && menu.getParentId().equals(parentId)) {
if (menu.getOrgParentId().toString().equals(parentId.toString())) {
Map<String, Object> map = new HashMap<>();
map.put("id", menu.getOrgId());
map.put("parentId", menu.getOrgParentId());
//去掉前缀
String name1 = menu.getOrgName();
List<String> name2 = new ArrayList<>();
name2 = deleteName2;
String result = removePrefix(name1, deleteName1);
//遍历name2删掉前缀
for (String nameMsg:name2){
result = removePrefix(result, nameMsg);
for (String name3:deleteName3){
result = removePrefix(result, name3);
}
}
map.put("orgName", result);
if (result.length()>3 && (result.charAt(2)=='省' ||result.charAt(2)=='市')){
name2.remove(1);
String nameHistory = result.substring(0,3); //获得“绍兴市”
name2.add(1,nameHistory);
}
if (result.length()>3 && (result.charAt(2)=='区' ||result.charAt(2)=='县')){
name2.remove(2);
String nameHistory = result.substring(0,3);
name2.add(2,nameHistory);
}
List<Map<String, Object>> children = getChildMenus(menu.getOrgId(), menuList,name1,name2,deleteName3);
if (!children.isEmpty()) {
map.put("children", children);
// for (Map<String,Object> msg:children){
// Long id = (Long) msg.get("id");
// String orgName = msg.get("orgName").toString();
// pubOrgMapper.setMsg(id,orgName);
// }
}
childList.add(map);
}
}
return childList;
}
@Override
public ResponseResult getOrgDetail(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("orgId"), "orgId不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
String orgId = msg.get("orgId").toString();
Map<String,Object> resultList = pubOrgMapper.getOrgDetail(orgId);
return new ResponseResult(HttpStatus.SUCCESS, "操作成功", resultList);
}
@Override
public ResponseResult changeOrgState(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("statusFlag"), "statusFlag不能为空");
checkNotBlank(msg.get("orgIdList"), "orgIdList不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
List<String> orgIdList = (List<String>) msg.get("orgIdList");
Integer statusFlag = (Integer) msg.get("statusFlag");
pubOrgMapper.changeOrgState(statusFlag,orgIdList);
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS);
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ShelfServiceImpl.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.req.ProductReq;
import com.junmp.jyzb.api.bean.req.ShelfReq;
import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
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;
import javax.annotation.Resource;
import com.junmp.jyzb.mapper.ShelfMapper;
import com.junmp.jyzb.service.ShelfService;
import java.util.List;
@Service
public class ShelfServiceImpl implements ShelfService{
public class ShelfServiceImpl extends ServiceImpl<ShelfMapper, Shelf> implements ShelfService {
@Resource
private ShelfMapper shelfMapper;
@Override
public boolean addShelf(ShelfReq req) {
Shelf shelf = new Shelf();
BeanPlusUtil.copyProperties(req,shelf);
return this.save(shelf);
}
@Override
public boolean updateShelf(ShelfReq req) {
Shelf shelf = this.queryShelf(req);
BeanPlusUtil.copyProperties(req, shelf);
return this.updateById(shelf);
}
@Override
public boolean deleteShelf(ShelfReq req) {
Shelf shelf = queryShelf(req);
this.removeById(req.getShelfId());
return true;
}
@Override
public List<Shelf> getShelfList(ShelfReq req) {
LambdaQueryWrapper<Shelf> wrapper = createWrapper(req);
return this.list(wrapper);
}
private Shelf queryShelf(ShelfReq req) {
Shelf app = this.getById(req.getShelfId());
if (ObjectUtil.isNull(app)) {
throw new ServiceException(ShelfExceptionEnum.SHELF_NOT_EXIST);
}
return app;
}
private LambdaQueryWrapper<Shelf> createWrapper(ShelfReq req) {
LambdaQueryWrapper<Shelf> wrapper = new LambdaQueryWrapper<>();
if (ObjectUtil.isEmpty(req)) {
return wrapper;
}
//根据货架id查询
wrapper.eq(ObjectUtil.isNotEmpty(req.getShelfId()), Shelf::getShelfId, req.getShelfId());
//根据货架名称、货架编号模糊查询
wrapper.like(ObjectUtil.isNotEmpty(req.getShelfName()), Shelf::getCode, req.getShelfName());
wrapper.orderByDesc(Shelf::getCreateTime);
return wrapper;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/SupplierServiceImpl.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.req.ProductReq;
import com.junmp.jyzb.api.bean.req.SupplierReq;
import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
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;
import com.junmp.v2.common.util.BeanPlusUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import com.junmp.jyzb.mapper.SupplierMapper;
......@@ -12,7 +24,7 @@ import java.util.*;
import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
@Service
public class SupplierServiceImpl implements SupplierService {
public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> implements SupplierService {
@Resource
private SupplierMapper supplierMapper;
......@@ -23,6 +35,13 @@ public class SupplierServiceImpl implements SupplierService {
private static final String REDIS_SUPPLIER = "Supplier_";
@Override
public boolean addSupplier(SupplierReq req) {
Supplier supplier = new Supplier();
BeanPlusUtil.copyProperties(req, supplier);
return this.save(supplier);
}
//@Override
public ResponseResult addSupplier(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("name"), "name不能为空");
......@@ -81,6 +100,27 @@ public class SupplierServiceImpl implements SupplierService {
}
@Override
public boolean deleteSupplier(SupplierReq req) {
this.removeById(req.getId());
return true;
}
@Override
public boolean updateSupplier(SupplierReq req) {
Supplier supplier = this.querySupplier(req);
BeanPlusUtil.copyProperties(req, supplier);
return this.updateById(supplier);
}
private Supplier querySupplier(SupplierReq req) {
Supplier app = this.getById(req.getId());
if (ObjectUtil.isNull(app)) {
throw new ServiceException(SupplierExceptionEnum.SUPPLIER_NOT_EXIST);
}
return app;
}
//@Override
public ResponseResult deleteSupplier(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("supplierList"), "supplierList不能为空");
......@@ -94,7 +134,7 @@ public class SupplierServiceImpl implements SupplierService {
return new ResponseResult(HttpStatus.SUCCESS,"操作成功");
}
@Override
//@Override
public ResponseResult updateSupplier(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("id"), "id不能为空");
......@@ -129,6 +169,25 @@ public class SupplierServiceImpl implements SupplierService {
}
@Override
public List<Supplier> showSupplier(SupplierReq req) {
System.out.println(req);
LambdaQueryWrapper<Supplier> wrapper = createWrapper(req);
return this.list(wrapper);
}
@Override
public boolean changeSupplierState(SupplierReq req) {
Supplier supplier = this.querySupplier(req);
//获取supplierId 放入到 id中
// supplier.setId(req.getSupplierId());
//supplier.setId(req);
BeanPlusUtil.copyProperties(req, supplier);
return this.updateById(supplier);
}
//@Override
public ResponseResult getAllSupplier(Map<String, Object> msg) {
String name="";
String shortName="";
......@@ -147,7 +206,7 @@ public class SupplierServiceImpl implements SupplierService {
return new ResponseResult(HttpStatus.SUCCESS,"操作成功",allSupplier);
}
@Override
//@Override
public ResponseResult changeSupplierState(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("supplierId"), "supplierId不能为空");
......@@ -164,4 +223,18 @@ public class SupplierServiceImpl implements SupplierService {
supplierMapper.changeSupplierState(supplier);
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS);
}
private LambdaQueryWrapper<Supplier> createWrapper(SupplierReq req) {
LambdaQueryWrapper<Supplier> wrapper = new LambdaQueryWrapper<>();
if (ObjectUtil.isEmpty(req)) {
return wrapper;
}
//根据供应商短码查询查询
wrapper.like(ObjectUtil.isNotEmpty(req.getCode()), Supplier::getCode, req.getCode());
//供应商名称模糊查询
wrapper.eq(ObjectUtil.isNotEmpty(req.getName()), Supplier::getName, req.getName());
//根据创建时间降序
wrapper.orderByDesc(Supplier::getCreateTime);
return wrapper;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/WarehouseAreaServiceImpl.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.req.ProductReq;
import com.junmp.jyzb.api.bean.req.WarehouseAreaReq;
import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
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;
import javax.annotation.Resource;
import com.junmp.jyzb.mapper.WarehouseAreaMapper;
import com.junmp.jyzb.service.WarehouseAreaService;
import java.util.List;
@Service
public class WarehouseAreaServiceImpl implements WarehouseAreaService{
public class WarehouseAreaServiceImpl extends ServiceImpl<WarehouseAreaMapper, WarehouseArea> implements WarehouseAreaService{
@Resource
private WarehouseAreaMapper warehouseAreaMapper;
@Override
public boolean addArea(WarehouseAreaReq req) {
WarehouseArea area = new WarehouseArea();
BeanPlusUtil.copyProperties(req, area);
return this.save(area);
}
@Override
public boolean updateArea(WarehouseAreaReq req) {
WarehouseArea area = this.queryWarehouseArea(req);
BeanPlusUtil.copyProperties(req, area);
return this.updateById(area);
}
@Override
public boolean deleteArea(WarehouseAreaReq req) {
WarehouseArea warehouseArea = queryWarehouseArea(req);
this.removeById(req.getId());
return true;
}
@Override
public List<WarehouseArea> getAreaList(WarehouseAreaReq req) {
LambdaQueryWrapper<WarehouseArea> wrapper = createWrapper(req);
return this.list(wrapper);
}
private WarehouseArea queryWarehouseArea(WarehouseAreaReq req) {
WarehouseArea app = this.getById(req.getId());
if (ObjectUtil.isNull(app)) {
throw new ServiceException(WarehouseAreaExceptionEnum.WAREHOUSEAREA_NOT_EXIST);
}
return app;
}
private LambdaQueryWrapper<WarehouseArea> createWrapper(WarehouseAreaReq req) {
LambdaQueryWrapper<WarehouseArea> wrapper = new LambdaQueryWrapper<>();
if (ObjectUtil.isEmpty(req)) {
return wrapper;
}
//根据地区id查询
wrapper.eq(ObjectUtil.isNotEmpty(req.getId()), WarehouseArea::getId, req.getId());
//根据地区名称模糊查询
wrapper.like(ObjectUtil.isNotEmpty(req.getAreaName()), WarehouseArea::getAreaName, req.getAreaName());
wrapper.orderByDesc(WarehouseArea::getCreateTime);
return wrapper;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/WarehouseServiceImpl.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.req.WarehouseAreaReq;
import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.jyzb.api.bean.req.WarehouseReq;
import com.junmp.jyzb.api.exception.enums.WarehouseExceptionEnum;
import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.mapper.*;
import com.junmp.jyzb.service.PolicemanService;
import com.junmp.jyzb.service.PubOrgService;
import com.junmp.jyzb.service.WarehouseService;
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;
import javax.annotation.Resource;
......@@ -14,7 +23,8 @@ import java.util.*;
import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
@Service
public class WarehouseServiceImpl implements WarehouseService {
@Slf4j
public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse> implements WarehouseService {
@Resource
private RedisUtils redisUtils;
......@@ -39,7 +49,7 @@ public class WarehouseServiceImpl implements WarehouseService {
private static final String REDIS_WAREHOUSE = "Warehouse_";
@Override
//@Override
public ResponseResult addWarehouse(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("name"), "name不能为空");
......@@ -104,6 +114,24 @@ public class WarehouseServiceImpl implements WarehouseService {
}
@Override
public boolean addWarehouse(WarehouseReq req) {
Warehouse warehouse = new Warehouse();
BeanPlusUtil.copyProperties(req, warehouse);
return this.save(warehouse);
}
@Override
public Warehouse getOneWarehouse(WarehouseReq req) {
Warehouse warehouseMsg=this.getById(req.getId());
if (warehouseMsg == null) {
return null;
}
// 填充其他关联信息的字段和对象引用
return warehouseMsg;
}
//@Override
public ResponseResult getOneWarehouse(Map<String, Object> id) {
try {
checkNotBlank(id.get("warehouseId"), "warehouseId不能为空");
......@@ -116,7 +144,9 @@ public class WarehouseServiceImpl implements WarehouseService {
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,warehouse);
}
@Override
//@Override
public ResponseResult deleteWarehouse(Map<String, Object> msg) {
// 进行参数校验
try {
......@@ -133,6 +163,19 @@ public class WarehouseServiceImpl implements WarehouseService {
}
@Override
public boolean deleteWarehouse(WarehouseReq req) {
this.removeById(req.getId());
return true;
}
@Override
public boolean updateWarehouse(WarehouseReq req) {
Warehouse warehouse = this.queryWarehouse(req);
BeanPlusUtil.copyProperties(req, warehouse);
return this.updateById(warehouse);
}
//@Override
public ResponseResult updateWarehouse(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("warehouseId"), "warehouseId不能为空");
......@@ -179,7 +222,7 @@ public class WarehouseServiceImpl implements WarehouseService {
return subIds;
}
@Override
//@Override
public ResponseResult changeWarehouseState(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("warehouseId"), "warehouseId不能为空");
......@@ -197,76 +240,54 @@ public class WarehouseServiceImpl implements WarehouseService {
}
@Override
public ResponseResult getAllWarehouse(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("orgId"), "orgId不能为空");
checkNotBlank(msg.get("IncludeLowerLevel"), "IncludeLowerLevel不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
List<Map<String, Object>> allWarehouse=new ArrayList<>();
// // 构建 Redis 缓存键
// String redisKey = REDIS_WAREHOUSE + 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));
// allWarehouse.add(one);
// }
// return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,allWarehouse);
// }
public List<Warehouse> getAllWarehouse(WarehouseReq msg) {
// Warehouse warehouse = new Warehouse();
// BeanPlusUtil.copyProperties(msg, warehouse);
//
List<Warehouse> allWarehouse=new ArrayList<>();
//如果组织机构是浙江省公安厅
if (msg.get("orgId").toString().equals("1369509498032808905") && msg.get("IncludeLowerLevel").toString().equals("true")){
allWarehouse = warehouseMapper.getAllWarehouse();
//将查询结果存入 Redis 中
//redisUtils.set(redisKey, allWarehouse);
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,allWarehouse);
if (msg.getOrgId().equals(1369509498032808905l) && msg.getIncludeLowerLevel().equals("true")){
allWarehouse = this.list();
return allWarehouse;
}
//获取组织机构Id
List<String> allOrgId =getAllOrgId(msg);
if (allOrgId.isEmpty()){
return new ResponseResult(HttpStatus.ERROR,ReturnMsg.ERROR,"未查询到相关信息");
}
//根据获取的组织机构查询警员信息
allWarehouse = getAllWarehouseByOrg(msg,allOrgId);
//获取该组织机构下所有仓库的id
//String orgId = msg.get("orgId").toString();
// List<String> allWarehouseId =getAllWarehouseId(msg);
// for (String warehouseId :allWarehouseId){
// Map<String, Object> warehouseMsg = warehouseMapper.getOneWarehouse(warehouseId);
// allWarehouse.add(warehouseMsg);
// }
//将查询结果存入 Redis 中
//redisUtils.set(redisKey, allWarehouse);
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,allWarehouse);
allWarehouse = getAllWarehouseByOrg(allOrgId);
return allWarehouse;
}
private List<String> getAllOrgId(Map<String, Object> msg) {
//@Override
public boolean addArea(WarehouseAreaReq msg) {
return false;
}
private List<String> getAllOrgId(WarehouseReq msg) {
List<String> allOrg = new ArrayList<>();
if (msg.get("IncludeLowerLevel").equals("false")){
allOrg.add((String) msg.get("orgId"));
}else if(msg.get("IncludeLowerLevel").equals("true")){
if (msg.getIncludeLowerLevel().equals("false")){
allOrg.add(msg.getOrgId().toString());
}else if(msg.getIncludeLowerLevel().equals("true")){
//查询某组织机构的本级及下级
allOrg = pubOrgService.getLowerOrg(msg.get("orgId").toString());
allOrg = pubOrgService.getLowerOrg(msg.getOrgId().toString());
}
return allOrg;
}
private List<Map<String, Object>> getAllWarehouseByOrg(Map<String, Object> msg, List<String> allOrgId) {
List<Map<String, Object>> allWarehouse = new ArrayList<>();
allWarehouse = warehouseMapper.getAllWarehouseByOrgList(allOrgId);
private List<Warehouse> getAllWarehouseByOrg(List<String> allOrgId) {
List<Warehouse> allWarehouse = new ArrayList<>();
LambdaQueryWrapper<Warehouse> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(Warehouse::getOrgIdInt, allOrgId);
allWarehouse = warehouseMapper.selectList(queryWrapper);
return allWarehouse;
}
@Override
//@Override
public ResponseResult addArea(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("name"), "name不能为空");
......@@ -287,7 +308,7 @@ public class WarehouseServiceImpl implements WarehouseService {
String uuid = UUID.randomUUID().toString().replaceAll("-", "");
//生成当前时间
Date currentDate = DateTimeUtil.getCurrentDateTime();
warehouseArea.setAreaId(uuid);
warehouseArea.setId(uuid);
warehouseArea.setCreateTime(currentDate);
warehouseArea.setUpdateTime(currentDate);
......@@ -299,7 +320,7 @@ public class WarehouseServiceImpl implements WarehouseService {
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,uuid);
}
@Override
//@Override
public ResponseResult updateArea(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("areaId"), "areaId不能为空");
......@@ -320,7 +341,7 @@ public class WarehouseServiceImpl implements WarehouseService {
Date currentDate = DateTimeUtil.getCurrentDateTime();
warehouseArea.setUpdateTime(currentDate);
warehouseArea.setAreaId((String) msg.get("areaId"));
warehouseArea.setId((String) msg.get("areaId"));
warehouseArea.setAreaName((String) msg.get("name"));
warehouseArea.setWarehouseId((String) msg.get("warehouseId"));
warehouseArea.setPhoto((String) msg.get("photo"));
......@@ -330,7 +351,7 @@ public class WarehouseServiceImpl implements WarehouseService {
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
}
@Override
//@Override
public ResponseResult deleteArea(Map<String, Object> msg) {
// 进行参数校验
try {
......@@ -343,7 +364,7 @@ public class WarehouseServiceImpl implements WarehouseService {
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS);
}
@Override
//@Override
public ResponseResult getAreaList(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("warehouseId"), "warehouseId不能为空");
......@@ -356,7 +377,7 @@ public class WarehouseServiceImpl implements WarehouseService {
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,areaList);
}
@Override
//@Override
public ResponseResult addShelf(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("shelfName"), "shelfName不能为空");
......@@ -399,7 +420,7 @@ public class WarehouseServiceImpl implements WarehouseService {
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,uuid);
}
@Override
//@Override
public ResponseResult updateShelf(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("shelfId"), "shelfId不能为空");
......@@ -433,7 +454,7 @@ public class WarehouseServiceImpl implements WarehouseService {
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
}
@Override
//@Override
public ResponseResult deleteShelf(Map<String, Object> msg) {
// 进行参数校验
try {
......@@ -447,7 +468,7 @@ public class WarehouseServiceImpl implements WarehouseService {
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS);
}
@Override
//@Override
public ResponseResult getShelfList(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("warehouseId"), "warehouseId不能为空");
......@@ -504,6 +525,13 @@ public class WarehouseServiceImpl implements WarehouseService {
}
@Override
public boolean changeWarehouseState(WarehouseReq req) {
Warehouse warehouse = this.queryWarehouse(req);
BeanPlusUtil.copyProperties(req, warehouse);
return this.updateById(warehouse);
}
@Override
public ResponseResult setWarehouseInventory(Map<String, Object> msg) {
String id;
if (msg.containsKey("locationId") && msg.get("locationId")!=""){
......@@ -521,4 +549,25 @@ public class WarehouseServiceImpl implements WarehouseService {
warehouseMapper.setWarehousePriceInventory(id);
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
}
private Warehouse queryWarehouse(WarehouseReq req) {
Warehouse app = this.getById(req.getId());
if (ObjectUtil.isNull(app)) {
throw new ServiceException(WarehouseExceptionEnum.WAREHOUSE_NOT_EXIST);
}
return app;
}
private LambdaQueryWrapper<Product> createWrapper(ProductReq req) {
LambdaQueryWrapper<Product> wrapper = new LambdaQueryWrapper<>();
if (ObjectUtil.isEmpty(req)) {
return wrapper;
}
//根据业务编码查询
wrapper.like(ObjectUtil.isNotEmpty(req.getProductCode()), Product::getProductCode, req.getProductCode());
//根据企业名称模糊查询
wrapper.like(ObjectUtil.isNotEmpty(req.getName()), Product::getName, req.getName());
wrapper.orderByDesc(Product::getUpdateTime);
return wrapper;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/task/ClearLogAction.java
......@@ -36,18 +36,18 @@ public class ClearLogAction implements JobAction {
@Override
public void action() {
//获取两月前的日期
// ConfigExpander.getClearLogOffsetValue()
Integer offset = 60;
//Date maxTime = DateUtil.offsetMonth(new Date(), offset);
Date maxTime = DateUtil.offsetDay(new Date(),offset);
//配置过滤条件
LogRequest request = new LogRequest();
request.setLogType(10);
request.setEndDate(DateUtil.formatDate(maxTime));
logManagerApi.clearLog(request);
log.warn(StrUtil.format("{} 清理日志完成",
DateUtil.format(new Date(), DatePattern.NORM_DATETIME_FORMAT)));
// //获取两月前的日期
//// ConfigExpander.getClearLogOffsetValue()
// Integer offset = 60;
// //Date maxTime = DateUtil.offsetMonth(new Date(), offset);
// Date maxTime = DateUtil.offsetDay(new Date(),offset);
// //配置过滤条件
// LogRequest request = new LogRequest();
// request.setLogType(10);
// request.setEndDate(DateUtil.formatDate(maxTime));
//
// logManagerApi.clearLog(request);
// log.warn(StrUtil.format("{} 清理日志完成",
// DateUtil.format(new Date(), DatePattern.NORM_DATETIME_FORMAT)));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/task/InvExpireMsg.java
package com.junmp.jyzb.task;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.junmp.jyzb.api.util.GenCodeUtil;
import com.junmp.jyzb.entity.Company;
import com.junmp.jyzb.entity.Inventory;
import com.junmp.jyzb.entity.ProductSku;
import com.junmp.jyzb.mapper.ExpireMapper;
import com.junmp.jyzb.mapper.MsgMapper;
import com.junmp.jyzb.service.InventoryService;
import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.db.api.factory.PageFactory;
import com.junmp.v2.job.api.JobAction;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
import java.util.Map;
......@@ -17,8 +28,8 @@ import java.util.Map;
* @Author: Zhaojw
* @Description: 过期物资消息提醒
* @DateTime: 2023/7/14 16:25
* @Params:
* @Return
* @Params:
* @Return
*/
@Slf4j
@Component
......@@ -27,13 +38,48 @@ public class InvExpireMsg implements JobAction {
@Resource
private ExpireMapper ExpireMapper;
@Resource
private ExpireMapper InvertoryMapper;
private InventoryService inventoryService;
@Override
public void action() {
Company company = new Company();
// int InvCount=
Map<String,Object> oneMsg = ExpireMapper.QueryTop1000ExpireInv();
LambdaQueryWrapper<Inventory> wrapper = new LambdaQueryWrapper<>();
// 分页参数
int pageSize = 1000; // 每页记录数，可以根据需求调整
int currentPage = 1; // 当前页数
//所有待判断的物资
wrapper.eq( Inventory::getTermState, 0);
long termCount= inventoryService.count(wrapper);
if (termCount>0)
{
// 分页查询
while ((currentPage - 1) * pageSize < termCount) {
processPageData( currentPage, pageSize);
currentPage++;
}
}
}
// 处理每页数据
private void processPageData(long pageSize, long currentPage)
{
LocalDate localdate =LocalDate.now();
// 使用LambdaQueryWrapper构建查询条件
LambdaQueryWrapper<Inventory> wrapper = Wrappers.lambdaQuery();
wrapper.eq( Inventory::getTermState, 0);
wrapper.apply("production_date <= DATE_SUB({0}, INTERVAL warranty_period DAY)", localdate);
//获取过质保期的物资信息
List<Inventory> page= inventoryService.page(PageFactory.getDefaultPage(pageSize,currentPage),wrapper).getRecords();
page.forEach(o->o.setTermState(1));
inventoryService.saveOrUpdateBatch(page);
// Page<Inventory> page = inventoryService.page(PageFactory.getDefaultPage(), wrapper)
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/utils/HttpStatus.java
......@@ -48,6 +48,12 @@ public class HttpStatus
*没有运行时的任务实例,请确认!
*/
public static final int NO_SUCH_PROCESS = 100006;
/**
*流程已挂起,请确认!
*/
public static final int PROCESS_ISSUSPEND = 100007;
/**
* 请求数据超时
*/
......
jyzb-biz/src/main/java/com/junmp/jyzb/utils/RedisUtils.java
package com.junmp.jyzb.utils;
import org.omg.CORBA.OBJ_ADAPTER;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
......
jyzb-biz/src/main/java/com/junmp/jyzb/utils/ResponseResult.java
package com.junmp.jyzb.utils;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
import java.time.Instant;
/**
* 定义统一的返回类
* */
@Data
@JsonInclude(JsonInclude.Include.NON_NULL)
public class ResponseResult<T> {
......@@ -17,21 +20,28 @@ public class ResponseResult<T> {
/**
* 提示信息，如果有错误时，前端可以获取该字段进行提示
*/
private String msg;
private String message;
/**
* 查询到的结果数据，
*/
private T data;
public ResponseResult(Integer code, String msg) {
/**
* 时间戳
*/
private long timestamp;
public ResponseResult(Integer code, String message) {
this.code = code;
this.msg = msg;
this.message = message;
this.timestamp = generateTimestamp();
}
public ResponseResult(Integer code, T data) {
this.code = code;
this.data = data;
this.timestamp = generateTimestamp();
}
public Integer getCode() {
......@@ -42,25 +52,43 @@ public class ResponseResult<T> {
this.code = code;
}
public String getMsg() {
return msg;
public String getMessage() {
return message;
}
public void setMsg(String msg) {
this.msg = msg;
this.message = msg;
}
public T getData() {
return data;
}
public void setMessage(String message) {
this.message = message;
}
public long getTimestamp() {
return timestamp;
}
public void setTimestamp(long timestamp) {
this.timestamp = timestamp;
}
public void setData(T data) {
this.data = data;
}
public ResponseResult(Integer code, String msg, T data) {
this.code = code;
this.msg = msg;
this.message = msg;
this.data = data;
this.timestamp = generateTimestamp();
}
//生成时间戳函数
private long generateTimestamp() {
return Instant.now().toEpochMilli();
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/utils/ReturnMsg.java
......@@ -16,7 +16,10 @@ public class ReturnMsg {
*/
public static final String NO_SUCH_PROCESS = "没有运行时的任务实例";
/**
* 流程已挂起
*/
public static final String PROCESS_ISSUSPEND = "流程已挂起";
/**
* 操作失败
*/
......
jyzb-biz/src/main/resources/mapper/WarehouseMapper.xml
......@@ -90,7 +90,7 @@
LEFT JOIN pub_org o on w.org_id_int=o.org_id
</select>
<select id="getAllWarehouseByOrgList" parameterType="java.util.List" resultType="java.util.Map">
<select id="getAllWarehouseByOrgList" resultType="com.junmp.jyzb.entity.Warehouse">
select
w.id as warehouseId,
o.org_id as orgId,
......
jyzb-boot/jyzb-boot.iml
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="Web">
<configuration>
<webroots>
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
</webroots>
</configuration>
</facet>
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
......@@ -14,4 +21,307 @@
<configuration />
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
<orderEntry type="library" name="Maven: p6spy:p6spy:3.9.1" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.21" level="project" />
<orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.11.4" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:log-biz-manage:1.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.4.4" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.44" level="project" />
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.44" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:wrapper-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-log-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-config-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:system-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:scanner-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-log-db:1.0.0" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:junmp-v2-common:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.github.oshi:oshi-core:6.3.2" level="project" />
<orderEntry type="library" name="Maven: net.java.dev.jna:jna:5.12.1" level="project" />
<orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:5.12.1" level="project" />
<orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.27" level="project" />
<orderEntry type="library" name="Maven: com.github.whvcse:easy-captcha:1.6.2" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-security-boot-starter:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-cache-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:security-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:security-captcha:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-cache-memory:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:security-xss:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:security-sdk-listing:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:security-count:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-config-boot-starter:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-config-biz:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:config-redis-sdk:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-config-sdk:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-db-boot-starter:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-db-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-db-mp:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-db-init:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-db-flyway:1.0.0" level="project" />
<orderEntry type="library" name="Maven: org.flywaydb:flyway-core:7.1.1" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-log-boot-starter:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-log-file:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:log-biz-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:swagger2-boot-starter:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:31.0.1-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.12.0" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.7.1" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-starter:3.0.3" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:3.0.3" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:3.0.3" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-webflux:3.0.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-oas:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.1.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-core:1.5.22" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.4" level="project" />
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-boot-starter:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-data-rest:3.0.0" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-ui:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.4" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:swagger2-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.4.4" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-redis-boot-starter:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-cache-redis:1.0.0" level="project" />
<orderEntry type="library" name="Maven: redis.clients:jedis:3.3.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.9.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:file-boot-starter:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:file-biz:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:file-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:file-local:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:file-minio:1.0.0" level="project" />
<orderEntry type="library" name="Maven: io.minio:minio:3.0.10" level="project" />
<orderEntry type="library" name="Maven: com.google.http-client:google-http-client-xml:1.20.0" level="project" />
<orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.20.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.14" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.12.0" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:3.0.1" level="project" />
<orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:system-boot-starter:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:system-biz-user:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:system-biz-resource:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:system-biz-role:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:system-biz-org:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:system-biz-menu:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:system-biz-app:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:system-biz-login-log:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:auth-boot-starter:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:auth-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:auth-sdk:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-jwt-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:message-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-jwt-sdk:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:validator-boot-starter:1.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.5" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-validator-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.7.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:job-boot-starter:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-job-biz:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-job-hutool:1.0.0" level="project" />
<orderEntry type="module" module-name="jyzb-biz" />
<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" />
<orderEntry type="module" module-name="jyzb-api" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
<orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
<orderEntry type="module" module-name="jyzb-common" />
<orderEntry type="library" name="Maven: com.junmp.v2:v2-job-api:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.junmp.jyzb:jyzb-process:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4" level="project" />
<orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
<orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.4.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.4.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.4.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.5" level="project" />
<orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.0.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.73.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.73.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.73.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.73.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.73.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-tcnative-classes:2.0.46.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.73.Final" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.1" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.1" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.1" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.1" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.1" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.3" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.4.4" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.5" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generator:3.4.1" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-spring-boot-starter:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-spring-boot-autoconfigure:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-spring-security:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-idm-api:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-spring-boot-starter-process:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-engine:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-process-validation:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-image-generator:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-engine-common:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-variable-service-api:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-event-registry-api:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-variable-service:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-identitylink-service:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-identitylink-service-api:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-entitylink-service:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-entitylink-service-api:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-event-registry:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-event-registry-model:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-event-registry-json-converter:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-eventsubscription-service-api:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-event-registry-configurator:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-eventsubscription-service:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-task-service:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-task-service-api:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-job-service:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-job-service-api:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-batch-service:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-batch-service-api:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-idm-engine:6.7.2" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-idm-engine-configurator:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-cmmn-api:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-cmmn-model:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-dmn-api:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-form-model:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-form-api:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-content-api:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-http-common:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.5" level="project" />
<orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.5.6" level="project" />
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-spring:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-spring-common:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-job-spring-service:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-event-registry-spring-configurator:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-event-registry-spring:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-orm:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-spring-boot-starter-cmmn:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-cmmn-engine:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-cmmn-image-generator:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-cmmn-converter:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-case-validation:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.liquibase:liquibase-core:3.10.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.uuid:java-uuid-generator:3.3.0" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-cmmn-spring:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-spring-boot-starter-dmn:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-dmn-engine:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-dmn-model:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-dmn-xml-converter:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-dmn-image-generator:6.7.2" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-dmn-spring:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-spring-configurator:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-engine-configurator:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-cmmn-spring-configurator:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-cmmn-engine-configurator:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-dmn-spring-configurator:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-dmn-engine-configurator:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-content-spring-configurator:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-content-spring:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-content-engine:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-content-engine-configurator:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-bpmn-model:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.11" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-json-converter:6.7.2" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.10.10" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-bpmn-converter:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-engine-common-api:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.flowable:flowable-bpmn-layout:6.7.2" level="project" />
<orderEntry type="library" name="Maven: org.tinyjee.jgraphx:jgraphx:1.10.4.1" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0.1" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0.1" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.22" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spi:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-schema:3.0.0" level="project" />
<orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.83" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:3.0.0" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.2.4" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
<orderEntry type="library" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:3.0.3" level="project" />
<orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-integration:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-core:5.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.1" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.4" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-stream:5.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-mqtt:5.4.5" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5" level="project" />
</component>
</module>
\ No newline at end of file
jyzb-boot/pom.xml
......@@ -10,8 +10,7 @@
<artifactId>jyzb-boot</artifactId>
<version>1.0.0</version>
<name>jyzb-boot</name>
<packaging>war</packaging>
<!-- <packaging>war</packaging>-->
<dependencies>
<dependency>
......@@ -28,7 +27,10 @@
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>log-biz-manage</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>v2-security-boot-starter</artifactId>
......@@ -89,6 +91,7 @@
<artifactId>jyzb-biz</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.jyzb</groupId>
<artifactId>jyzb-process</artifactId>
......@@ -131,4 +134,3 @@
</plugins>
</build>
</project>
</project>
jyzb-boot/pom.xml.orig 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>junmp-jyzb-app</artifactId>
<groupId>com.junmp.jyzb</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jyzb-boot</artifactId>
<version>1.0.0</version>
<name>jyzb-boot</name>
<packaging>war</packaging>
<<<<<<< HEAD
=======
>>>>>>> develop
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>p6spy</groupId>
<artifactId>p6spy</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>log-biz-manage</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>v2-security-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>v2-config-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>v2-db-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>v2-log-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>swagger2-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>v2-redis-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>file-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>system-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>auth-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>validator-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>job-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.jyzb</groupId>
<artifactId>jyzb-biz</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.jyzb</groupId>
<artifactId>jyzb-process</artifactId>
</dependency>
<!--MQTT-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-integration</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-stream</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-mqtt</artifactId>
</dependency>
</dependencies>
<build>
<finalName>jyzb-boot</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
<configuration>
<!-- 如果没有该项配置，则devtools不会起作用，即应用不会restart -->
<mainClass>com.junmp.jyzb.boot.JyzbBootApplication</mainClass>
<fork>true</fork>
</configuration>
</plugin>
</plugins>
</build>
</project>
jyzb-boot/src/main/resources/application.yml
......@@ -4,7 +4,7 @@
server:
tomcat:
uri-encoding: UTF-8 #tomcat编码
port: 10051 #tomcat端口
port: 10031 #tomcat端口
spring:
main:
#bea同名类进行注册时，准许覆盖注册
......
jyzb-common/jyzb-common.iml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.4" level="project" />
</component>
</module>
\ No newline at end of file
jyzb-mq/jyzb-mq-consumer/jyzb-mq-consumer.iml
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.4.4" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.3.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.3.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.1" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
<orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.10.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.4.4" level="project" />
<orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
<orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
<orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
<orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
<orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
<orderEntry type="library" name="Maven: org.assertj:assertj-core:3.18.1" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
<orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.7.1" level="project" />
<orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
<orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
<orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.7.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.platform:junit-platform-engine:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.mockito:mockito-core:3.6.28" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.22" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.22" level="project" />
<orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" />
<orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.6.28" level="project" />
<orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-test:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.44" level="project" />
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.44" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.5" level="project" />
</component>
</module>
\ No newline at end of file
jyzb-mq/jyzb-mq-consumer/src/main/java/com/junmp/jyzb/config/DirectReceiver.java.orig 0 → 100644
package com.junmp.jyzb.config;
import org.springframework.amqp.rabbit.annotation.RabbitHandler;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.stereotype.Component;
import java.util.Map;
/**
* 创建消息接收监听类
* */
@Component
@RabbitListener(queues = "TestDirectQueue") //监听的队列名称 TestDirectQueue
public class DirectReceiver {
@RabbitHandler
public void process(Object testMessage) {
System.out.println("DirectReceiver消费者收到消息 : " + testMessage);
<<<<<<< HEAD
=======
>>>>>>> develop
}
}
\ No newline at end of file
jyzb-mq/jyzb-mq-consumer/target/classes/application.yml deleted 100644 → 0
server:
port: 8090
spring:
#配置rabbitMq 服务器
rabbitmq:
host: 192.168.3.188
port: 5672
username: root
password: 123456
#虚拟host 可以不设置,使用server默认host
virtual-host: /
jyzb-mq/jyzb-mq-consumer/target/maven-archiver/pom.properties deleted 100644 → 0
artifactId=jyzb-mq-consumer
groupId=com.junmp.jyzb
version=1.0.0
jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted 100644 → 0
com\junmp\jyzb\controller\SendMsgController.class
com\junmp\jyzb\config\DirectRabbitConfig.class
com\junmp\jyzb\MqConsumerApplication.class
com\junmp\jyzb\config\DirectReceiver.class
jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted 100644 → 0
E:\vue_project\jyzb_platformV2\jyzb-mq\jyzb-mq-consumer\src\main\java\com\junmp\jyzb\config\DirectReceiver.java
E:\vue_project\jyzb_platformV2\jyzb-mq\jyzb-mq-consumer\src\main\java\com\junmp\jyzb\config\DirectRabbitConfig.java
E:\vue_project\jyzb_platformV2\jyzb-mq\jyzb-mq-consumer\src\main\java\com\junmp\jyzb\MqConsumerApplication.java
E:\vue_project\jyzb_platformV2\jyzb-mq\jyzb-mq-consumer\src\main\java\com\junmp\jyzb\controller\SendMsgController.java
jyzb-mq/jyzb-mq-producer/jyzb-mq-producer.iml
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.4.4" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.3.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.3.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.3.1" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
<orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.10.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.4.4" level="project" />
<orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
<orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
<orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
<orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
<orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
<orderEntry type="library" name="Maven: org.assertj:assertj-core:3.18.1" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
<orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.7.1" level="project" />
<orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.1" level="project" />
<orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
<orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
<orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.7.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.platform:junit-platform-engine:1.7.1" level="project" />
<orderEntry type="library" name="Maven: org.mockito:mockito-core:3.6.28" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.22" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.22" level="project" />
<orderEntry type="library" name="Maven: org.objenesis:objenesis:3.1" level="project" />
<orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.6.28" level="project" />
<orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-test:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.4.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.44" level="project" />
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.44" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.5" level="project" />
</component>
</module>
\ No newline at end of file
jyzb-mq/jyzb-mq-producer/target/classes/application.yml deleted 100644 → 0
server:
port: 9001
spring:
#配置rabbitMq 服务器
rabbitmq:
host: 192.168.3.188
port: 5672
username: root
password: 123456
#虚拟host 可以不设置,使用server默认host
virtual-host: /
jyzb-mq/jyzb-mq-producer/target/maven-archiver/pom.properties deleted 100644 → 0
artifactId=jyzb-mq-producer
groupId=com.junmp.jyzb
version=1.0.0
jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted 100644 → 0
com\junmp\jyzb\controller\SendMsgController.class
com\junmp\jyzb\MqProducerApplication.class
com\junmp\jyzb\config\DirectRabbitConfig.class
jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted 100644 → 0
E:\vue_project\jyzb_platformV2\jyzb-mq\jyzb-mq-producer\src\main\java\com\junmp\jyzb\controller\SendMsgController.java
E:\vue_project\jyzb_platformV2\jyzb-mq\jyzb-mq-producer\src\main\java\com\junmp\jyzb\MqProducerApplication.java
E:\vue_project\jyzb_platformV2\jyzb-mq\jyzb-mq-producer\src\main\java\com\junmp\jyzb\config\DirectRabbitConfig.java
jyzb-mq/jyzb-mq.iml
......@@ -4,9 +4,6 @@
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
......
jyzb-process/jyzb-process.iml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="FacetManager">
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<datasource-mapping>
<factory-entry name="jyzb-process" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component>
</module>
\ No newline at end of file
jyzb-process/src/main/java/com/junmp/junmpProcess/cmd/DeleteFlowableProcessInstanceCmd.java 0 → 100644
package com.junmp.junmpProcess.cmd;
import org.flowable.common.engine.api.FlowableIllegalArgumentException;
import org.flowable.common.engine.api.FlowableObjectNotFoundException;
import org.flowable.common.engine.impl.interceptor.Command;
import org.flowable.common.engine.impl.interceptor.CommandContext;
import org.flowable.engine.compatibility.Flowable5CompatibilityHandler;
import org.flowable.engine.impl.persistence.entity.ExecutionEntity;
import org.flowable.engine.impl.util.CommandContextUtil;
import org.flowable.engine.impl.util.Flowable5Util;
import org.flowable.engine.runtime.ProcessInstance;
import java.io.Serializable;
public class DeleteFlowableProcessInstanceCmd implements Command<Void>, Serializable {
private static final long serialVersionUID = 1L;
protected String processInstanceId;
protected String deleteReason;
protected boolean cascade = false;
public DeleteFlowableProcessInstanceCmd(String processInstanceId, String deleteReason) {
this.processInstanceId = processInstanceId;
this.deleteReason = deleteReason;
}
public DeleteFlowableProcessInstanceCmd(String processInstanceId, String deleteReason,boolean cascade) {
this.processInstanceId = processInstanceId;
this.deleteReason = deleteReason;
this.cascade = cascade;
}
@Override
public Void execute(CommandContext commandContext) {
if (processInstanceId == null) {
throw new FlowableIllegalArgumentException("processInstanceId is null");
}
ExecutionEntity processInstanceEntity = CommandContextUtil.getExecutionEntityManager(commandContext).findById(processInstanceId);
if (processInstanceEntity == null) {
throw new FlowableObjectNotFoundException("No process instance found for id '" + processInstanceId + "'", ProcessInstance.class);
}
if (processInstanceEntity.isDeleted()) {
return null;
}
if (Flowable5Util.isFlowable5ProcessDefinitionId(commandContext, processInstanceEntity.getProcessDefinitionId())) {
Flowable5CompatibilityHandler compatibilityHandler = Flowable5Util.getFlowable5CompatibilityHandler();
compatibilityHandler.deleteProcessInstance(processInstanceId, deleteReason);
} else {
CommandContextUtil.getExecutionEntityManager(commandContext).deleteProcessInstance(processInstanceEntity.getProcessInstanceId(), deleteReason, cascade);
}
return null;
}
}
\ No newline at end of file
jyzb-process/src/main/java/com/junmp/junmpProcess/controller/BpmnController.java
......@@ -10,10 +10,7 @@ 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.ApplyDTO;
import com.junmp.junmpProcess.dto.HandleDataDTO;
import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
import com.junmp.junmpProcess.dto.TaskDTO;
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;
......@@ -22,6 +19,8 @@ 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;
......@@ -72,42 +71,80 @@ public class BpmnController {
@ApiOperation("创建流程和表单")
@PostMapping(value = "create")
public ResponseResult create(@RequestBody ProcessVO processVO) throws JsonProcessingException {
return WorkProcessService.createBpmn(processVO);
public ApiRes<Boolean> create(@RequestBody ProcessVO processVO) throws JsonProcessingException {
return ApiRes.success(WorkProcessService.createBpmn(processVO));
}
/**
* 编辑表单
* 修改表单
*/
@ApiOperation("修改表单")
@PutMapping("updateForm")
public ResponseResult updateForm(@RequestBody UpdateProcessVO process) throws JsonProcessingException {
return WorkProcessService.updateForm(process);
public ApiRes<Boolean> updateForm(@RequestBody UpdateProcessVO process) throws JsonProcessingException {
return ApiRes.success(WorkProcessService.updateForm(process));
}
/**
* 编辑表单
* 修改表单
*/
@ApiOperation("删除流程实例")
@PostMapping("deleteForm")
public ApiRes<Boolean> deleteProcessInstanceById(@RequestBody ProcessDTO process) {
return ApiRes.success(WorkProcessService.deleteProcessInstance(process));
}
/**
* 修改表单名称和备注
*/
@ApiOperation("修改表单名称和备注")
@PostMapping("updateFormName")
public ApiRes<Boolean> updateFormName(@RequestBody UpdateProcessVO process) throws JsonProcessingException {
return ApiRes.success(WorkProcessService.updateFormName(process));
}
/**
* 转交
*/
@ApiOperation("轉交")
@PutMapping("turn")
public ResponseResult turn(@RequestBody TurnVo turns) {
return WorkProcessService.turn(turns);
}
public ApiRes<Boolean> turn(@RequestBody TurnVo turns) {
if (WorkProcessService.turn(turns))
{
return ApiRes.success();
}
else
{
return ApiRes.failure("沒有可用实例");
}
}
@ApiOperation("创建新表单")
@PostMapping("createForm")
public ApiRes<Boolean> createForm(@RequestBody FormReq formReq) {
return ApiRes.success(WorkProcessService.createNewForm(formReq));
}
// @ApiOperation("终止流程")
// @PostMapping("StopProcessInstanceById")
// public ApiRes<Boolean> stopProcessInstanceById(@RequestBody HandleDataDTO handleDataDTO) {
// return ApiRes.success(WorkProcessService.suspendOrActivateProcessDefinitionById(req));
// }
@ApiOperation("挂起流程实例")
@PostMapping("SuspendOrActivateDefinition")
public ApiRes<Boolean> SuspendOrActivateDefinition(@RequestBody SuspendOrActivateDefinitionReq req) {
return ApiRes.success(WorkProcessService.suspendOrActivateProcessDefinitionById(req));
}
@ApiOperation("通过流程定义id启动流程")
@PostMapping("start")
public ResponseResult start(@RequestBody StartProcessInstanceDTO startProcessInstanceDTO) {
public ApiRes<Boolean> start(@RequestBody StartProcessInstanceDTO startProcessInstanceDTO) {
return WorkProcessService.start(startProcessInstanceDTO);
}
@ApiOperation("查看我发起的流程")
@PostMapping("applyList")
public PageResult<HistoryProcessInstanceVO> applyList(@RequestBody ApplyDTO ApplyDTO) {
return WorkProcessService.applyList(ApplyDTO);
public ApiRes<PageResult<HistoryProcessInstanceVO>> applyList(@RequestBody ApplyDTO ApplyDTO) {
return ApiRes.success(WorkProcessService.applyList(ApplyDTO));
}
@ApiOperation("查看我的待办")
@PostMapping("toDoList")
public PageResult<TaskVO> toDoList(@RequestBody TaskDTO taskDTO){
return WorkProcessService.toDoList(taskDTO);
public ApiRes<PageResult<TaskVO>> toDoList(@RequestBody TaskDTO taskDTO){
return ApiRes.success(WorkProcessService.toDoList(taskDTO));
}
@ApiOperation("同意按钮")
@PostMapping("agree")
......
jyzb-process/src/main/java/com/junmp/junmpProcess/dto/ProcessDTO.java 0 → 100644
package com.junmp.junmpProcess.dto;
import com.alibaba.fastjson.JSONObject;
import lombok.Data;
@Data
public class ProcessDTO {
private String processDefinitionId;
private String templateId;
}
jyzb-process/src/main/java/com/junmp/junmpProcess/listener/CounterSignListener.java
......@@ -9,6 +9,8 @@ import com.junmp.junmpProcess.dto.json.*;
import com.junmp.junmpProcess.exception.WorkFlowException;
import com.junmp.junmpProcess.mapper.OrgUserMapper;
import com.junmp.junmpProcess.service.Repository.ProcessTemplateService;
import com.junmp.v2.auth.api.bean.login.LoginUser;
import com.junmp.v2.auth.api.context.LoginContext;
import com.junmp.v2.sys.api.UserServiceApi;
import com.junmp.v2.sys.api.bean.user.dto.RoleUserDto;
import com.junmp.v2.sys.api.bean.user.vo.QueryUserInfoVo;
......@@ -128,9 +130,27 @@ public class CounterSignListener implements ExecutionListener {
{
assigneeList.add(userId.getUserID());
}
}
}
else if (Type.equals("5"))//上级审批
{
LoginUser StartUser= LoginContext.getContext().getLoginUser();
List<UserListDTO> userList= orgUserMapper.QueryUserParentOrg(StartUser.getUserId().toString());
if (userList.size()<=0)//没有上级则本身已是上级
{
assigneeList.add(StartUser.getUserId().toString());
}
else//
{
for (UserListDTO userId :userList)
{
assigneeList.add(userId.getUserID());
}
}
}
if (assigneeList.size()!=0)
......
jyzb-process/src/main/java/com/junmp/junmpProcess/mapper/OrgUserMapper.java
......@@ -22,4 +22,6 @@ public interface OrgUserMapper {
* @Return
*/
public List<UserListDTO> QueryUserByRoleIdAndOrg(String roleId,String orgId);
public List<UserListDTO> QueryUserParentOrg(String userId);
}
jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/WorkProcessService.java
......@@ -4,15 +4,15 @@ 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.ApplyDTO;
import com.junmp.junmpProcess.dto.HandleDataDTO;
import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
import com.junmp.junmpProcess.dto.TaskDTO;
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.utils.ResponseResult;
import com.junmp.v2.common.bean.request.BaseRequest;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
import org.springframework.web.bind.annotation.RequestBody;
......@@ -21,19 +21,54 @@ import java.util.Map;
public interface WorkProcessService {
/**
* 创建表单
*
* @return
*/
Boolean createNewForm(FormReq processVO) ;
// /**
// * 挂起流程定义
// *
// * @return
// */
// Boolean stopProcessInstanceById(SuspendOrActivateDefinitionReq req) ;
/**
* 挂起流程定义
*
* @return
*/
Boolean suspendOrActivateProcessDefinitionById(SuspendOrActivateDefinitionReq req) ;
/**
* 创建表单
*
* @return
*/
ResponseResult createBpmn(ProcessVO processVO) throws JsonProcessingException;
Boolean createBpmn(ProcessVO processVO) throws JsonProcessingException;
/**
* 编辑表单
*
* @return
*/
ResponseResult updateForm(UpdateProcessVO process) throws JsonProcessingException;
ResponseResult turn(TurnVo turns);
Boolean deleteProcessInstance(ProcessDTO processInstance);
/**
* 编辑表单
*
* @return
*/
Boolean updateForm(UpdateProcessVO process)throws JsonProcessingException;
/**
* 编辑表单名称
*
* @return
*/
Boolean updateFormName(UpdateProcessVO process);
Boolean turn(TurnVo turns);
/**
* @Author: Zhaojw
......@@ -64,7 +99,7 @@ public interface WorkProcessService {
*
* @return
*/
ResponseResult start(StartProcessInstanceDTO startProcessInstanceDTO);
ApiRes<Boolean> start(StartProcessInstanceDTO startProcessInstanceDTO);
/**
* 查看我发起的流程
......
jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java
......@@ -8,12 +8,14 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.PageUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
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.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
import com.junmp.junmpProcess.cmd.DeleteFlowableProcessInstanceCmd;
import com.junmp.junmpProcess.dto.*;
import com.junmp.junmpProcess.dto.json.*;
import com.junmp.junmpProcess.entity.ProcessTemplates;
......@@ -25,10 +27,17 @@ 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.utils.HttpStatus;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.jyzb.utils.ReturnMsg;
import com.junmp.v2.auth.api.LoginUserApi;
import com.junmp.v2.auth.api.bean.login.LoginUser;
import com.junmp.v2.auth.api.context.LoginContext;
import com.junmp.v2.common.bean.request.BaseRequest;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.factory.PageFactory;
import com.junmp.v2.db.api.factory.PageResultFactory;
import com.junmp.v2.db.api.page.PageResult;
......@@ -38,19 +47,18 @@ import org.flowable.bpmn.BpmnAutoLayout;
import org.flowable.bpmn.model.*;
import org.flowable.bpmn.model.Process;
import org.flowable.common.engine.impl.identity.Authentication;
import org.flowable.engine.HistoryService;
import org.flowable.engine.RepositoryService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.engine.*;
import org.flowable.engine.delegate.ExecutionListener;
import org.flowable.engine.history.HistoricActivityInstance;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.history.HistoricProcessInstanceQuery;
import org.flowable.engine.impl.persistence.entity.ExecutionEntity;
import org.flowable.engine.repository.Deployment;
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;
......@@ -84,7 +92,8 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
private ProcessTemplateService processTemplateService;
@Resource
private RepositoryService repositoryService;
@Autowired
protected ManagementService managementService;
@Resource
private RuntimeService runtimeService;
......@@ -124,7 +133,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
}
return task;
}
public ResponseResult turn(TurnVo turns)
public Boolean turn(TurnVo turns)
{
......@@ -144,17 +153,19 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
taskService.setOwner(turns.getTaskId(), owner);
}
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,"转办成功");
return true;
} else {
return new ResponseResult(HttpStatus.NO_SUCH_PROCESS,ReturnMsg.PASS,"没有运行时的任务实例,请确认!");
return false;
}
}
public PageResult<TemplateGroupVo> getFormList(BaseRequest br)
{
LambdaQueryWrapper<ProcessTemplates> wrapper = new LambdaQueryWrapper<ProcessTemplates>();
wrapper.orderByDesc(ProcessTemplates::getUpdated);
TemplateGroupMapper templateGroupMapper = SpringContextHolder.getBean(TemplateGroupMapper.class);
Page<ProcessTemplates> allformAndGroups =this.page(PageFactory.getDefaultPage());
templateGroupMapper.getAllFormAndGroups();
Page<ProcessTemplates> allformAndGroups =this.page(PageFactory.getDefaultPage(),wrapper);
// templateGroupMapper.getAllFormAndGroups();
Map<Integer, List<ProcessTemplates>> coverMap = new LinkedHashMap<>();
allformAndGroups.getRecords().forEach(fg -> {
List<ProcessTemplates> bos = coverMap.get(fg.getGroupId());
......@@ -200,7 +211,48 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
pageResult.setTotalPage(PageUtil.totalPage(Convert.toInt(pageResult.getTotalRows()), Convert.toInt(pageResult.getPageSize())));
return pageResult;
}
public ResponseResult createBpmn(ProcessVO processVO) throws JsonProcessingException {
/**
* @Author: Zhaojw
* @Description: 创建新表单
* @DateTime: 2023/7/24 11:50
* @Params:
* @Return
*/
public Boolean createNewForm(FormReq req) {
ProcessTemplates processTemplates = ProcessTemplates.builder().build();
String templateId = idWorker.nextId()+"";
processTemplates.setTemplateId(templateId);
processTemplates.setFormName(req.getFormName());
processTemplates.setRemark(req.getRemark());
processTemplates.setIsStop(true);
Date date= new Date();
processTemplates.setUpdated(date);
processTemplateService.save(processTemplates);
return true;
}
@Override
public Boolean suspendOrActivateProcessDefinitionById(SuspendOrActivateDefinitionReq req) {
ProcessTemplates processTemplates = processTemplateService.getById(req.getTemplateId());
if (req.getIsStop() == true){
repositoryService.suspendProcessDefinitionById(req.getProcessDefinitionId(), true, null);
processTemplates.setIsStop(true);
}else {
processTemplates.setIsStop(false);
repositoryService.activateProcessDefinitionById(req.getProcessDefinitionId(), true, null);
}
processTemplates.setUpdated(new Date());
return processTemplateService.updateById(processTemplates);//更新表单明细表信息
}
public Boolean createBpmn(ProcessVO processVO) throws JsonProcessingException {
//流程定义
ObjectMapper objectMapper = new ObjectMapper();
JsonNode processJsonNode = objectMapper.readTree(processVO.getProcessJson());
......@@ -222,16 +274,79 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
BpmnModel bpmnModel = toBpmn(processJsonNode,formJsonNode,formName,templateId);
Deployment deploy = repositoryService.createDeployment()
.addBpmnModel(processVO.getFormName()+".bpmn20.xml", bpmnModel)
.name(processVO.getFormName())
.addBpmnModel(templateId+".bpmn20.xml", bpmnModel)
.name(templateId)
.category(templateId)
.deploy();
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,deploy.getId());
return true;
}
/**
* @Author: Zhaojw
* @Description: 删除流程实例
* @DateTime: 2023/7/22 10:16
* @Params:
* @Return
*/
public Boolean deleteProcessInstance(ProcessDTO processInstance)
{
List<ProcessInstance> processInstances = runtimeService.createProcessInstanceQuery()
.processDefinitionId(processInstance.getProcessDefinitionId())
.list();
// 使用增强型 for 循环遍历列表
for (ProcessInstance processInstancesItem : processInstances) {
// 在这里对每个 ProcessInstance 进行处理
long count = runtimeService.createProcessInstanceQuery().processInstanceId(processInstancesItem.getId()).count();
if (count > 0) {
DeleteFlowableProcessInstanceCmd cmd = new DeleteFlowableProcessInstanceCmd(processInstancesItem.getId(), "删除流程实例", true);
managementService.executeCommand(cmd);
// 删除与已删除流程定义相关的部署数据
repositoryService.deleteDeployment(processInstancesItem.getDeploymentId(), true);
} else {
HistoricProcessInstanceQuery query= historyService.createHistoricProcessInstanceQuery()
.processInstanceId(processInstancesItem.getId());
// 查询历史流程实例数据
HistoricProcessInstance historicProcessInstance = query.singleResult();
if (historicProcessInstance != null) {
historyService.deleteHistoricProcessInstance(processInstancesItem.getId());
}
}
}
ProcessTemplates pro=processTemplateService.getById(processInstance.getTemplateId());
if (pro!=null)
{
processTemplateService.removeById(processInstance.getTemplateId());
}
return true;
}
/**
* @Author: Zhaojw
* @Description: 修改表单名称
* @DateTime: 2023/7/21 14:30
* @Params:
* @Return
*/
public Boolean updateFormName(UpdateProcessVO process) {
ProcessTemplates processTemplates = processTemplateService.getById(process.getTemplateId());
processTemplates.setFormName(process.getFormName());
processTemplates.setRemark(process.getRemark());
processTemplates.setUpdated(new Date());
return processTemplateService.updateById(processTemplates);//更新表单明细表信息
}
/**
* 编辑表单详情
*
......@@ -239,24 +354,33 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
*/
@Transactional
public ResponseResult updateForm(UpdateProcessVO process) throws JsonProcessingException {
public Boolean updateForm(UpdateProcessVO process) throws JsonProcessingException {
ObjectMapper objectMapper = new ObjectMapper();
JsonNode processJsonNode = objectMapper.readTree(process.getProcessJson());
JsonNode formJsonNode = objectMapper.readTree(process.getFormJson());
String formName=process.getFormName().toString();
String templateId = idWorker.nextId()+"";
ProcessTemplates processTemplates = processTemplateService.getById(process.getFormId());
processTemplates.setFormName(process.getFormName());
processTemplates.setFormJson(process.getFormJson());
processTemplates.setProcessJson(process.getProcessJson());
String formName="";
ProcessTemplates processTemplates = processTemplateService.getById(process.getTemplateId());
if (ObjectUtil.isNotEmpty(process.getFormName()))
{
formName= process.getFormName().toString();
processTemplates.setFormName(process.getFormName());
}
processTemplates.setFormJson(formJsonNode.toString());
processTemplates.setProcessJson(processJsonNode.toString());
String fj=process.getFormJson().toString();
// processTemplates.setFormJson(process.getFormJson().toString());
processTemplates.setProcessJson(process.getProcessJson().toString());
processTemplates.setUpdated(new Date());
processTemplateService.updateById(processTemplates);//更新表单明细表信息
BpmnModel bpmnModel = toBpmn(processJsonNode,formJsonNode,formName,templateId);
BpmnModel bpmnModel = toBpmn(processJsonNode,formJsonNode,formName,process.getTemplateId());
Deployment deploy = repositoryService.createDeployment()
.addBpmnModel(process.getFormName()+".bpmn20.xml", bpmnModel)
.name(process.getFormName())
.addBpmnModel(process.getTemplateId()+".bpmn20.xml", bpmnModel)
.name(process.getTemplateId())
.category(process.getTemplateId())
.deploy();
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,"");
return true;
}
......@@ -502,36 +626,46 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
* @return
*/
@Override
public ResponseResult start(StartProcessInstanceDTO processInstanceDto) {
public ApiRes<Boolean> start(StartProcessInstanceDTO processInstanceDto) {
try {
LoginUserApi user= LoginContext.getContext();
LoginUser StartUser= LoginContext.getContext().getLoginUser();
JSONObject formData = processInstanceDto.getFormData();
JunmpUserInfo startUserInfo = processInstanceDto.getStartUserInfo();
Authentication.setAuthenticatedUserId(startUserInfo.getUserId());
// JunmpUserInfo startUserInfo = processInstanceDto.getStartUserInfo();
Authentication.setAuthenticatedUserId(StartUser.getUserId().toString());
Map<String,Object> processVariables= new HashMap<>();
processVariables.put(FORM_VAR,formData);
processVariables.put(START_USER_INFO,JSONObject.toJSONString(startUserInfo));
processVariables.put(START_USER_INFO,JSONObject.toJSONString(StartUser));
processVariables.put(PROCESS_STATUS,BUSINESS_STATUS_1);
// processVariables.put("initiator",JSONObject.toJSONString(startUserInfo));
ArrayList<JunmpUserInfo> userInfos = CollUtil.newArrayList(startUserInfo);
ArrayList<LoginUser> userInfos = CollUtil.newArrayList(StartUser);
Map formValue = JSONObject.parseObject(formData.toJSONString(), new TypeReference<Map>() {
});
processVariables.putAll(formValue);
ProcessInstanceBuilder processInstanceBuilder = runtimeService.createProcessInstanceBuilder();
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionKey(processInstanceDto.getProcessDefinitionId())
.latestVersion().singleResult();
// if (processDefinition == null )
// {
// return ApiRes.failure("流程不存在或已挂起");
//
// }
// if (processDefinition != null && processDefinition.isSuspended())
// {
// return ApiRes.failure("流程不存在或已挂起");
// }
ProcessInstance processInstance = processInstanceBuilder
.processDefinitionId(processInstanceDto.getProcessDefinitionId())
.variable("initiator",startUserInfo.getUserId())
.variable("initiator",StartUser.getUserId())
.variables(processVariables)
.businessStatus(BUSINESS_STATUS_1)
.start();
.start();
//手动完成第一个任务
Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
Object ts=new Object();
......@@ -539,19 +673,18 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
taskService.complete(task.getId());
}
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,processInstance.getId());
return ApiRes.success(true);
}
catch (Exception e){
Throwable cause = e.getCause();
if(cause instanceof WorkFlowException){
WorkFlowException workFlowException=(WorkFlowException)cause;
return new ResponseResult(HttpStatus.PROCESS_START_ERROR,ReturnMsg.PROCESS_START_ERROR,workFlowException.getMessage());
return ApiRes.failure(workFlowException.getMessage());
}
e.printStackTrace();
return new ResponseResult(HttpStatus.PROCESS_START_ERROR,ReturnMsg.PROCESS_START_ERROR,"");
return ApiRes.failure("流程不存在或已挂起");
}
}
......@@ -562,19 +695,16 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
*/
@Override
public PageResult<HistoryProcessInstanceVO> applyList(ApplyDTO applyDTO) {
LoginUser StartUser= LoginContext.getContext().getLoginUser();
PageResult<HistoryProcessInstanceVO> pageResult=new PageResult<HistoryProcessInstanceVO>();
// List<Task> tasks = taskService.createTaskQuery()
// .taskCandidateOrAssigned(applyDTO.getCurrentUserInfo().getId())
// .list();
// List<Task> list = taskService.createTaskQuery().processInstanceId(processInstanceId).list();
List<HistoricProcessInstance> historicProcessInstances =
historyService.createHistoricProcessInstanceQuery()
.includeProcessVariables()
.startedBy(applyDTO.getCurrentUserInfo().getId())
.startedBy(StartUser.getUserId().toString())
.orderByProcessInstanceStartTime().desc()
.listPage((applyDTO.getPageNo() - 1) * applyDTO.getPageSize(), applyDTO.getPageSize());
long count = historyService.createHistoricProcessInstanceQuery()
.startedBy(applyDTO.getCurrentUserInfo().getId()).count();
.startedBy(StartUser.getUserId().toString()).count();
List<HistoryProcessInstanceVO> historyProcessInstanceVOS = new ArrayList<>();
Page<HistoryProcessInstanceVO> page = new Page<>();
for (HistoricProcessInstance historicProcessInstance : historicProcessInstances) {
......@@ -618,17 +748,15 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
*/
@Override
public PageResult<TaskVO> toDoList(TaskDTO taskDTO) {
List<Task> tasks = taskService.createTaskQuery().taskAssignee(taskDTO.getCurrentUserInfo().getUserId())
LoginUser StartUser= LoginContext.getContext().getLoginUser();
List<Task> tasks = taskService.createTaskQuery().taskAssignee(StartUser.getUserId().toString())
.includeProcessVariables()
.orderByTaskCreateTime().desc()
.listPage((taskDTO.getPageNo() - 1) * taskDTO.getPageSize(), taskDTO.getPageSize());
long count = taskService.createTaskQuery().taskAssignee(taskDTO.getCurrentUserInfo().getUserId()).count();
long count = taskService.createTaskQuery().taskAssignee(StartUser.getUserId().toString()).count();
List<TaskVO> taskVOS= new ArrayList<>();
Page<TaskVO> page =new Page<>();
for (Task task : tasks) {
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult();
String startUserId = processInstance.getStartUserId();
BpmnModel bpmnModel = repositoryService.getBpmnModel(task.getProcessDefinitionId());
......@@ -665,14 +793,15 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
*/
@Override
public Result<Page<TaskVO>> doneList(TaskDTO taskDTO) {
LoginUser StartUser= LoginContext.getContext().getLoginUser();
List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery()
.taskAssignee(taskDTO.getCurrentUserInfo().getUserId())
.taskAssignee(StartUser.getUserId().toString())
.finished()
.includeProcessVariables()
.orderByTaskCreateTime().desc()
.listPage((taskDTO.getPageNo() - 1) * taskDTO.getPageSize(), taskDTO.getPageSize());
long count = historyService.createHistoricTaskInstanceQuery()
.taskAssignee(taskDTO.getCurrentUserInfo().getUserId()).count();
.taskAssignee(StartUser.getUserId().toString()).count();
List<TaskVO> taskVOS = new ArrayList<>();
Page<TaskVO> page = new Page<>();
for (HistoricTaskInstance task : tasks) {
......@@ -714,8 +843,9 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
@Override
public ResponseResult revoke(HandleDataDTO handleDataDTO) {
UserInfo currentUserInfo = handleDataDTO.getCurrentUserInfo();
Authentication.setAuthenticatedUserId(currentUserInfo.getId());
LoginUser StartUser= LoginContext.getContext().getLoginUser();
// UserInfo currentUserInfo = handleDataDTO.getCurrentUserInfo();
Authentication.setAuthenticatedUserId(StartUser.getUserId().toString());
List<AttachmentDTO> attachments = handleDataDTO.getAttachments();
String comments = handleDataDTO.getComments();
JSONObject formData = handleDataDTO.getFormData();
......@@ -747,7 +877,8 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
}
@Override
public ResponseResult agree(HandleDataDTO handleDataDTO) {
UserInfo currentUserInfo = handleDataDTO.getCurrentUserInfo();
LoginUser StartUser= LoginContext.getContext().getLoginUser();
List<AttachmentDTO> attachments = handleDataDTO.getAttachments();
String comments = handleDataDTO.getComments();
JSONObject formData = handleDataDTO.getFormData();
......@@ -766,7 +897,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
}
runtimeService.setVariables(task.getProcessInstanceId(), map);//设置进入当前流程
Authentication.setAuthenticatedUserId(currentUserInfo.getId());
Authentication.setAuthenticatedUserId(StartUser.getUserId().toString());
if (StringUtils.isNotBlank(comments)) {
taskService.addComment(task.getId(), task.getProcessInstanceId(), "opinion", comments);
}
......@@ -809,7 +940,8 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
@Override
public Result delegateTask(HandleDataDTO handleDataDTO) {
UserInfo currentUserInfo = handleDataDTO.getCurrentUserInfo();
LoginUser StartUser= LoginContext.getContext().getLoginUser();
List<AttachmentDTO> attachments = handleDataDTO.getAttachments();
String comments = handleDataDTO.getComments();
JSONObject formData = handleDataDTO.getFormData();
......@@ -824,7 +956,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
}
runtimeService.setVariables(task.getProcessInstanceId(), map);
Authentication.setAuthenticatedUserId(currentUserInfo.getId());
Authentication.setAuthenticatedUserId(StartUser.getUserId().toString());
if (StringUtils.isNotBlank(comments)) {
taskService.addComment(task.getId(), task.getProcessInstanceId(), "opinion", comments);
}
......@@ -845,7 +977,8 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
@Override
public Result resolveTask(HandleDataDTO handleDataDTO) {
UserInfo currentUserInfo = handleDataDTO.getCurrentUserInfo();
LoginUser StartUser= LoginContext.getContext().getLoginUser();
List<AttachmentDTO> attachments = handleDataDTO.getAttachments();
String comments = handleDataDTO.getComments();
JSONObject formData = handleDataDTO.getFormData();
......@@ -860,7 +993,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
}
runtimeService.setVariables(task.getProcessInstanceId(), map);
Authentication.setAuthenticatedUserId(currentUserInfo.getId());
Authentication.setAuthenticatedUserId(StartUser.getUserId().toString());
if (StringUtils.isNotBlank(comments)) {
taskService.addComment(task.getId(), task.getProcessInstanceId(), "opinion", comments);
}
......@@ -880,8 +1013,9 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
@Override
public ResponseResult refuse(HandleDataDTO handleDataDTO) {
UserInfo currentUserInfo = handleDataDTO.getCurrentUserInfo();
Authentication.setAuthenticatedUserId(currentUserInfo.getId());
LoginUser StartUser= LoginContext.getContext().getLoginUser();
Authentication.setAuthenticatedUserId(StartUser.getUserId().toString());
List<AttachmentDTO> attachments = handleDataDTO.getAttachments();
String comments = handleDataDTO.getComments();
JSONObject formData = handleDataDTO.getFormData();
......@@ -916,8 +1050,9 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
@Override
public Result assignee(HandleDataDTO handleDataDTO) {
UserInfo currentUserInfo = handleDataDTO.getCurrentUserInfo();
Authentication.setAuthenticatedUserId(currentUserInfo.getId());
LoginUser StartUser= LoginContext.getContext().getLoginUser();
Authentication.setAuthenticatedUserId(StartUser.getUserId().toString());
List<AttachmentDTO> attachments = handleDataDTO.getAttachments();
String comments = handleDataDTO.getComments();
JSONObject formData = handleDataDTO.getFormData();
......@@ -950,8 +1085,8 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
@Override
public Result rollback(HandleDataDTO handleDataDTO) {
UserInfo currentUserInfo = handleDataDTO.getCurrentUserInfo();
Authentication.setAuthenticatedUserId(currentUserInfo.getId());
LoginUser StartUser= LoginContext.getContext().getLoginUser();
Authentication.setAuthenticatedUserId(StartUser.getUserId().toString());
List<AttachmentDTO> attachments = handleDataDTO.getAttachments();
String comments = handleDataDTO.getComments();
JSONObject formData = handleDataDTO.getFormData();
......
jyzb-process/src/main/java/com/junmp/junmpProcess/utils/BpmnConvert.java
......@@ -53,7 +53,6 @@ public class BpmnConvert {
bpmnModel.addProcess(process);
// 二.开始结束节点
// 二.开始结束节点
StartEvent startEvent = new StartEvent();// 新建开始节点
startEvent.setId("_start");
startEvent.setInitiator("initiator");
......
jyzb-process/src/main/java/com/junmp/junmpProcess/vo/UpdateProcessVO.java
......@@ -4,8 +4,9 @@ import lombok.Data;
@Data
public class UpdateProcessVO {
private String formId;
private String templateId;
private String formJson;
private String formName;
private String processJson;
private String remark;
}
jyzb-process/src/main/resources/mapper/OrgUserMapper.xml
......@@ -20,4 +20,22 @@
where sr.role_id in ${roleId} and po.org_id in ${orgId}
GROUP BY su.user_id,su.real_name
</select>
<select id="QueryUserParentOrg" resultMap="UserListDTO">
SELECT
CASE
WHEN userorg2.org_id = -1 THEN mainUser.user_id
ELSE user2.user_id
END AS user_id,
user2.real_name
FROM (
SELECT org.org_id, user.user_id, user.real_name, org.org_parent_id, org.org_name
FROM `sys_user` AS user
JOIN sys_user_org AS userorg ON userorg.user_id = user.user_id
JOIN pub_org AS org ON org.org_id = userorg.org_id
WHERE user.user_id = ${userId}
) AS mainUser
JOIN sys_user_org AS userorg2 ON mainUser.org_parent_id = userorg2.org_id
JOIN sys_user AS user2 ON user2.user_id = userorg2.user_id;
</select>
</mapper>
\ No newline at end of file
pom.xml
......@@ -13,7 +13,7 @@
<module>jyzb-api</module>
<module>jyzb-boot</module>
<module>jyzb-biz</module>
<module>jyzb-process</module>
<!-- <module>jyzb-process</module>-->
<module>jyzb-common</module>
<module>jyzb-mq</module>
</modules>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论