Skip to content

J
jyzb_platformV2
Commit 93eea402 by 李小惠
Options

Merge branch 'develop' into develop-lxh 

# Conflicts:
#	jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventoryMapper.java
#	jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java
#	jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java
#	jyzb-boot/pom.xml
#	jyzb-mq/jyzb-mq-consumer/src/main/java/com/junmp/jyzb/config/DirectReceiver.java
#	jyzb-mq/jyzb-mq-consumer/target/classes/application.yml
#	jyzb-mq/jyzb-mq-consumer/target/maven-archiver/pom.properties
#	jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	jyzb-mq/jyzb-mq-producer/target/classes/application.yml
#	jyzb-mq/jyzb-mq-producer/target/maven-archiver/pom.properties
#	jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
parents 0a054941 ad5d14ee
正在显示 包含 991 行增加 和 565 行删除
.gitignore
......@@ -41,3 +41,7 @@ ehthumbs.db
Thumbs.db
/*/target/*
/.idea/misc.xml
/.idea/jyzb_platformV2.iml
/.idea/artifacts/jyzb3.xml
/jyzb-mq/jyzb-mq-consumer/target/classes/application.yml
/jyzb-mq/jyzb-mq-producer/target/classes/application.yml
.idea/modules.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/jyzb-api/jyzb-api.iml" filepath="$PROJECT_DIR$/jyzb-api/jyzb-api.iml" />
<module fileurl="file://$PROJECT_DIR$/jyzb-biz/jyzb-biz.iml" filepath="$PROJECT_DIR$/jyzb-biz/jyzb-biz.iml" />
<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" />
</modules>
</component>
</project>
\ No newline at end of file
jyzb-api/jyzb-api.iml
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<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/pom.xml
......@@ -6,6 +6,7 @@
<groupId>com.junmp.jyzb</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jyzb-api</artifactId>
<version>1.0.0</version>
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentSizeDto.java 0 → 100644
//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 0 → 100644
//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 0 → 100644
//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/InventoryDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class InventoryDto implements Serializable {
private String ID;
/**
* 装备包ID
*/
private String packageId;
/**
* 装备类型ID
*/
private String typeId;
/**
* 装备类型
*/
// private EquipmentTypeDto eqType;
/**
* 装备号型ID
*/
private String sizeId;
/**
* 装备号型
*/
// private EquipmentSizeDto eqSize;
/**
* 供应商
*/
private String supplierName;
/**
* 供应商ID
*/
private String supplierId;
/**
* 部门ID
*/
private long departmentId;
/**
* 部门
*/
private long departmentName;
/**
* 货架位置
*/
private String shelfLocation;
/**
* 货架位置
*/
private String shelfId;
/**
* epc
*/
private String epc;
/**
* 组织机构ID
*/
private String orgId;
/**
* 组织机构
*/
private String orgName;
/**
* 物资状态
*/
private String state;
/**
* 业务状态
*/
private String bussiness_state;
/**
* 位置状态
*/
private String locationState;
/**
* 生产日期
*/
private DateTime productionDate;
/**
* 质保期
*/
private int warrantyPeriod;
/**
* 维保期
*/
private int maintenancePeriod;
/**
* 维修次数
*/
private int fixCount;
/**
* 位置类型
*/
private String locationType;
/**
* 位置ID
*/
private String locationId ;
/**
* 位置
*/
private String locationName ;
/**
* 是否遗失
*/
private int lostFlag ;
/**
* Tid
*/
private String tid ;
/**
* 价格
*/
private BigDecimal price ;
/**
* 备注
*/
private String note ;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 创建时间
*/
private String updateUser;
/**
* 更新时间
*/
private String createUser;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/InventoryReq.java 0 → 100644
package com.junmp.jyzb.api.bean.req;
import cn.hutool.core.date.DateTime;
import com.junmp.v2.common.bean.request.BaseRequest;
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;
import java.math.BigDecimal;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
public class InventoryReq extends BaseRequest {
private String ID;
/**
* 装备包ID
*/
private String packageId;
/**
* 装备类型ID
*/
private String typeId;
/**
* 装备号型ID
*/
private String sizeId;
/**
* 装备号型
*/
private String sizeName;
/**
* 供应商
*/
private String supplierName;
/**
* 供应商ID
*/
private String supplierId;
/**
* 部门ID
*/
private long departmentId;
/**
* 货架位置
*/
private String shelfId;
/**
* epc
*/
private String epc;
/**
* 组织机构ID
*/
private String orgId;
/**
* 物资状态
*/
private String state;
/**
* 业务状态
*/
private String bussiness_state;
/**
* 位置状态
*/
private String locationState;
/**
* 生产日期
*/
private DateTime productionDate;
/**
* 位置类型
*/
private String locationType;
/**
* 位置ID
*/
private String locationId ;
/**
* 是否遗失
*/
private int lostFlag ;
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/InventoryController.java
package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.dto.InventoryDto;
import com.junmp.jyzb.api.bean.dto.ProductBatchDto;
import com.junmp.jyzb.api.bean.req.InventoryReq;
import com.junmp.jyzb.api.bean.req.ProductBatchReq;
import com.junmp.jyzb.entity.Inventory;
import com.junmp.jyzb.service.InventoryService;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
......@@ -42,6 +49,12 @@ public class InventoryController {
return returnMsg;
}
@PostMapping("/GetDetail")
@ApiOperation("查询库存明细信息")
public ApiRes<Inventory> getDetail(@RequestBody InventoryReq req) {
return ApiRes.success(inventoryService.getInventoryDetail(req));
}
@PostMapping("/UpdateInventoryNum")
@ApiOperation("手动重置库存数量信息")
public ResponseResult updateInventoryNum(@RequestBody Map<String,Object> msg){
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PubOrgController.java
......@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@RestController
......@@ -29,6 +30,22 @@ public class PubOrgController {
return returnMsg;
}
@PostMapping("/ChangeOrgState")
@ApiOperation("改变组织机构状态信息")
public ResponseResult changeOrgState(@RequestBody Map<String, Object> msg) {
//传入当前的组织机构id，展示所有本级及下级的
ResponseResult returnMsg = pubOrgService.changeOrgState(msg);
return returnMsg;
}
// @PostMapping("/ShowAllPubOrgList")
// @ApiOperation("查询组织机构列表(含禁用)")
// public ResponseResult showAllPubOrgList(@RequestBody Map<String, Object> orgId) {
// //传入当前的组织机构id，展示所有本级及下级的
// ResponseResult returnMsg = pubOrgService.showAllPubOrgList(orgId);
// return returnMsg;
// }
// @PostMapping("/ShowPubOrgListOld")
// @ApiOperation("查询组织机构列表_完整版")
// public ResponseResult showPubOrgListOld(@RequestBody Map<String, Object> orgId) {
......@@ -48,7 +65,6 @@ public class PubOrgController {
@PostMapping("/SetDName")
@ApiOperation("填充组织机构简称到数据库")
public ResponseResult setShortName(@RequestBody Map<String, Object> orgId) {
//传入当前的组织机构id，展示所有本级及下级的
ResponseResult returnMsg = pubOrgService.setShortName(orgId);
return returnMsg;
}
......@@ -56,8 +72,15 @@ public class PubOrgController {
@PostMapping("/GetOrgDetail")
@ApiOperation("查询组织机构详细信息")
public ResponseResult getOrgDetail(@RequestBody Map<String, Object> msg) {
//传入当前的组织机构id，展示所有本级及下级的
ResponseResult returnMsg = pubOrgService.getOrgDetail(msg);
return returnMsg;
}
@PostMapping("/GetLowerOrg")
@ApiOperation("获取本级及下级的组织机构")
public ResponseResult getLowerOrg(@RequestBody Map<String, Object> msg) {
String orgId = msg.get("orgId").toString();
List<String> returnMsg = pubOrgService.getLowerOrg(orgId);
return new ResponseResult(99200,"操作成功",returnMsg);
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/domain/PoliceFinger.java
......@@ -34,7 +34,7 @@ public class PoliceFinger implements Serializable {
/**
* 指纹名称
*/
@ApiModelProperty(value = "警员id")
@ApiModelProperty(value = "指纹名称")
private String name;
/**
......
jyzb-biz/src/main/java/com/junmp/jyzb/domain/PubOrg.java
......@@ -71,10 +71,10 @@ public class PubOrg implements Serializable {
private Byte sortVal;
/**
* 状态：1-启用，2-禁用
* 状态：1-启用，0-禁用
*/
@ApiModelProperty(value="状态：1-启用，2-禁用")
private Byte statusFlag;
@ApiModelProperty(value="状态：1-启用，0-禁用")
private Integer statusFlag;
/**
* 描述
......@@ -83,9 +83,9 @@ public class PubOrg implements Serializable {
private String remark;
/**
* 删除标记：Y-已删除，N-未删除
* 删除标记：0-已删除，1-未删除
*/
@ApiModelProperty(value="删除标记：Y-已删除，N-未删除")
@ApiModelProperty(value="删除标记：0-已删除，1-未删除")
private Short delFlag;
/**
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/EquipmentType.java 0 → 100644
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
@TableName("base_inventory")
public class EquipmentType implements Serializable {
/**
* 装备类型ID
*/
private String id;
/**
* 类型名称
*/
private String name;
/**
* 单位
*/
private String unit;
/**
* 单位类型
*/
@TableField(value = "unit_type")
private String unitType;
/**
* 装备Code码
*/
private String code;
/**
* 上级id
*/
@TableField(value = "parent_id")
private String parentId;
/**
* 上级ids
*/
@TableField(value = "parent_ids")
@ApiModelProperty(value = "上级id")
private String parentIds;
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
/**
* 更新时间
*/
@TableField(value = "update_time", fill = FieldFill.UPDATE)
private Date updateTime;
/**
* 当前状态:0关闭/1启用
*/
@ApiModelProperty(value = "当前状态:0关闭/1启用")
private Integer state;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String note;
/**
* 类型，0类别，1装备
*/
@ApiModelProperty(value = "类型，0类别，1装备")
private Integer type;
private static final long serialVersionUID = 1L;
}
jyzb-biz/src/main/java/com/junmp/jyzb/entity/Inventory.java 0 → 100644
package com.junmp.jyzb.entity;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Author: Zhaojw
* @Description: 库存
* @DateTime: 2023/7/20 10:55
* @Params:
* @Return
*/
@Data
@TableName("base_inventory")
public class Inventory implements Serializable {
@TableId(value = "id", type = IdType.AUTO)
private String ID;
/**
* 装备包ID
*/
@TableField("package_id")
private String packageId;
/**
* 装备类型ID
*/
@TableField("type_id")
private String typeId;
/**
* 装备类型名称
*/
private String typeName;
/**
* 装备类型ID
*/
@TableField("size_id")
private String sizeId;
/**
* 装备类型名称
*/
private String sizeName;
/**
* 供应商ID
*/
@TableField("supplier_id")
private String supplierId;
/**
* 部门ID
*/
@TableField("department_id")
private long departmentId;
/**
* 货架位置
*/
@TableField("shelf_location")
private String shelfLocation;
/**
* 货架位置
*/
@TableField("shelf_id")
private String shelfId;
/**
* epc
*/
private String epc;
/**
* 组织机构ID
*/
@TableField("org_id_int")
private String orgId;
/**
* 规格尺寸
*/
private String state;
/**
* 业务状态
*/
private String bussiness_state;
/**
* 位置状态
*/
@TableField("location_state")
private String locationState;
/**
* 生产日期
*/
@TableField("production_date")
private Date productionDate;
/**
* 质保期
*/
@TableField("warranty_period")
private int warrantyPeriod;
/**
* 维保期
*/
@TableField("maintenance_period")
private int maintenancePeriod;
/**
* 维修次数
*/
@TableField("fix_count")
private int fixCount;
/**
* 位置类型
*/
@TableField(value = "location_type")
private String locationType;
/**
* 位置ID
*/
@TableField(value = "location_id")
private String locationId ;
/**
* 是否遗失
*/
@TableField(value = "lost_flag")
private int lostFlag ;
/**
* 是否遗失
*/
private String tid ;
/**
* 价格
*/
private BigDecimal price ;
/**
* 备注
*/
private String note ;
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
/**
* 更新时间
*/
@TableField(value = "update_time", fill = FieldFill.UPDATE)
private Date updateTime;
/**
* 创建时间
*/
@TableField(value = "update_user", fill = FieldFill.INSERT)
private String updateUser;
/**
* 更新时间
*/
@TableField(value = "create_user", fill = FieldFill.UPDATE)
private String createUser;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentSizeMapper.java
package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.domain.EquipmentSize;
import com.junmp.jyzb.domain.EquipmentType;
import com.junmp.jyzb.domain.Warehouse;
import org.apache.ibatis.annotations.Mapper;
......@@ -8,7 +10,7 @@ import java.util.List;
import java.util.Map;
@Mapper
public interface EquipmentSizeMapper {
public interface EquipmentSizeMapper extends BaseMapper<EquipmentSize> {
public int addSize(EquipmentSize size);
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentTypeMapper.java
package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.domain.EquipmentType;
import com.junmp.jyzb.domain.Warehouse;
import com.junmp.jyzb.entity.ProductBatch;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -9,7 +11,7 @@ import java.util.List;
import java.util.Map;
@Mapper
public interface EquipmentTypeMapper {
public interface EquipmentTypeMapper extends BaseMapper<EquipmentType> {
void addEquipment(EquipmentType equipmentType);
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventoryMapper.java
package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.domain.Inventory;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -9,7 +7,7 @@ import java.util.List;
import java.util.Map;
@Mapper
public interface InventoryMapper extends BaseMapper<Inventory> {
public interface InventoryMapper {
Map<String, Object> getSum(String queryType, String typeId);
Map<String, Object> getOrgNum(String typeId);
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PubOrgMapper.java
......@@ -22,4 +22,8 @@ public interface PubOrgMapper {
Map<String, Object> getOrgDetail(String orgId);
String getParentOrgName(Long orgParentId);
List<PubOrg> showAllPubOrgList();
void changeOrgState(@Param("statusFlag") Integer statusFlag,List<String> orgIdList);
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/service/InventoryService.java
package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.dto.InventoryDto;
import com.junmp.jyzb.api.bean.req.InventoryReq;
import com.junmp.jyzb.entity.Inventory;
import com.junmp.jyzb.entity.ProductSku;
import com.junmp.jyzb.utils.ResponseResult;
import java.util.Map;
public interface InventoryService{
public interface InventoryService extends IService<Inventory> {
Inventory getInventoryDetail(InventoryReq msg);
ResponseResult getEquipmentInfo(Map<String, Object> msg);
ResponseResult setInventoryMsg();
......@@ -13,6 +21,7 @@ public interface InventoryService{
ResponseResult getInventoryList(Map<String, Object> msg);
ResponseResult getInventoryByOrgId(Map<String, Object> msg);
ResponseResult getInventoryDevelop();
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/PubOrgService.java
......@@ -18,4 +18,6 @@ public interface PubOrgService{
ResponseResult setOrgParentIds();
ResponseResult getOrgDetail(Map<String, Object> orgId);
ResponseResult changeOrgState(Map<String, Object> msg);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/CabinetServiceImpl.java
......@@ -327,7 +327,6 @@ public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> impl
private List<Map<String, Object>> getAllCabinetByOrg(Map<String, Object> msg, List<String> allOrgId) {
List<Map<String, Object>> allCabinet = new ArrayList<>();
System.out.println(allOrgId);
allCabinet = cabinetMapper.getAllCabinetByOrgList(allOrgId);
return allCabinet;
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentSizeServiceImpl.java
package com.junmp.jyzb.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.domain.EquipmentSize;
import com.junmp.jyzb.domain.EquipmentType;
import com.junmp.jyzb.mapper.EquipmentTypeMapper;
......@@ -17,7 +18,7 @@ import java.util.*;
import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
@Service
public class EquipmentSizeServiceImpl implements EquipmentSizeService {
public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, EquipmentSize> implements EquipmentSizeService {
@Resource
private EquipmentSizeMapper equipmentSizeMapper;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java
package com.junmp.jyzb.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.domain.EquipmentType;
import com.junmp.jyzb.domain.PubOrg;
import com.junmp.jyzb.entity.ProductBatch;
import com.junmp.jyzb.mapper.ProductBatchMapper;
import com.junmp.jyzb.mapper.SupplierMapper;
import com.junmp.jyzb.service.EquipmentTypeService;
import com.junmp.jyzb.utils.*;
......@@ -14,7 +17,7 @@ import java.util.*;
import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
@Service
public class EquipmentTypeServiceImpl implements EquipmentTypeService {
public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, EquipmentType> implements EquipmentTypeService {
@Resource
private RedisUtils redisUtils;
......@@ -50,9 +53,17 @@ public class EquipmentTypeServiceImpl implements EquipmentTypeService {
map.put("updateTime", menu.getUpdateTime());
map.put("type",menu.getType());
//如果是id和parentId都为 00000 的超级根，就将它放在映射为-1的数据中
if (menu.getId().equals("00000000-0000-0000-0000-000000000000") && menu.getParentId().equals("00000000-0000-0000-0000-000000000000")){
childrenMap.put("-1", new ArrayList<>());
childrenMap.get("-1").add(map);
continue;
}
if (!childrenMap.containsKey(menu.getParentId())) {
childrenMap.put(menu.getParentId(), new ArrayList<>());
}
childrenMap.get(menu.getParentId()).add(map);
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java
package com.junmp.jyzb.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.junmp.jyzb.domain.Inventory;
import com.junmp.jyzb.domain.PubOrg;
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 java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
......@@ -45,7 +45,7 @@ public class InventoryServiceImpl implements InventoryService {
String queryType = inMsg.get("queryType").toString();
String idMsg = inMsg.get("typeId").toString();
//根据传入的queryType来辨别要查询什么信息
//根据传入的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);
......@@ -72,7 +72,7 @@ public class InventoryServiceImpl implements InventoryService {
//检查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");
......@@ -80,9 +80,9 @@ public class InventoryServiceImpl implements InventoryService {
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的信息
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); //计算装备数量
......@@ -149,11 +149,11 @@ public class InventoryServiceImpl implements InventoryService {
public ResponseResult setInventoryMsg(){
inventoryMapper.deleteAllMsg(); //清空数据库中已存在的信息
inventoryMapper.setOrgInventory(); //放入组织机构信息汇总
inventoryMapper.setOrgInventory(); //放入组织机构信息汇
inventoryMapper.setCabinetInventory(); //放入组织机构信息汇总
inventoryMapper.setCabinetInventory(); //放入组织机构信息汇
inventoryMapper.setWarehouseInventory(); //放入组织机构信息汇总
inventoryMapper.setWarehouseInventory(); //放入组织机构信息汇
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
}
......@@ -167,7 +167,7 @@ public class InventoryServiceImpl implements InventoryService {
}
String locationType = msg.get("locationType").toString();
if (!locationType.equals("warehouse") && !locationType.equals("cabinet")){
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,"输入的locationType值有误");
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,"输入的locationType值有);
}else if(locationType.equals("warehouse")){
warehouseService.setWarehouseInventory(msg);
}else if(locationType.equals("cabinet")){
......@@ -194,9 +194,9 @@ public class InventoryServiceImpl implements InventoryService {
String typeId = msg.get("typeId").toString();
String sizeId = msg.get("sizeId").toString();
//根据传入的queryType来辨别要查询什么信息
//根据传入的queryType来辨别要查询什么信
if (queryType.equals("org") || queryType.equals("warehouse") || queryType.equals("cabinet")){
List<Map<String, Object>> returnMsg = inventoryMapper.getInventoryList(queryType,typeCode,typeId,sizeId);
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信息有误");
......@@ -220,6 +220,7 @@ public class InventoryServiceImpl implements InventoryService {
public ResponseResult getInventoryDevelop() {
return null;
}
}
@Override
public ResponseResult InvertoryBindBox(Map<String, Object> msg) {
......@@ -230,7 +231,7 @@ public class InventoryServiceImpl implements InventoryService {
} 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")));
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ProductServiceImpl.java
......@@ -81,6 +81,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
@Override
public PageResult<Product> findPage(ProductReq req) {
LambdaQueryWrapper<Product> wrapper = createWrapper(req);
Page<Product> page = this.page(PageFactory.getDefaultPage(), wrapper);
return PageResultFactory.createPageResult(page);
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/task/ClearLogAction.java
......@@ -30,9 +30,24 @@ import java.util.Date;
public class ClearLogAction implements JobAction {
@Resource
private LogManagerApi logManagerApi;
@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)));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/task/UpdateSummaryAction.java 0 → 100644
package com.junmp.jyzb.task;
public class UpdateSummaryAction {
}
jyzb-biz/src/main/resources/mapper/CabinetMapper.xml
......@@ -108,13 +108,10 @@
c.out_sum as outSum
from base_cabinet c
left join pub_org o on c.org_id_int =o.org_id
where c.org_id_int in
where c.org_id_int in
<foreach item="item" collection="list" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<update id="setCabinetSumInventory">
......
jyzb-biz/src/main/resources/mapper/InventoryMapper.xml
......@@ -115,73 +115,78 @@ GROUP BY bi.org_id_int, bi.type_id, bi.size_id;
</insert>
<insert id="setCabinetInventory">
INSERT INTO base_inventory_summary (id,location_id,location_name,type_id,type_name,size_id,size_name,number, price, stock_number, outbound_number,location_type)
INSERT INTO base_inventory_summary (id,org_id_int,org_name,location_id,location_name,type_id,type_name,size_id,size_name,number, price, stock_number, outbound_number,location_type)
SELECT
UUID() as id,
bi.location_id,
bc.name as '单警柜名称',
bi.org_id_int as orgIdInt,
po.org_name as orgName,
bi.location_id as locationId,
bc.name as locationName,
bi.type_id,
t.name as '装备名称',
t.name as typeName,
bi.size_id,
s.name as '号型名称',
s.name as sizeName,
count(*) as 'number',
sum(bi.price) as 'price',
SUM(CASE WHEN location_state = 'in' THEN 1 ELSE 0 END) AS 'stock_number',
count(*) - SUM(CASE WHEN location_state = 'in' THEN 1 ELSE 0 END) AS 'outbound_number',
SUM(CASE WHEN location_state = 'in' THEN 1 ELSE 0 END) AS 'stockNumber',
count(*) - SUM(CASE WHEN location_state = 'in' THEN 1 ELSE 0 END) AS 'outboundNumber',
bi.location_type
FROM base_inventory bi
join base_cabinet_box bcb on bi.location_id = bcb.id
join base_cabinet bc on bcb.cabinet_id = bc.id
join base_equipment_type t on t.id = bi.type_id
join base_equipment_size s on s.id = bi.size_id
join pub_org po on bi.org_id_int = po.org_id
WHERE location_id IN (
SELECT location_id
FROM base_inventory
GROUP BY location_id,type_id
having type_id in(
SELECT
type_id as '装备类型id'
type_id as 'typeId'
FROM base_inventory b
GROUP BY type_id
)
)
and location_type = 1
GROUP BY location_id, type_id,size_id;
GROUP BY location_id, type_id,size_id,bi.org_id_int;
</insert>
<insert id="setWarehouseInventory">
INSERT INTO base_inventory_summary (id,location_id, location_name,type_id, type_name,size_id,size_name, number, price, stock_number, outbound_number,location_type)
INSERT INTO base_inventory_summary (id,org_id_int,org_name,location_id, location_name,type_id, type_name,size_id,size_name, number, price, stock_number, outbound_number,location_type)
SELECT
UUID() as id,
bi.location_id,
bw.name,
bi.org_id_int as orgIdInt,
po.org_name as orgName,
bi.location_id as locationId,
bw.name as locationName,
bi.type_id,
t.name,
t.name as typeName,
bi.size_id,
s.name,
s.name as sizeName,
count(*) as 'number',
sum(bi.price) as 'price',
SUM(CASE WHEN location_state = 'in' THEN 1 ELSE 0 END) AS 'stock_number',
count(*) - SUM(CASE WHEN location_state = 'in' THEN 1 ELSE 0 END) AS 'outbound_number',
SUM(CASE WHEN location_state = 'in' THEN 1 ELSE 0 END) AS 'stockNumber',
count(*) - SUM(CASE WHEN location_state = 'in' THEN 1 ELSE 0 END) AS 'outboundNumber',
bi.location_type
FROM base_inventory bi
join base_warehouse bw on bi.location_id = bw.id
join base_equipment_type t on t.id = bi.type_id
join base_equipment_size s on s.id = bi.size_id
join pub_org po on bi.org_id_int = po.org_id
WHERE location_id IN (
SELECT location_id
FROM base_inventory
GROUP BY location_id,type_id
having type_id in(
SELECT
type_id as '装备类型id'
type_id as 'typeId'
FROM base_inventory b
GROUP BY type_id
)
)
and location_type = 0
GROUP BY location_id, type_id,size_id;
GROUP BY location_id, type_id,size_id,bi.org_id_int;
</insert>
<select id="getInventoryList" resultType="Map">
......@@ -225,4 +230,11 @@ and size_id = #{sizeId}
select * from base_inventory where org_id_int = #{orgId}
</select>
<select id="getInventoryByOrgId" resultType="Map">
select
*
from base_inventory i
where org_id_int =#{orgId}
</select>
</mapper>
\ No newline at end of file
jyzb-biz/src/main/resources/mapper/PubOrgMapper.xml
......@@ -32,9 +32,28 @@
</sql>
<select id="selectAllOrg" resultType="com.junmp.jyzb.domain.PubOrg">
SELECT org_id,org_parent_id,org_name,d_name,find_code as findCode
SELECT
IFNULL(org_id, 'null') as orgId,
IFNULL(org_parent_id, 'null') as orgParentId,
IFNULL(org_name, 'null') as orgName,
IFNULL(d_name, 'null') as dName,
IFNULL(find_code, 'null') as findCode,
IFNULL(status_flag, 'null') as statusFlag
FROM
pub_org
WHERE
del_flag = 1;
</select>
<select id="showAllPubOrgList" resultType="com.junmp.jyzb.domain.PubOrg">
SELECT org_id,
IFNULL(org_id, 'null') as orgId,
IFNULL(org_parent_id, 'null') as orgParentId,
IFNULL(org_name, 'null') as orgName,
IFNULL(d_name, 'null') as dName,
IFNULL(find_code, 'null') as findCode,
IFNULL(del_flag, 'null') as delFlag
FROM pub_org
where del_flag = 1
</select>
<select id="getOnePubOrg" resultType="Long">
......@@ -99,4 +118,13 @@ SET p.org_parent_ids = cte.org_parent_ids;
<select id="getParentOrgName" resultType="String">
select d_name from pub_org o where org_id =#{orgParentId}
</select>
<update id="changeOrgState">
UPDATE pub_org
SET status_flag = #{statusFlag}
WHERE org_id IN
<foreach item="item" collection="orgIdList" open="(" separator="," close=")">
#{item}
</foreach>
</update>
</mapper>
\ No newline at end of file
jyzb-biz/src/main/resources/mapper/WarehouseMapper.xml
......@@ -109,7 +109,7 @@
where w.org_id_int in
<foreach item="item" collection="list" open="(" separator="," close=")">
#{item}
</foreach>
</foreach>
</select>
<update id="setWarehouseSumInventory">
......
jyzb-boot/pom.xml
......@@ -89,7 +89,6 @@
<artifactId>jyzb-biz</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.jyzb</groupId>
<artifactId>jyzb-process</artifactId>
......@@ -132,3 +131,4 @@
</plugins>
</build>
</project>
</project>
jyzb-boot/src/main/resources/application.yml
#server:
# port: 10030
# 应用服务器
server:
port: 10030
tomcat:
uri-encoding: UTF-8 #tomcat编码
port: 10051 #tomcat端口
spring:
main:
#bea同名类进行注册时，准许覆盖注册
......
jyzb-common/jyzb-common.iml deleted 100644 → 0
<?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 org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<module version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
<root url="file://$MODULE_DIR$/src/main/resources" />
</sourceRoots>
</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" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<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
......@@ -7,14 +7,14 @@ import org.springframework.stereotype.Component;
import java.util.Map;
/**
* 创建消息接收监听类
* 创建消息接收监听
* */
@Component
@RabbitListener(queues = "TestDirectQueue") //监听的队列名称 TestDirectQueue
@RabbitListener(queues = "TestDirectQueue") //监听的队列名TestDirectQueue
public class DirectReceiver {
@RabbitHandler
public void process(Object testMessage) {
System.out.println("DirectReceiver消费者收到消息 : " + testMessage);
public void process(Map testMessage) {
System.out.println("DirectReceiver消费者收到消 : " + testMessage.toString());
}
}
}
\ No newline at end of file
jyzb-mq/jyzb-mq-producer/jyzb-mq-producer.iml
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<module version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
<root url="file://$MODULE_DIR$/src/main/resources" />
</sourceRoots>
</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" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<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/src/main/java/com/junmp/jyzb/controller/SendMsgController.java
......@@ -32,8 +32,10 @@ public class SendMsgController {
@PostMapping("/send")
public String sendMessage() {
//生成当前时间
String createTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
try {
//将记录当前时间的信息发送到消息队列
rabbitTemplate.convertAndSend("TestDirectExchange", "TestDirectRouting", "消息发送的时间为:" + createTime);
return "消息发送成功";
} catch (Exception e) {
......
jyzb-process/pom.xml
......@@ -6,10 +6,13 @@
<groupId>com.junmp.jyzb</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.junmp.jyzb</groupId>
<artifactId>jyzb-process</artifactId>
<version>1.0.0</version>
<name>jyzb-process</name>
<properties>
<mysql.version>8.0.21</mysql.version>
......@@ -225,11 +228,11 @@
<version>3.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>5.3.19</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework</groupId>-->
<!-- <artifactId>spring-webmvc</artifactId>-->
<!-- <version>5.3.19</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>junmp-v2-common</artifactId>
......@@ -281,35 +284,10 @@
<groupId>com.junmp.jyzb</groupId>
<artifactId>jyzb-biz</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>io.springfox</groupId>-->
<!-- <artifactId>springfox-swagger-ui</artifactId>-->
<!-- <version>2.9.2</version>-->
<!-- </dependency>-->
</dependencies>
<!-- <name>jyzb-process</name>-->
</dependencies>
<!-- <build>-->
<!-- <finalName>jyzb-process</finalName>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <goals>-->
<!-- <goal>repackage</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- <configuration>-->
<!-- &lt;!&ndash; 如果没有该项配置，则devtools不会起作用，即应用不会restart &ndash;&gt;-->
<!-- <mainClass>com.junmp.jyzb.boot.JyzbBootApplication</mainClass>-->
<!-- <fork>true</fork>-->
<!-- </configuration>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </build>-->
<build>
<finalName>${project.artifactId}</finalName>
</build>
</project>
jyzb-process/src/main/java/com/junmp/junmpProcess/common/CommonConstants.java
......@@ -12,9 +12,8 @@ public interface CommonConstants {
String FORM_VAR="formData";
String PROCESS_STATUS="processStatus";
String START_USER_INFO="startUser";
String BUSINESS_STATUS_1="1"; //正在处理
String BUSINESS_STATUS_2="2";//撤销
String BUSINESS_STATUS_3="3";//驳回
String BUSINESS_STATUS_4="4";//已结束
String BUSINESS_STATUS_1="正在处理"; //正在处理
String BUSINESS_STATUS_2="撤销";//撤销
String BUSINESS_STATUS_3="驳回";//驳回
String BUSINESS_STATUS_4="已结束";//已结束
}
jyzb-process/src/main/java/com/junmp/junmpProcess/controller/BpmnController.java
......@@ -20,10 +20,17 @@ import com.junmp.junmpProcess.entity.ProcessTemplates;
import com.junmp.junmpProcess.exception.WorkFlowException;
import com.junmp.junmpProcess.service.Repository.ProcessTemplateService;
import com.junmp.junmpProcess.utils.BpmnConvert;
import com.junmp.junmpProcess.utils.FormAndOrder;
import com.junmp.junmpProcess.vo.*;
import com.junmp.jyzb.api.bean.req.ProductSkuReq;
import com.junmp.jyzb.api.bean.vo.TagInfoVo;
import com.junmp.jyzb.entity.ProductSku;
import com.junmp.jyzb.utils.HttpStatus;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.jyzb.utils.ReturnMsg;
import com.junmp.v2.common.bean.request.BaseRequest;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows;
......@@ -93,13 +100,13 @@ public class BpmnController {
}
@ApiOperation("查看我发起的流程")
@PostMapping("applyList")
public ResponseResult applyList(@RequestBody ApplyDTO ApplyDTO) {
public PageResult<HistoryProcessInstanceVO> applyList(@RequestBody ApplyDTO ApplyDTO) {
return WorkProcessService.applyList(ApplyDTO);
}
@ApiOperation("查看我的待办")
@PostMapping("toDoList")
public ResponseResult toDoList(@RequestBody TaskDTO taskDTO){
public PageResult<TaskVO> toDoList(@RequestBody TaskDTO taskDTO){
return WorkProcessService.toDoList(taskDTO);
}
@ApiOperation("同意按钮")
......@@ -107,11 +114,16 @@ public class BpmnController {
public ResponseResult agree(@RequestBody HandleDataDTO handleDataDTO){
return WorkProcessService.agree(handleDataDTO);
}
@ApiOperation("撤销按钮")
@PostMapping("revoke")
public ResponseResult revoke(@RequestBody HandleDataDTO handleDataDTO){
return WorkProcessService.revoke(handleDataDTO);
}
@ApiOperation("拒绝按钮")
@PostMapping("refuse")
public ResponseResult refuse(@RequestBody HandleDataDTO handleDataDTO){
return WorkProcessService.refuse(handleDataDTO);
}
/**
* 查询表单模板数据
......@@ -121,32 +133,19 @@ public class BpmnController {
*/
@ApiOperation("根据ID获取表单信息")
@PostMapping(value = "getFormTemplateById")
public ResponseResult getFormTemplateById(String templateId) {
ProcessTemplates processTemplates = processTemplateService.getById(templateId);
public ResponseResult getFormTemplateById(@RequestBody Map<String,Object> templateId) {
String temp= templateId.get("templateId").toString();
ProcessTemplates processTemplates = processTemplateService.getById(temp);
processTemplates.setFormId(processTemplates.getTemplateId());
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,processTemplates);
}
/**
* 查询表单模板数据
*
* @return 模板详情数据
*/
@ApiOperation("获取全部可用的表单和审核流")
@GetMapping(value = "getFormList")
public ResponseResult getFormList( ) {
return WorkProcessService.getFormList();
public ApiRes<PageResult<TemplateGroupVo>> getFormList(BaseRequest br) {
return ApiRes.success(WorkProcessService.getFormList(br));
}
/**
* 查询表单模板数据
*
* @param templateId 模板id
* @return 模板详情数据
*/
@ApiOperation("通过模板id查看流程信息")
@GetMapping("getFormDetail")
public ResponseResult getFormDetail(@RequestParam("templateId") String templateId){
return WorkProcessService.getFormDetail(templateId);
}
}
jyzb-process/src/main/java/com/junmp/junmpProcess/dto/json/UserInfo.java
......@@ -10,6 +10,7 @@ import lombok.Data;
@Data
public class UserInfo {
private String id;
private String userId;
private String name;
private String type;
private String sex;
......
jyzb-process/src/main/java/com/junmp/junmpProcess/entity/ProcessTemplates.java
......@@ -2,28 +2,23 @@ package com.junmp.junmpProcess.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
* (ProcessTemplates)实体类
*
* @author makejava
* @since 2020-09-21 22:50:29
* @author : willian fu
* @date : 2020/9/21
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "process_templates")
@Builder
public class ProcessTemplates implements Serializable {
@NoArgsConstructor
@AllArgsConstructor
public class ProcessTemplates {
private static final long serialVersionUID = -95829441258242072L;
@TableId
......@@ -33,9 +28,9 @@ public class ProcessTemplates implements Serializable {
private String templateId;
@TableField(exist = false)
private String formId;
private String formName;
private String orgId;
@TableField(exist = false)
private Integer groupId;
/**
* 摸板表单
......@@ -53,22 +48,13 @@ public class ProcessTemplates implements Serializable {
* 图标背景色
*/
private String background;
private String notify;
/**
* 谁能提交
*/
private String whoCommit;
/**
* 谁能编辑
*/
private String whoEdit;
/**
* 谁能导出数据
* 图标背景色
*/
private String whoExport;
private String remark;
private String notify;
/**
* 是否已停用
*/
......
jyzb-process/src/main/java/com/junmp/junmpProcess/entity/TemplateGroupBo.java deleted 100644 → 0
package com.junmp.junmpProcess.entity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @author : willian fu
* @date : 2020/9/21
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class TemplateGroupBo {
private Integer id;
private Integer groupId;
private String groupName;
private String templateId;
private String formName;
private String icon;
private Boolean isStop;
private String remark;
private Date updated;
private String background;
}
jyzb-process/src/main/java/com/junmp/junmpProcess/mapper/OrgUserMapper.java
package com.junmp.junmpProcess.mapper;
import com.junmp.junmpProcess.dto.UserListDTO;
import com.junmp.junmpProcess.entity.TemplateGroupBo;
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;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import java.util.List;
......
jyzb-process/src/main/java/com/junmp/junmpProcess/mapper/TemplateGroupMapper.java
......@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import com.junmp.junmpProcess.entity.TemplateGroup;
import com.junmp.junmpProcess.entity.TemplateGroupBo;
import com.junmp.junmpProcess.entity.ProcessTemplates;
import java.util.List;
......@@ -23,5 +23,5 @@ public interface TemplateGroupMapper extends BaseMapper<TemplateGroup> {
*/
@Select("SELECT pt.template_id, pt.remark, pt.is_stop, pt.updated, pt.form_name, \n" +
" pt.icon, pt.background FROM process_templates pt ORDER BY updated desc")
List<TemplateGroupBo> getAllFormAndGroups();
List<ProcessTemplates> getAllFormAndGroups();
}
jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/WorkProcessService.java
......@@ -10,7 +10,10 @@ import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
import com.junmp.junmpProcess.dto.TaskDTO;
import com.junmp.junmpProcess.entity.ProcessTemplates;
import com.junmp.junmpProcess.vo.*;
import com.junmp.jyzb.entity.ProductSku;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.v2.common.bean.request.BaseRequest;
import com.junmp.v2.db.api.page.PageResult;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
......@@ -46,7 +49,7 @@ public interface WorkProcessService {
*
* @return
*/
ResponseResult getFormList();
PageResult<TemplateGroupVo> getFormList(BaseRequest br);
/**
......@@ -68,14 +71,14 @@ public interface WorkProcessService {
*
* @return
*/
ResponseResult applyList(ApplyDTO applyDTO);
PageResult<HistoryProcessInstanceVO> applyList(ApplyDTO applyDTO);
/**
* 查看我的待办
*
* @return
*/
ResponseResult toDoList(TaskDTO taskDTO);
PageResult<TaskVO> toDoList(TaskDTO taskDTO);
/**
* 查看我的已办
......@@ -92,6 +95,12 @@ public interface WorkProcessService {
ResponseResult agree(HandleDataDTO handleDataDTO);
/**
* 同意
*
* @return
*/
ResponseResult revoke(HandleDataDTO handleDataDTO);
/**
* 委派
*
* @return
......@@ -112,12 +121,7 @@ public interface WorkProcessService {
*/
ResponseResult refuse(HandleDataDTO handleDataDTO);
/**
* 撤销按钮
*
* @return
*/
Result revoke(HandleDataDTO handleDataDTO);
/**
* 转办按钮
......
jyzb-process/src/main/java/com/junmp/junmpProcess/utils/FormAndOrder.java 0 → 100644
package com.junmp.junmpProcess.utils;
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 lombok.Data;
import java.io.Serializable;
import java.sql.Time;
/**
* <pre>
*
* 描述：
* 版本：1.0.0
* 日期：2022/7/29 16:19
* 作者：ningzp@junmp.com.cn
* <br>修改记录
* <br>修改日期 修改人 修改内容
*
* </pre>
*/
@Data
public class FormAndOrder {
private Long formId;
/**
* 号型代码
*/
private String processDefinitionId;
/**
*
*/
@TableField(value = "sku_code")
private String formName;
/**
*
*/
private String isStop;
/**
*
*/
private String remark;
/**
*
*/
private Time updated;
/**
*
*/
private String templateId;
}
jyzb-process/src/main/java/com/junmp/junmpProcess/vo/TemplateGroupVo.java
......@@ -17,23 +17,13 @@ import java.util.List;
@NoArgsConstructor
@AllArgsConstructor
public class TemplateGroupVo {
private List<Template> items;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public static class Template {
private String formId;
private String processDefinitionId;
private String formName;
private Boolean isStop;
private String remark;
private String updated;
private String templateId;
}
private String formId;
private String processDefinitionId;
private String formName;
private Boolean isStop;
private String remark;
private String updated;
private String templateId;
}
pom.xml
......@@ -36,17 +36,6 @@
<name>aliyun</name>
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
</repository>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/libs-milestone</url>
</repository>
<repository>
<id>oss</id>
<name>oss</name>
<url>https://oss.sonatype.org/content/groups/public</url>
</repository>
</repositories>
<distributionManagement>
......@@ -81,6 +70,7 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
......@@ -132,6 +122,11 @@
<artifactId>v2-log-boot-starter</artifactId>
<version>${junmp.v2.version}</version>
</dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>log-biz-manage</artifactId>
<version>${junmp.v2.version}</version>
</dependency>
<!-- &lt;!&ndash;引入rabbitmq的相关依赖&ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>com.rabbitmq</groupId>-->
......@@ -260,28 +255,6 @@
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<!--swagger-->
<!-- <dependency>-->
<!-- <groupId>io.springfox</groupId>-->
<!-- <artifactId>springfox-swagger-ui</artifactId>-->
<!-- <version>2.9.2</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.springfox</groupId>-->
<!-- <artifactId>springfox-swagger2</artifactId>-->
<!-- <version>2.9.2</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.swagger</groupId>-->
<!-- <artifactId>swagger-annotations</artifactId>-->
<!-- <version>${swagger2.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.swagger</groupId>-->
<!-- <artifactId>swagger-models</artifactId>-->
<!-- <version>1.5.22</version>-->
<!-- </dependency>-->
<!--swagger新ui界面-->
<dependency>
<groupId>com.github.xiaoymin</groupId>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论