Skip to content

J
jyzb_platformV2
Commit 6f6d6142 by 赵剑炜
Options

Merge branch 'develop' into develop-zhaojw 

# Conflicts:
#	.gitignore
#	jyzb-biz/src/main/java/com/junmp/jyzb/entity/Inventory.java
#	jyzb-boot/pom.xml
#	jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
parents f6cd67fe 14cd869f
正在显示 包含 1857 行增加 和 1254 行删除
.idea/encodings.xml
<?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" />
......
.idea/jarRepositories.xml
......@@ -9,9 +9,19 @@
<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/" />
</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" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="http://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="junmp-public" />
<option name="name" value="junmp-public" />
<option name="url" value="http://maven.sothing.top/repository/junmp-public/" />
......
jyzb-biz/pom.xml
......@@ -60,5 +60,11 @@
<groupId>com.junmp.v2</groupId>
<artifactId>v2-job-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
jyzb-biz/src/main/java/com/junmp/jyzb/domain/Cabinet.java → jyzb-biz/src/main/java/com/junmp/jyzb/beanReq/CabinetReq.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.beanReq;
import io.swagger.annotations.ApiModel;
import com.junmp.jyzb.entity.CabinetBox;
import com.junmp.v2.common.bean.request.BaseRequest;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
@ApiModel(value = "com-junmp-jyzb-domain-Cabinet")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class Cabinet implements Serializable {
@EqualsAndHashCode(callSuper = true)
public class CabinetReq extends BaseRequest {
/**
* 单警柜ID
*/
@NotNull(message = "单警柜ID主键不能为空", groups = {edit.class, delete.class, detail.class})
@ApiModelProperty(value = "单警柜ID")
private String id;
/**
* 单警柜编号
*/
@NotNull(message = "单警柜编号不能为空", groups = {edit.class, delete.class, detail.class})
@ApiModelProperty(value = "单警柜编号")
private String cabinetNum;
......@@ -34,12 +36,14 @@ public class Cabinet implements Serializable {
/**
* 单警柜名称
*/
@NotNull(message = "单警柜名称不能为空", groups = {edit.class, delete.class, detail.class})
@ApiModelProperty(value = "单警柜名称")
private String name;
/**
* 组织机构号
*/
@NotNull(message = "组织机构号不能为空", groups = {edit.class, delete.class, detail.class})
@ApiModelProperty(value = "组织机构号")
private String orgId;
......@@ -74,10 +78,9 @@ public class Cabinet implements Serializable {
private String updateUser;
/**
* 箱数
* 单警柜与箱门一对多关系
*/
// @ApiModelProperty(value = "箱数")
// private Integer num;
private List<CabinetBox> list;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
}
jyzb-biz/src/main/java/com/junmp/jyzb/domain/PoliceFinger.java → jyzb-biz/src/main/java/com/junmp/jyzb/beanReq/PolicemanFingerReq.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.beanReq;
import io.swagger.annotations.ApiModel;
import com.junmp.v2.common.bean.request.BaseRequest;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
import java.util.Date;
@ApiModel(value = "com-junmp-jyzb-domain-PoliceFinger")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class PoliceFinger implements Serializable {
@EqualsAndHashCode(callSuper = true)
public class PolicemanFingerReq extends BaseRequest {
/**
* 指纹id
*/
@NotNull(message = "指纹主键不能为空", groups = {edit.class, delete.class, detail.class})
@ApiModelProperty(value = "指纹id")
private Integer id;
/**
* 警员id
*/
@NotNull(message = "警员id不能为空", groups = {edit.class, delete.class, detail.class})
@ApiModelProperty(value = "警员id")
private String policeId;
/**
* 指纹名称
*/
@ApiModelProperty(value = "指纹名称")
@ApiModelProperty(value = "警员id")
private String name;
/**
* 指纹信息
*/
@NotNull(message = "指纹信息不能为空", groups = {edit.class, delete.class, detail.class})
@ApiModelProperty(value = "指纹信息")
private String fingerInfo;
......@@ -50,4 +51,4 @@ public class PoliceFinger implements Serializable {
private Date updateTime;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
}
jyzb-biz/src/main/java/com/junmp/jyzb/config/MybatisPlusConfig.java
......@@ -3,12 +3,16 @@ package com.junmp.jyzb.config;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
@MapperScan("com.junmp.jyzb.mapper*")
public class MybatisPlusConfig {
@Bean
public MybatisPlusInterceptor mybatisPlusInterceptor() {
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
......@@ -16,4 +20,5 @@ public class MybatisPlusConfig {
interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
return interceptor;
}
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController.java
......@@ -72,4 +72,13 @@ public class CabinetController {
ResponseResult returnMsg = cabinetService.getCabinetDetail(msg);
return returnMsg;
}
@PostMapping("/getCabinetBoxInfo")
@ApiOperation("获取箱门列表")
public ResponseResult getCabinetBoxInfo(@RequestBody Map<String, Object> msg){
ResponseResult returnMsg = cabinetBoxService.getCabinetBoxInfo(msg);
return returnMsg;
}
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/controller/CabinetController111.java 0 → 100644
//package com.junmp.jyzb.controller;
//
//import com.junmp.jyzb.beanReq.CabinetReq;
//import com.junmp.jyzb.doc.CabinetDoc;
//import com.junmp.jyzb.entity.Cabinet;
//import com.junmp.jyzb.service.CabinetService;
//import com.junmp.v2.common.bean.request.ValidationApi;
//import com.junmp.v2.common.bean.response.ApiRes;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.validation.annotation.Validated;
//import org.springframework.web.bind.annotation.PostMapping;
//import org.springframework.web.bind.annotation.RequestBody;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RestController;
//
//import javax.annotation.Resource;
//import java.util.List;
//
//@RestController
//@Slf4j
//@RequestMapping("/Cabinet")
//@Api(tags = "单警柜基础信息模块")
//public class CabinetController111 implements CabinetDoc {
// @Resource
// public CabinetService cabinetService;
//
// @PostMapping("/AddCabinet")
// @ApiOperation("添加单警柜")
// public ApiRes<Boolean> addCabinet(@RequestBody @Validated(CabinetReq.add.class) CabinetReq req) throws Exception {
// return ApiRes.success(cabinetService.addCabinet(req));
// }
//
//
// @PostMapping("/DeleteCabinet")
// @ApiOperation("删除单警柜信息")
// public ApiRes<Boolean> deleteCabinet(@RequestBody @Validated(ValidationApi.edit.class) CabinetReq req) throws Exception {
// return ApiRes.success(cabinetService.deleteCabinet(req));
// }
//
// @PostMapping("/ShowCabinet")
// @ApiOperation("查询单警柜列表")
// public ApiRes<List<Cabinet>> showCabinet(@RequestBody @Validated(ValidationApi.edit.class) CabinetReq req,String includeLowerLevel){
// return ApiRes.success(cabinetService.getAllCabinet(req,includeLowerLevel));
// }
//
//
// @PostMapping("/UpdateCabinet")
// @ApiOperation("修改单警柜信息")
// public ApiRes<Boolean> updateCabinet(@RequestBody @Validated(ValidationApi.edit.class) CabinetReq req) throws Exception {
// return ApiRes.success(cabinetService.updateCabinet(req));
// }
//
//
//// @PostMapping("/ErrorState")
//// @ApiOperation("单警柜状态变更")
//
//
//// @PostMapping("/GetCabinetDetail")
//// @ApiOperation("查询单警柜及其箱号信息")
//
//// @PostMapping("/getCabinetBoxInfo")
//// @ApiOperation("获取箱门列表")
//}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/InventoryController.java
......@@ -75,4 +75,11 @@ public class InventoryController {
ResponseResult returnMsg = inventoryService.getInventoryDevelop();
return returnMsg;
}
@PostMapping("/InvertoryBindBox")
@ApiOperation("装备绑定箱门")
public ResponseResult InvertoryBindBox(@RequestBody Map<String,Object> msg){
ResponseResult returnMsg = inventoryService.InvertoryBindBox(msg);
return returnMsg;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java
package com.junmp.jyzb.controller;
import com.junmp.jyzb.domain.Policeman;
import com.junmp.jyzb.service.PoliceFingerService;
import com.junmp.jyzb.service.PolicemanService;
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@RestController
......@@ -33,12 +26,6 @@ public class PoliceController {
return returnMsg;
}
@PostMapping("/AddFingerInfo")
@ApiOperation("添加指纹信息")
public ResponseResult addFingerInfo(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = policemanService.addFingerInfo(msg);
return returnMsg;
}
@PostMapping("/AddFaceInfo")
@ApiOperation("添加警员面部信息")
......@@ -47,6 +34,21 @@ public class PoliceController {
return returnMsg;
}
@PostMapping("/updatefaceInfo")
@ApiOperation("修改、删除人脸信息")
public ResponseResult updateFaceInfo(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = policemanService.updateFaceInfo(msg);
return returnMsg;
}
@PostMapping("/searchFaceInfo")
@ApiOperation("查找人脸信息")
public ResponseResult searchFaceInfo(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg = policemanService.searchFaceInfo(msg);
return returnMsg;
}
@PostMapping("/DeletePolice")
@ApiOperation("删除警员信息")
public ResponseResult deletePolice(@RequestBody Map<String,Object> msg) {
......@@ -82,13 +84,6 @@ public class PoliceController {
return returnMsg;
}
@PostMapping("/DeleteFingerInfo")
@ApiOperation("删除警员指纹信息")
public ResponseResult deletePoliceFinger(@RequestBody Map<String,Object> msg) {
ResponseResult returnMsg= policemanService.deleteFinger(msg);
return returnMsg;
}
//todo 更新查询所有
@PostMapping("/GetPoliceData")
@ApiOperation("查询与单警柜绑定的警员信息") //根据单警柜id查询
......@@ -104,4 +99,17 @@ public class PoliceController {
return null;
}
/**
* @author lxh
* @description 单警柜所在的单位下面所有的人员
* @since 2023/7/19 10:10
* @param
* @return
**/
@PostMapping("/policeList")
@ApiOperation("人员列表")
public ResponseResult policeList(@RequestBody Map<String, Object> msg){
ResponseResult returnMsg =policemanService.getOrgPoliceman(msg);
return returnMsg;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PolicemanFingerController.java 0 → 100644
package com.junmp.jyzb.controller;
import com.junmp.jyzb.beanReq.PolicemanFingerReq;
import com.junmp.jyzb.doc.PolicemanFingerDoc;
import com.junmp.jyzb.entity.PoliceFinger;
import com.junmp.jyzb.service.PoliceFingerService;
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;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@RestController
@Slf4j
@RequestMapping("/PolicemanFinger")
@Api(tags = "警员指纹信息模块")
public class PolicemanFingerController implements PolicemanFingerDoc {
@Resource
PoliceFingerService policeFingerService;
@PostMapping("/AddFingerInfo")
@ApiOperation("添加指纹信息")
public ApiRes<Boolean> addFingerInfo(@RequestBody @Validated(PolicemanFingerReq.edit.class) PolicemanFingerReq req) {
return ApiRes.success(policeFingerService.addFingerInfo(req)) ;
}
@PostMapping("/updateFingerInfo")
@ApiOperation("修改指纹信息")
public ApiRes<Boolean> updateFingerInfo(@RequestBody @Validated(PolicemanFingerReq.edit.class) PolicemanFingerReq req) {
return ApiRes.success(policeFingerService.updateFingerInfo(req)) ;
}
@PostMapping("/searchFingerInfo")
@ApiOperation("查找指纹信息")
public ApiRes<List<PoliceFinger>> searchFingerInfo(@RequestBody @Validated(PolicemanFingerReq.edit.class) PolicemanFingerReq req) {
return ApiRes.success(policeFingerService.searchFingerInfo(req));
}
@PostMapping("/DeleteFingerInfo")
@ApiOperation("删除警员指纹信息")
public ApiRes<Boolean> deletePoliceFinger(@RequestBody @Validated(PolicemanFingerReq.edit.class) PolicemanFingerReq req) {
return ApiRes.success(policeFingerService.deleteFinger(req));
}
@ApiOperation("/分页信息")
@GetMapping(path = "/page", name = "指纹信息分页")
public ApiRes<PageResult<PoliceFinger>> page(PolicemanFingerReq req) {
return ApiRes.success(policeFingerService.findPage(req));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/doc/CabinetDoc.java 0 → 100644
package com.junmp.jyzb.doc;
public interface CabinetDoc {
}
jyzb-biz/src/main/java/com/junmp/jyzb/doc/PolicemanFingerDoc.java 0 → 100644
package com.junmp.jyzb.doc;
import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.jyzb.beanReq.PolicemanFingerReq;
import com.junmp.jyzb.entity.PoliceFinger;
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 java.util.List;
@Api(value = "警员指纹管理",tags = "警员指纹管理接口")
public interface PolicemanFingerDoc {
@ApiOperation(value = "添加指纹信息", tags = "警员指纹管理接口")
ApiRes<Boolean> addFingerInfo(PolicemanFingerReq req);
@ApiOperation(value = "修改指纹信息", tags = "警员指纹管理接口")
ApiRes<Boolean> updateFingerInfo(PolicemanFingerReq req);
@ApiOperation(value = "查找指纹信息", tags = "警员指纹管理接口")
ApiRes<List<PoliceFinger>> searchFingerInfo(PolicemanFingerReq req);
@ApiOperation(value = "删除指纹信息", tags = "警员指纹管理接口")
ApiRes<Boolean> deletePoliceFinger(PolicemanFingerReq req);
@ApiOperation(value = "分页", tags = "警员指纹管理接口")
ApiRes<PageResult<PoliceFinger>> page(PolicemanFingerReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/domain/EquipmentType.java deleted 100644 → 0
package com.junmp.jyzb.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-EquipmentType")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class EquipmentType implements Serializable {
/**
* 装备类型ID
*/
@ApiModelProperty(value = "装备类型ID")
private String id;
/**
* 类型名称
*/
@ApiModelProperty(value = "类型名称")
private String name;
/**
* 单位
*/
@ApiModelProperty(value = "单位")
private String unit;
/**
* 单位类型
*/
@ApiModelProperty(value = "单位类型")
private String unitType;
/**
* 装备Code码
*/
@ApiModelProperty(value = "装备Code码")
private String code;
/**
* 上级id
*/
@ApiModelProperty(value = "上级id")
private String parentId;
/**
* 上级ids
*/
@ApiModelProperty(value = "上级id")
private String parentIds;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 最后更新时间
*/
@ApiModelProperty(value = "最后更新时间")
private Date updateTime;
/**
* 当前状态:0关闭/1启用
*/
@ApiModelProperty(value = "当前状态:0关闭/1启用")
private Integer state;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String note;
/**
* 类型，0类别，1装备
*/
@ApiModelProperty(value = "类型，0类别，1装备")
private Integer type;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/Inventory.java deleted 100644 → 0
package com.junmp.jyzb.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-Inventory")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class Inventory implements Serializable {
/**
* 装备ID
*/
@ApiModelProperty(value = "装备ID")
private String id;
/**
* 装备包ID
*/
@ApiModelProperty(value = "装备包ID")
private String packageId;
/**
* 装备类型ID
*/
@ApiModelProperty(value = "装备类型ID")
private String typeId;
/**
* 装备类型名称
*/
@ApiModelProperty(value = "装备类型名称")
private String typeName;
/**
* 号型ID
*/
@ApiModelProperty(value = "号型ID")
private String sizeId;
/**
* 供应商ID
*/
@ApiModelProperty(value = "供应商ID")
private String supplierId;
/**
* 供应商名称
*/
@ApiModelProperty(value = "供应商名称")
private String supplierName;
/**
* 货架ID
*/
@ApiModelProperty(value = "货架ID")
private String shelfId;
/**
* 区域信息
*/
@ApiModelProperty(value = "区域信息")
private String locationArea;
/**
* 位置信息
*/
@ApiModelProperty(value = "位置信息")
private String positionMsg;
/**
* EPC信息
*/
@ApiModelProperty(value = "EPC信息")
private String epc;
/**
* 组织机构ID
*/
@ApiModelProperty(value = "组织机构ID")
private String orgId;
/**
* 组织机构名称
*/
@ApiModelProperty(value = "组织机构名称")
private String orgName;
/**
* 状态:0正常/1损坏/2报废/3销毁
*/
@ApiModelProperty(value = "状态:0正常/1损坏/2报废/3销毁")
private Integer state;
/**
* 业务状态:0无业务,1调拨/借用/领用
*/
@ApiModelProperty(value = "业务状态:0无业务,1调拨/借用/领用")
private Integer bussinessState;
/**
* 在库状态:0在库，1出库
*/
@ApiModelProperty(value = "在库状态:0在库，1出库")
private Integer locationState;
/**
* 生产日期
*/
@ApiModelProperty(value = "生产日期")
private Date productionDate;
/**
* 质保期
*/
@ApiModelProperty(value = "质保期")
private Integer warrantyPeriod;
/**
* 维保期
*/
@ApiModelProperty(value = "维保期")
private Integer maintenancePeriod;
/**
* 维修次数
*/
@ApiModelProperty(value = "维修次数")
private Integer fixCount;
/**
* 价格
*/
@ApiModelProperty(value = "价格")
private String price;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String note;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/OrderMain.java deleted 100644 → 0
package com.junmp.jyzb.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@ApiModel(value="com-junmp-jyzb-domain-BussinessOrderMain")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class OrderMain implements Serializable {
@ApiModelProperty(value="")
private Long id;
/**
* 单据类型：入库单/出库单
*/
@ApiModelProperty(value="单据类型：入库单/出库单")
private String orderType;
/**
* 工作流ID
*/
@ApiModelProperty(value="工作流ID")
private String processId;
/**
* 单据业务类型：purchase采购/gift赠予/other其他类型
*/
@ApiModelProperty(value="单据业务类型：purchase采购/gift赠予/other其他类型")
private String bussinessType;
/**
* 订单号
*/
@ApiModelProperty(value="订单号")
private String orderCode;
/**
* 目标单位
*/
@ApiModelProperty(value="目标单位")
private String orgId;
/**
* 审批状态：0未审批/1已审批/
*/
@ApiModelProperty(value="审批状态：0未审批/1已审批/")
private String approveType;
/**
* 发物单位
*/
@ApiModelProperty(value="发物单位")
private String sendOrgId;
/**
* 发物单位名称
*/
@ApiModelProperty(value="发物单位名称")
private String sendOrgName;
/**
* 应入库数量
*/
@ApiModelProperty(value="应入库数量")
private Integer inventoryQuantity;
/**
* 实际数量
*/
@ApiModelProperty(value="实际数量")
private Integer actualQuantity;
/**
* 是否已记账 0未记账/1已记账
*/
@ApiModelProperty(value="是否已记账 0未记账/1已记账")
private Integer manualState;
/**
* 单据状态 0待入库/1已入库/2入库中
*/
@ApiModelProperty(value="单据状态 0待入库/1已入库/2入库中")
private Integer orderState;
/**
* 附件地址
*/
@ApiModelProperty(value="附件地址")
private String attachmentLocation;
/**
* 单据包含的物资集合，内容以逗号进行分割
*/
@ApiModelProperty(value="单据包含的物资集合，内容以逗号进行分割")
private String invList;
/**
* 创建时间
*/
@ApiModelProperty(value="创建时间")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(value="更新时间")
private Date updateTime;
/**
* 创建人员
*/
@ApiModelProperty(value="创建人员")
private String createUser;
/**
* 更新人员
*/
@ApiModelProperty(value="更新人员")
private String updateUser;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/Package.java deleted 100644 → 0
package com.junmp.jyzb.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-Package")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class Package implements Serializable {
/**
* 装备包ID
*/
@ApiModelProperty(value = "装备包ID")
private String id;
/**
* 包内物资总数
*/
@ApiModelProperty(value = "包内物资总数")
private Integer count;
/**
* 组织机构ID
*/
@ApiModelProperty(value = "组织机构ID")
private String orgId;
/**
* 具体位置ID(仓库/单警柜)
*/
@ApiModelProperty(value = "具体位置ID(仓库/单警柜)")
private String location;
/**
* 货架ID
*/
@ApiModelProperty(value = "货架ID")
private String shelfId;
/**
* 货架名称
*/
@ApiModelProperty(value = "货架名称")
private String shelfName;
/**
* 货架编号
*/
@ApiModelProperty(value = "货架编号")
private String shelfCode;
/**
* 解包状态:0未解包/1已解包
*/
@ApiModelProperty(value = "解包状态:0未解包/1已解包")
private Integer state;
/**
* 是否销毁:0否/1是
*/
@ApiModelProperty(value = "是否销毁:0否/1是")
private Integer isDestroy;
/**
* EPC信息
*/
@ApiModelProperty(value = "EPC信息")
private String epc;
/**
* 标签打印状态:0否/1是
*/
@ApiModelProperty(value = "标签打印状态:0否/1是")
private Integer printState;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String note;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/Policeman.java deleted 100644 → 0
package com.junmp.jyzb.domain;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleCreateTableStatement;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.Map;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value="com-junmp-jyzb-domain-Policeman")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class Policeman implements Serializable {
/**
* 警员id
*/
@ApiModelProperty(value="警员id")
private String id;
/**
* 警员名称
*/
@ApiModelProperty(value="警员名称")
private String name;
/**
* 单警柜关联id
*/
@ApiModelProperty(value="单警柜关联id")
private String cabinetId;
/**
* 组织机构名称
*/
@ApiModelProperty(value="组织机构名称")
private Cabinet cabinetName;
/**
* 机构代码，一个警员只属于一个机构
*/
@ApiModelProperty(value="机构代码，一个警员只属于一个机构")
private String orgId;
/**
* 机构名称
*/
@ApiModelProperty(value="机构名称")
private PubOrg orgName;
/**
* 警员编号
*/
@ApiModelProperty(value="警员编号")
private String policeCode;
/**
* 警员性别
*/
@ApiModelProperty(value="警员性别")
private String sex;
/**
* 人脸信息
*/
@ApiModelProperty(value="人脸信息")
private String faceInfo;
/**
* 是否已生成对应账号，1表生成，0表未生成
*/
@ApiModelProperty(value="是否已生成对应账号，1表生成，0表未生成")
private Integer isCreatedAccount;
/**
* 门禁编码
*/
@ApiModelProperty(value="门禁编码")
private String doorCode;
/**
* 密码
*/
@ApiModelProperty(value="密码")
private String password;
/**
* 警员照片
*/
@ApiModelProperty(value="警员照片")
private String photo;
/**
* 联系方式
*/
@ApiModelProperty(value="联系方式")
private String phone;
/**
* 创建时间
*/
@ApiModelProperty(value="创建时间")
private Date createTime;
/**
* 最后更新时间
*/
@ApiModelProperty(value="最后更新时间")
private Date updateTime;
/**
* 身份证信息
*/
@ApiModelProperty(value="身份证信息")
private String idCard;
/**
* 更新人员
*/
@ApiModelProperty(value="更新人员")
private String updateUser;
/**
* 警员状态
*/
@ApiModelProperty(value="警员状态")
private Integer state;
/**
* 指纹信息
* */
private List<Map<String, Object>> fingerMsg;
/**
* 警员状态
*/
@ApiModelProperty(value="指纹id")
private Integer fingerId;
/**
* 指纹名称
*/
@ApiModelProperty(value="指纹名称")
private String fingerName;
/**
* 指纹信息
*/
@ApiModelProperty(value="指纹信息")
private String fingerInfo;
/**
* 单警柜关联箱号id
* */
private String cabinetBoxId;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/ProcessTemplates.java deleted 100644 → 0
package com.junmp.jyzb.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
* process_templates
*/
@ApiModel(value="com-junmp-jyzb-domain-ProcessTemplates")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ProcessTemplates implements Serializable {
/**
* 审批摸板ID
*/
@ApiModelProperty(value="审批摸板ID")
private String templateId;
/**
* 摸板名称
*/
@ApiModelProperty(value="摸板名称")
private String templateName;
/**
* 基础设置
*/
@ApiModelProperty(value="基础设置")
private String settings;
/**
* 摸板表单
*/
@ApiModelProperty(value="摸板表单")
private String formJson;
/**
* process
*/
@ApiModelProperty(value="process")
private String processJson;
/**
* 图标
*/
@ApiModelProperty(value="图标")
private String icon;
/**
* 图标背景色
*/
@ApiModelProperty(value="图标背景色")
private String background;
/**
* notify
*/
@ApiModelProperty(value="notify")
private String notify;
/**
* 谁能提交
*/
@ApiModelProperty(value="谁能提交")
private String whoCommit;
/**
* 谁能编辑
*/
@ApiModelProperty(value="谁能编辑")
private String whoEdit;
/**
* 谁能导出数据
*/
@ApiModelProperty(value="谁能导出数据")
private String whoExport;
/**
* remark
*/
@ApiModelProperty(value="remark")
private String remark;
/**
* 冗余分组id
*/
@ApiModelProperty(value="冗余分组id")
private Integer groupId;
/**
* 是否已停用
*/
@ApiModelProperty(value="是否已停用")
private Byte isStop;
/**
* 创建时间
*/
@ApiModelProperty(value="创建时间")
private Date created;
/**
* 更新时间
*/
@ApiModelProperty(value="更新时间")
private Date updated;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/YearReport.java deleted 100644 → 0
package com.junmp.jyzb.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-YearReport")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class YearReport implements Serializable {
/**
* 年度报表id
*/
@ApiModelProperty(value = "年度报表id")
private String id;
/**
* 组织机构id
*/
@ApiModelProperty(value = "组织机构id")
private String organizationId;
/**
* 年初数量
*/
@ApiModelProperty(value = "年初数量")
private Integer startNum;
/**
* 年末数量
*/
@ApiModelProperty(value = "年末数量")
private Integer endNum;
/**
* 年初金额
*/
@ApiModelProperty(value = "年初金额")
private Integer startMoney;
/**
* 年末金额
*/
@ApiModelProperty(value = "年末金额")
private Integer endMoney;
/**
* 年度销毁数量
*/
@ApiModelProperty(value = "年度销毁数量")
private Integer destructionNum;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/Warehouse.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/Cabinet.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-Warehouse")
@ApiModel(value = "com-junmp-jyzb-domain-Cabinet")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class Warehouse implements Serializable {
@TableName("base_cabinet")
public class Cabinet implements Serializable {
/**
* 仓库信息表
* 单警柜ID
*/
@ApiModelProperty(value = "仓库信息表")
@ApiModelProperty(value = "单警柜ID")
private String id;
/**
* 仓库名称
* 单警柜编号
*/
@ApiModelProperty(value = "单警柜编号")
@TableField("cabinet_num")
private String cabinetNum;
/**
* 单警柜名称
*/
@ApiModelProperty(value = "仓库名称")
@ApiModelProperty(value = "单警柜名称")
private String name;
/**
* 仓库地点
* 新版本组织机构号
*/
@ApiModelProperty(value = "仓库地点")
private String location;
@ApiModelProperty(value = "新版本组织机构号")
@TableField("org_id_int")
private long orgId;
/**
* 联系方式
* 部门id
*/
@ApiModelProperty(value = "联系方式")
private String phone;
@ApiModelProperty(value = "部门id")
@TableField("department_id")
private Integer departmentId;
/**
* 视屏地址
* 位置信息
*/
@ApiModelProperty(value = "视屏地址")
private String video;
@ApiModelProperty(value = "位置信息")
private String location;
/**
* 创建时间
* 单警柜当前状态，0正常，1异常
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "单警柜当前状态，0正常，1异常")
private Integer state;
/**
* 修改时间
* 装备总数
*/
@ApiModelProperty(value = "修改时间")
private Date updateTime;
@ApiModelProperty(value = "装备总数")
private Integer sum;
/**
* 更新人员
* 在库装备总数
*/
@ApiModelProperty(value = "更新人员")
private String updateUser;
@ApiModelProperty(value = "在库装备总数")
@TableField("in_sum")
private Integer inSum;
/**
* 新版本组织机构外键
* 出库装备总数
*/
@ApiModelProperty(value = "新版本组织机构外键")
private Integer orgIdInt;
@ApiModelProperty(value = "出库装备总数")
@TableField("out_sum")
private Integer outSum;
/**
* 是否锁库，1锁库，0未锁库
* 库存总价
*/
@ApiModelProperty(value = "是否锁库")
private Integer isLocked;
@ApiModelProperty(value = "库存总价")
@TableField("price_total")
private BigDecimal priceTotal;
/**
* 组织机构表id
* 创建时间
*/
@ApiModelProperty(value = "组织机构表id")
private String orgId;
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
private Date createTime;
/**
* 当前仓库下装备总数
* 更新时间
*/
@ApiModelProperty(value = "当前仓库下装备总数")
private Integer sum;
@ApiModelProperty(value = "更新时间")
@TableField("update_time")
private Date updateTime;
/**
* 出库装备总数
* 新增人员
*/
@ApiModelProperty(value = "当前仓库下装备总数")
private Integer outSum;
@ApiModelProperty(value = "新增人员")
@TableField("create_user")
private String createUser;
/**
* 出库装备总数
* 更新人员
*/
@ApiModelProperty(value = "当前仓库下装备总数")
private Integer inSum;
@ApiModelProperty(value = "更新人员")
@TableField("update_user")
private String updateUser;
/**
* 1表启用，0表禁用
* 箱数
*/
@ApiModelProperty(value = "状态")
private Integer state;
@ApiModelProperty(value = "箱数")
private Integer num;
/**
* 单警柜与箱门一对多关系
*/
private List<CabinetBox> list;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/CabinetBox.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/CabinetBox.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -11,6 +13,7 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_cabinet_box")
public class CabinetBox implements Serializable {
/**
* 主键ID
......@@ -22,19 +25,14 @@ public class CabinetBox implements Serializable {
* 主柜ID
*/
@ApiModelProperty(value = "主柜ID")
@TableField("cabinet_id")
private String cabinetId;
/**
* 警员ID
* 箱号
*/
@ApiModelProperty(value = "警员ID")
private String policeId;
/**
* 警员姓名
*/
@ApiModelProperty(value = "警员姓名")
private String policeName;
@ApiModelProperty(value = "箱号")
private Integer num;
/**
* 异常状态:1正常/0异常
......@@ -46,12 +44,14 @@ public class CabinetBox implements Serializable {
* 异常原因
*/
@ApiModelProperty(value = "异常原因")
@TableField("error_msg")
private String errorMsg;
/**
* 使用日志存储位置信息
*/
@ApiModelProperty(value = "使用日志存储位置信息")
@TableField("log_map")
private String logMap;
private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/domain/EquipmentSize.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/EquipmentSize.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
......@@ -12,6 +15,7 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_equipment_size")
public class EquipmentSize implements Serializable {
/**
* 装备号型ID
......@@ -23,13 +27,9 @@ public class EquipmentSize implements Serializable {
* 装备类型ID
*/
@ApiModelProperty(value = "装备类型ID")
@TableField("type_id")
private String typeId;
/**
* 信息关联ID
*/
@ApiModelProperty(value = "信息关联ID")
private String detailId;
/**
* 号型码
......@@ -47,12 +47,14 @@ public class EquipmentSize implements Serializable {
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间")
@TableField("update_time")
private Date updateTime;
/**
......@@ -65,7 +67,7 @@ public class EquipmentSize implements Serializable {
* 价格
*/
@ApiModelProperty(value = "价格")
private Double price;
private BigDecimal price;
/**
* 当前状态：0关闭/1启用
......@@ -77,6 +79,7 @@ public class EquipmentSize implements Serializable {
* EPC类型
*/
@ApiModelProperty(value = "EPC类型")
@TableField("epc_type")
private Integer epcType;
private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/EquipmentType.java
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-EquipmentType")
@Data
@TableName("base_inventory")
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_equipment_type")
public class EquipmentType implements Serializable {
/**
* 装备类型ID
*/
@ApiModelProperty(value = "装备类型ID")
private String id;
/**
* 类型名称
*/
@ApiModelProperty(value = "类型名称")
private String name;
/**
* 单位
*/
@ApiModelProperty(value = "单位")
private String unit;
/**
* 单位类型
*/
@TableField(value = "unit_type")
@ApiModelProperty(value = "单位类型")
@TableField("unit_type")
private String unitType;
/**
* 装备Code码
*/
@ApiModelProperty(value = "装备Code码")
private String code;
/**
* 上级id
*/
@TableField(value = "parent_id")
@ApiModelProperty(value = "上级id")
@TableField("parent_id")
private String parentId;
/**
* 上级ids
*/
@TableField(value = "parent_ids")
@ApiModelProperty(value = "上级id")
@TableField("parent_ids")
private String parentIds;
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
private Date createTime;
/**
* 更新时间
* 最后更新时间
*/
@TableField(value = "update_time", fill = FieldFill.UPDATE)
@ApiModelProperty(value = "最后更新时间")
@TableField("update_time")
private Date updateTime;
/**
* 当前状态:0关闭/1启用
*/
......@@ -78,10 +88,16 @@ public class EquipmentType implements Serializable {
private String note;
/**
* 原id
*/
@ApiModelProperty(value = "原id")
private String guid;
/**
* 类型，0类别，1装备
*/
@ApiModelProperty(value = "类型，0类别，1装备")
private Integer type;
private static final long serialVersionUID = 1L;
}
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/History.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/History.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -12,6 +14,7 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_history")
public class History implements Serializable {
/**
* 历史记录id
......@@ -23,30 +26,35 @@ public class History implements Serializable {
* 装备类型id
*/
@ApiModelProperty(value = "装备类型id")
@TableField("equipmen_id")
private String equipmentId;
/**
* 组织机构id
*/
@ApiModelProperty(value = "组织机构id")
@TableField("organization_id")
private String organizationId;
/**
* 要查询的时间
*/
@ApiModelProperty(value = "要查询的时间")
@TableField("search_date")
private Date searchDate;
/**
* 当月使用次数
*/
@ApiModelProperty(value = "当月使用次数")
@TableField("use_month")
private Integer useMonth;
/**
* 当月维修次数
*/
@ApiModelProperty(value = "当月维修次数")
@TableField("fix_month")
private Integer fixMonth;
private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/Inventory.java
......@@ -57,7 +57,7 @@ public class Inventory implements Serializable {
private String shelfLocation;
/**
* 货架位置
* 货架id
*/
@TableField("shelf_id")
private String shelfId;
......@@ -71,7 +71,7 @@ public class Inventory implements Serializable {
* 组织机构ID
*/
@TableField("org_id_int")
private String 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,22 +97,22 @@ public class Inventory implements Serializable {
private Date productionDate;
/**
* 质保期
* 质保
*/
@TableField("warranty_period")
private long warrantyPeriod;
/**
* 维保期
* 维保
*/
@TableField("maintenance_period")
private int maintenancePeriod;
private Integer maintenancePeriod;
/**
* 维修次数
*/
@TableField("fix_count")
private int fixCount;
private Integer fixCount;
/**
* 维修次数
*/
......@@ -122,7 +122,7 @@ public class Inventory implements Serializable {
* 位置类型
*/
@TableField(value = "location_type")
private String locationType;
private Integer locationType;
/**
* 位置ID
......@@ -134,7 +134,7 @@ public class Inventory implements Serializable {
* 是否遗失
*/
@TableField(value = "lost_flag")
private int lostFlag ;
private Integer lostFlag ;
/**
......@@ -166,13 +166,13 @@ public class Inventory implements Serializable {
private Date updateTime;
/**
* 创建时间
* 更新人员
*/
@TableField(value = "update_user", fill = FieldFill.INSERT)
private String updateUser;
/**
* 更新时间
* 创建人员
*/
@TableField(value = "create_user", fill = FieldFill.UPDATE)
private String createUser;
......
jyzb-biz/src/main/java/com/junmp/jyzb/domain/InventorySummary.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/InventorySummary.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -13,6 +15,7 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_inventory_summary")
public class InventorySummary implements Serializable {
/**
* 装备汇总id
......@@ -24,66 +27,77 @@ public class InventorySummary implements Serializable {
* 组织机构id
*/
@ApiModelProperty(value = "组织机构id")
@TableField("org_id")
private String orgId;
/**
* 组织机构名称
*/
@ApiModelProperty(value = "组织机构名称")
@TableField("org_name")
private String orgName;
/**
* 装备类型id
*/
@ApiModelProperty(value = "装备类型id")
@TableField("type_id")
private String typeId;
/**
* 类型名称
*/
@ApiModelProperty(value = "类型名称")
@TableField("type_name")
private String typeName;
/**
* 装备号型id
*/
@ApiModelProperty(value = "装备号型id")
@TableField("size_id")
private String sizeId;
/**
* 号型名称
*/
@ApiModelProperty(value = "号型名称")
@TableField("size_name")
private String sizeName;
/**
* 位置类型，0代表仓库，1代表单警柜
*/
@ApiModelProperty(value = "位置类型，0代表仓库，1代表单警柜")
@TableField("location_type")
private String locationType;
/**
* 位置信息id
*/
@ApiModelProperty(value = "位置信息id")
@TableField("location_id")
private String locationId;
/**
* 位置名称
*/
@ApiModelProperty(value = "位置名称")
@TableField("location_name")
private String locationName;
/**
* 区域id
*/
@ApiModelProperty(value = "区域id")
@TableField("location_area_id")
private String locationAreaId;
/**
* 区域信息
*/
@ApiModelProperty(value = "区域信息")
@TableField("location_area")
private String locationArea;
/**
......@@ -102,37 +116,50 @@ public class InventorySummary implements Serializable {
* 在库数
*/
@ApiModelProperty(value = "在库数")
@TableField("stock_number")
private Integer stockNumber;
/**
* 出库数量
*/
@ApiModelProperty(value = "出库数量")
@TableField("outbound_number")
private Integer outboundNumber;
/**
* 销毁数量
*/
@ApiModelProperty(value = "销毁数量")
@TableField("destruction_number")
private Integer destructionNumber;
/**
* 过质保数量
*/
@ApiModelProperty(value = "过质保数量")
@TableField("expire_number")
private Integer expireNumber;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间")
@TableField("update_time")
private Date updateTime;
/**
* 唯一值
*/
@ApiModelProperty(value = "唯一值")
@TableField("one_id")
private String oneId;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/LogDetail.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/LogDetail.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
......@@ -11,6 +16,7 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_log_detail")
public class LogDetail implements Serializable {
/**
* 出入库明细ID
......@@ -19,15 +25,24 @@ public class LogDetail implements Serializable {
private Integer id;
/**
* 物资id
*/
@ApiModelProperty(value = "物资id")
@TableField("inverntory_id")
private String inverntoryId;
/**
* 出入库汇总ID
*/
@ApiModelProperty(value = "出入库汇总ID")
@TableField("summary_id")
private Integer summaryId;
/**
* 单据ID
*/
@ApiModelProperty(value = "单据ID")
@TableField("order_main_id")
private String orderId;
/**
......@@ -40,30 +55,35 @@ public class LogDetail implements Serializable {
* 装备名称
*/
@ApiModelProperty(value = "装备名称")
@TableField("equipment_name")
private String equipmentName;
/**
* 装备号型
*/
@ApiModelProperty(value = "装备号型")
@TableField("equipment_size")
private String equipmentSize;
/**
* 供应商
*/
@ApiModelProperty(value = "供应商")
@TableField("equipment_supplier")
private String equipmentSupplier;
/**
* 装备类型:0单件/1装备包
*/
@ApiModelProperty(value = "装备类型:0单件/1装备包")
@TableField("equipment_type")
private Integer equipmentType;
/**
* 状态，0正常/1异常
*/
@ApiModelProperty(value = "状态，0正常/1异常")
@TableField("error_state")
private Integer errorState;
/**
......@@ -72,5 +92,49 @@ public class LogDetail implements Serializable {
@ApiModelProperty(value = "备注信息")
private String note;
/**
* 业务类型
*/
@ApiModelProperty(value = "业务类型")
@TableField("bussiness_type")
private String bussinessType;
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
/**
* 更新时间
*/
@TableField(value = "update_time", fill = FieldFill.UPDATE)
private Date updateTime;
/**
* 更新人员
*/
@TableField(value = "update_user", fill = FieldFill.INSERT)
private String updateUser;
/**
* 创建人员
*/
@TableField(value = "create_user", fill = FieldFill.UPDATE)
private String createUser;
/**
* 照片信息
*/
@ApiModelProperty(value = "照片信息")
private String picture;
/**
* 作业设备：0手持机 1单警柜 2通道）
*/
@ApiModelProperty(value = "业务类型")
@TableField("device_type")
private Integer deviceType;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/LogSummary.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/LogSummary.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -12,6 +15,7 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_log_summary")
public class LogSummary implements Serializable {
/**
* 出入库汇总ID
......@@ -23,25 +27,36 @@ public class LogSummary implements Serializable {
* 组织机构ID
*/
@ApiModelProperty(value = "组织机构ID")
@TableField("error_state")
private String orgId;
/**
* 组织机构名称
*/
@ApiModelProperty(value = "组织机构名称")
@TableField("error_state")
private String orgName;
/**
* 仓库ID
* 单据id
*/
@ApiModelProperty(value = "仓库ID")
private String warehouseId;
@ApiModelProperty(value = "单据id")
@TableField("order_main_id")
private String orderMainId;
/**
* 仓库名称
* 存储ID
*/
@ApiModelProperty(value = "仓库名称")
private String warehouseName;
@ApiModelProperty(value = "存储ID")
@TableField("location_id")
private String locationId;
/**
* 存储名称：XX仓库，XX单警柜
*/
@ApiModelProperty(value = "存储名称")
@TableField("location_name")
private String locationName;
/**
* 设备标识
......@@ -53,24 +68,34 @@ public class LogSummary implements Serializable {
* 出入设备:0手持机/1单警柜/2通道
*/
@ApiModelProperty(value = "出入设备:0手持机/1单警柜/2通道")
@TableField("device_type")
private Integer deviceType;
/**
* 操作时间
*/
@ApiModelProperty(value = "操作时间")
@TableField("use_time")
private Date useTime;
/**
* 业务类型
*/
@ApiModelProperty(value = "业务类型")
@TableField("bussiness_type")
private String bussinessType;
/**
* 操作人员姓名
*/
@ApiModelProperty(value = "操作人员姓名")
@TableField("user_name")
private String userName;
/**
* 出入库类型:0出库/1入库
*/
@ApiModelProperty(value = "出入库类型:0出库/1入库")
@TableField("out_in_state")
private Integer outInState;
/**
......@@ -79,5 +104,36 @@ public class LogSummary implements Serializable {
@ApiModelProperty(value = "照片信息")
private String picture;
/**
* 装备记录集合，警棍、盾牌
*/
@ApiModelProperty(value = "装备记录集合")
@TableField("equipment_List")
private String equipmentList;
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
/**
* 更新时间
*/
@TableField(value = "update_time", fill = FieldFill.UPDATE)
private Date updateTime;
/**
* 更新人员
*/
@TableField(value = "update_user", fill = FieldFill.INSERT)
private String updateUser;
/**
* 创建人员
*/
@TableField(value = "create_user", fill = FieldFill.UPDATE)
private String createUser;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderMain.java 0 → 100644
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@ApiModel(value="com-junmp-jyzb-domain-BussinessOrderMain")
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("bussiness_order_main")
public class OrderMain implements Serializable {
@TableField("id")
private Long id;
@TableField("order_type")
private String orderType;
@TableField("process_id")
private String processId;
@TableField("bussiness_type")
private String bussinessType;
@TableField("order_code")
private String orderCode;
@TableField("start_org_id")
private Long startOrgId;
@TableField("start_org_name")
private String startOrgName;
@TableField("end_org_id")
private Long endOrgId;
@TableField("end_org_name")
private String endOrgName;
@TableField("start_org_user_id")
private String startOrgUserId;
@TableField("start_org_user_name")
private String startOrgUserName;
@TableField("end_org_user_id")
private String endOrgUserId;
@TableField("end_org_user_name")
private String endOrgUserName;
@TableField("price")
private BigDecimal price;
@TableField("inventory_quantity")
private Integer inventoryQuantity;
@TableField("actual_quantity")
private Integer actualQuantity;
@TableField("manual_state")
private Integer manualState;
@TableField("order_state")
private Integer orderState;
@TableField("attachment_location")
private String attachmentLocation;
@TableField("inv_list")
private String invList;
@TableField("create_time")
private Date createTime;
@TableField("update_time")
private Date updateTime;
@TableField("create_user")
private String createUser;
@TableField("update_user")
private String updateUser;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/entity/Package.java 0 → 100644
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-Package")
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_package")
public class Package implements Serializable {
@TableField(value = "id")
private String id;
@TableField(value = "count")
private Integer count;
@TableField(value = "org_id_int")
private Integer orgId;
@TableField(value = "location")
private String location;
@TableField(value = "shelf_id")
private String shelfId;
@TableField(value = "shelf_name")
private String shelfName;
@TableField(value = "shelf_code")
private String shelfCode;
@TableField(value = "state")
private Integer state;
@TableField(value = "is_destroy")
private Integer isDestroy;
@TableField(value = "epc")
private String epc;
@TableField(value = "print_state")
private Integer printState;
@TableField(value = "create_time")
private Date createTime;
@TableField(value = "update_time")
private Date updateTime;
@TableField(value = "note")
private String note;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/PackageInformation.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/PackageInformation.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -11,47 +13,27 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_package_information")
public class PackageInformation implements Serializable {
/**
* 装备包详细信息id
*/
@ApiModelProperty(value = "装备包详细信息id")
@TableField(value = "id")
private String id;
/**
* 装备包id
*/
@ApiModelProperty(value = "装备包id")
@TableField(value = "package_id")
private String packageId;
/**
* 装备类型id
*/
@ApiModelProperty(value = "装备类型id")
@TableField(value = "type_id")
private String typeId;
/**
* 装备类型名称
*/
@ApiModelProperty(value = "装备类型名称")
@TableField(value = "type_name")
private String typeName;
/**
* 装备号型id
*/
@ApiModelProperty(value = "装备号型id")
@TableField(value = "size_id")
private String sizeId;
/**
* 装备号型名称
*/
@ApiModelProperty(value = "装备号型名称")
@TableField(value = "size_name")
private String sizeName;
/**
* 装备数量
*/
@ApiModelProperty(value = "装备数量")
@TableField(value = "number")
private Integer number;
private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/PoliceFinger.java 0 → 100644
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.NonNull;
import javax.validation.constraints.NotNull;
@ApiModel(value = "com-junmp-jyzb-domain-PoliceFinger")
@Data
@TableName("base_police_finger")
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_police_finger")
public class PoliceFinger implements Serializable {
@TableField(value = "id")
private Integer id;
@TableField(value = "police_id")
private String policeId;
@TableField(value = "name")
private String name;
@TableField(value = "finger_info")
private String fingerInfo;
@TableField(value = "create_time")
private Date createTime;
@TableField(value = "update_time")
private Date updateTime;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/entity/Policeman.java 0 → 100644
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.junmp.jyzb.entity.Cabinet;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.Map;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value="com-junmp-jyzb-domain-Policeman")
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_policeman")
public class Policeman implements Serializable {
@TableField(value = "id")
private String id;
@TableField(value = "name")
private String name;
@TableField(value = "cabinet_box_id")
private String cabinetBoxId;
@TableField(value = "org_id_int")
private Long orgIdInt;
@TableField(value = "org_id")
private String orgId;
@TableField(value = "department_id")
private Long departmentId;
@TableField(value = "police_code")
private String policeCode;
@TableField(value = "sex")
private String sex;
@TableField(value = "face_info")
private String faceInfo;
@TableField(value = "isCreatedAccount")
private Boolean isCreatedAccount;
@TableField(value = "door_code")
private String doorCode;
@TableField(value = "password")
private String password;
@TableField(value = "photo")
private String photo;
@TableField(value = "phone")
private String phone;
@TableField(value = "create_time")
private Date createTime;
@TableField(value = "update_time")
private Date updateTime;
@TableField(value = "id_card")
private String idCard;
@TableField(value = "update_user")
private String updateUser;
@TableField(value = "state")
private Integer state;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/entity/ProcessTemplates.java 0 → 100644
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
* process_templates
*/
@ApiModel(value="com-junmp-jyzb-domain-ProcessTemplates")
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("process_templates")
public class ProcessTemplates implements Serializable {
@TableField(value = "template_id")
private String templateId;
@TableField(value = "form_name")
private String formName;
@TableField(value = "settings")
private String settings;
@TableField(value = "form_json")
private String formJson;
@TableField(value = "process_json")
private String processJson;
@TableField(value = "icon")
private String icon;
@TableField(value = "background")
private String background;
@TableField(value = "notify")
private String notify;
@TableField(value = "who_commit")
private String whoCommit;
@TableField(value = "who_edit")
private String whoEdit;
@TableField(value = "who_export")
private String whoExport;
@TableField(value = "remark")
private String remark;
@TableField(value = "org_id")
private Integer orgId;
@TableField(value = "is_stop")
private Boolean isStop;
@TableField(value = "created")
private Date created;
@TableField(value = "updated")
private Date updated;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/PubOrg.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/PubOrg.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -15,132 +17,181 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("pub_org")
public class PubOrg implements Serializable {
/**
* 主键
*/
@ApiModelProperty(value="主键")
@TableField(value = "org_id")
private Long orgId;
/**
* 父id，一级节点父id是0
*/
@ApiModelProperty(value="父id，一级节点父id是0")
@TableField(value = "parent_id")
private String parentId;
/**
* 父ids
*/
@TableField(value = "org_parent_id")
private Long orgParentId;
/**
* 父ids
*/
@ApiModelProperty(value="父ids")
@TableField(value = "org_parent_ids")
private String orgParentIds;
/**
* 组织编码
*/
@ApiModelProperty(value="组织编码")
@TableField(value = "org_code")
private String orgCode;
/**
* 组织名称
*/
@ApiModelProperty(value="组织名称")
private String orgName;
/**
*
*/
@ApiModelProperty(value="")
private String areaName;
/**
*
*/
@ApiModelProperty(value="")
private String dName;
/**
* 机构类型100企业，101：机构
*/
@ApiModelProperty(value="机构类型100企业，101：机构")
private Short orgType;
@TableField(value = "org_type")
private Integer orgType;
/**
* 排序
*/
@ApiModelProperty(value="排序")
private Byte sortVal;
@TableField(value = "sort_val")
private Integer sortVal;
/**
* 状态：1-启用，0-禁用
*/
@ApiModelProperty(value="状态：1-启用，0-禁用")
@TableField(value = "status_flag")
private Integer statusFlag;
/**
* 描述
*/
@ApiModelProperty(value="描述")
@TableField(value = "remark")
private String remark;
/**
* 删除标记：0-已删除，1-未删除
*/
@ApiModelProperty(value="删除标记：0-已删除，1-未删除")
private Short delFlag;
@TableField(value = "del_flag")
private Integer delFlag;
/**
* 机构全称
*/
@ApiModelProperty(value="机构全称")
@TableField(value = "org_full_name")
private String orgFullName;
/**
* 经度
*/
@TableField(value = "longitude")
private String longitude;
/**
* 维度
*/
@TableField(value = "latitude")
private String latitude;
/**
* 大屏地图使用
*/
@TableField(value = "is_map")
private String isMap;
/**
* 采购
*/
@TableField(value = "show_state")
private String showState;
/**
* 单据计数
*/
@TableField(value = "order_num")
private Integer orderNum;
/**
* levelFlag
*/
@TableField(value = "level_flag")
private Integer levelFlag;
/**
* 区域码短写
*/
@TableField(value = "find_code")
private String findCode;
/**
* 地址
*/
@ApiModelProperty(value="地址")
@TableField(value = "address")
private String address;
/**
* 区域名称
*/
@TableField(value = "area_name")
private String areaName;
/**
* dName
*/
@TableField(value = "d_name")
private String dName;
/**
* 联系人
*/
@ApiModelProperty(value="联系人")
@TableField(value = "contact")
private String contact;
/**
* 电话
*/
@ApiModelProperty(value="电话")
@TableField(value = "phone")
private String phone;
/**
* 创建时间
*/
@ApiModelProperty(value="创建时间")
@TableField(value = "create_time")
private Date createTime;
/**
* 创建人
*/
@ApiModelProperty(value="创建人")
@TableField(value = "create_user")
private Long createUser;
/**
* 更新时间
*/
@ApiModelProperty(value="更新时间")
@TableField(value = "update_time")
private Date updateTime;
/**
* 更新人
*/
@ApiModelProperty(value="更新人")
@TableField(value = "update_user")
private Long updateUser;
@ApiModelProperty(value="")
/**
* guid
*/
@TableField(value = "guid")
private String guid;
@ApiModelProperty(value="")
private String findCode;
/**
* 组织机构名
*/
@TableField(value = "org_name")
private String orgName;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/Shelf.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/Shelf.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -12,6 +13,7 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_shelf")
public class Shelf implements Serializable {
/**
* 货架id
......
jyzb-biz/src/main/java/com/junmp/jyzb/domain/Supplier.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/Supplier.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -12,77 +14,72 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_supplier")
public class Supplier implements Serializable {
/**
* 供应商ID
*/
@ApiModelProperty(value = "供应商ID")
@TableField(value = "id")
private String id;
/**
* 装备类型ID
*/
@ApiModelProperty(value = "装备类型ID")
private String equipmentId;
/**
* 供应商名称
*/
@ApiModelProperty(value = "供应商名称")
@TableField(value = "name")
private String name;
/**
* 供应商短码
*/
@ApiModelProperty(value = "供应商短码")
@TableField(value = "code")
private String code;
/**
* 简称
*/
@ApiModelProperty(value = "简称")
@TableField(value = "short_name")
private String shortName;
/**
* 联系方式
* 联系人
*/
@ApiModelProperty(value = "联系方式")
@TableField(value = "contacts")
private String contacts;
/**
* 联系电话
*/
@TableField(value = "phone")
private String phone;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
@TableField(value = "create_time")
private Date createTime;
/**
* 创建人员
*/
@ApiModelProperty(value = "创建人员")
@TableField(value = "create_user")
private String createUser;
/**
* 最后更新时间
*/
@ApiModelProperty(value = "最后更新时间")
@TableField(value = "update_time")
private Date updateTime;
/**
* 更新人ID
*/
@ApiModelProperty(value = "更新人ID")
@TableField(value = "update_user")
private String updateUser;
/**
* 联系方式
*/
@ApiModelProperty(value = "联系方式")
private String phone;
/**
* 状态码
* 1为启用，0为禁用
*/
@ApiModelProperty(value = "状态码")
@TableField(value = "state")
private Integer state;
private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/domain/SupplierEquipment.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/SupplierEquipment.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -12,47 +14,48 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_supplier_type")
public class SupplierEquipment implements Serializable {
/**
* 供应商产品ID
*/
@ApiModelProperty(value = "供应商产品ID")
@TableField(value = "id")
private String id;
/**
* 供应商代码
*/
@ApiModelProperty(value = "供应商代码")
@TableField(value = "supplier_id")
private String supplierId;
/**
* 产品代码
*/
@ApiModelProperty(value = "产品代码")
@TableField(value = "type_id")
private String typeId;
/**
* 状态，0:启用，1:停用
*/
@ApiModelProperty(value = "状态，0:启用，1:停用")
@TableField(value = "state")
private Integer state;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
@TableField(value = "create_time")
private Date createTime;
/**
* 最后更新时间
*/
@ApiModelProperty(value = "最后更新时间")
@TableField(value = "update_time")
private Date updateTime;
/**
* 更新人ID
*/
@ApiModelProperty(value = "更新人ID")
@TableField(value = "update_user")
private String updateUser;
private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/domain/SupplierType.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/SupplierType.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -12,47 +14,48 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_supplier_type")
public class SupplierType implements Serializable {
/**
* 供应商产品ID
*/
@ApiModelProperty(value="供应商产品ID")
* 供应商产品ID
*/
@TableField(value = "id")
private String id;
/**
* 供应商代码
*/
@ApiModelProperty(value="供应商代码")
* 供应商代码
*/
@TableField(value = "supplier_id")
private String supplierId;
/**
* 产品代码
*/
@ApiModelProperty(value="产品代码")
* 产品代码
*/
@TableField(value = "type_id")
private String typeId;
/**
* 状态，0:停用，1:启用
*/
@ApiModelProperty(value="状态，0:停用，1:启用")
* 状态，0:启用，1:停用
*/
@TableField(value = "state")
private Integer state;
/**
* 创建时间
*/
@ApiModelProperty(value="创建时间")
* 创建时间
*/
@TableField(value = "create_time")
private Date createTime;
/**
* 最后更新时间
*/
@ApiModelProperty(value="最后更新时间")
* 最后更新时间
*/
@TableField(value = "update_time")
private Date updateTime;
/**
* 更新人ID
*/
@ApiModelProperty(value="更新人ID")
* 更新人ID
*/
@TableField(value = "update_user")
private String updateUser;
private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/Warehouse.java 0 → 100644
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-Warehouse")
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_warehouse")
public class Warehouse implements Serializable {
@TableField("id")
private String id;
@TableField("department_id")
private Long departmentId;
@TableField("name")
private String name;
@TableField("location")
private String location;
@TableField("phone")
private String phone;
@TableField("video")
private String video;
@TableField("create_time")
private Date createTime;
@TableField("update_time")
private Date updateTime;
@TableField("update_user")
private String updateUser;
@TableField("org_id_int")
private Long orgIdInt;
@TableField("is_locked")
private Boolean isLocked;
@TableField("org_id")
private String orgId;
@TableField("sum")
private Integer sum;
@TableField("out_sum")
private Integer outSum;
@TableField("in_sum")
private Integer inSum;
@TableField("price_total")
private BigDecimal priceTotal;
@TableField("state")
private Integer state;
@TableField("order_id")
private Long orderId;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/WarehouseArea.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/WarehouseArea.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -12,48 +14,34 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_warehouse_area")
public class WarehouseArea implements Serializable {
/**
* 区域主键
*/
@ApiModelProperty(value="区域主键")
@TableField("area_id")
private String areaId;
/**
* 区域名称
*/
@ApiModelProperty(value="区域名称")
@TableField("area_name")
private String areaName;
/**
* 所属组织机构
*/
@ApiModelProperty(value="所属组织机构")
@TableField("org_id_int")
private Long orgIdInt;
/**
* 所属仓库id
*/
@ApiModelProperty(value="所属仓库id")
@TableField("warehouse_id")
private String warehouseId;
/**
* 区域照片
*/
@ApiModelProperty(value="区域照片")
@TableField("photo")
private String photo;
@ApiModelProperty(value="")
@TableField("create_time")
private Date createTime;
@ApiModelProperty(value="")
@TableField("update_time")
private Date updateTime;
@ApiModelProperty(value="")
@TableField("create_user")
private String createUser;
@ApiModelProperty(value="")
private String updateUser;
@TableField("update_user")
private Date updateUser;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/entity/YearReport.java 0 → 100644
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-YearReport")
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_warehouse")
public class YearReport implements Serializable {
@TableField("id")
private String id;
@TableField("org_id_int")
private Integer orgIdInt;
@TableField("start_num")
private Integer startNum;
@TableField("end_num")
private Integer endNum;
@TableField("start_money")
private Integer startMoney;
@TableField("end_money")
private Integer endMoney;
@TableField("destruction_num")
private Integer destructionNum;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/exception/enums/PolicemanExceptionEnum.java 0 → 100644
package com.junmp.jyzb.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;
/**
* <pre>
*
* 描述：
* 版本：1.0.0
* 日期：2022/8/1 13:08
* 作者：ningzp@junmp.com.cn
* <br>修改记录
* <br>修改日期 修改人 修改内容
*
* </pre>
*/
@Getter
public enum PolicemanExceptionEnum implements IExceptionEnum {
/**
* 警员不存在
*/
POLICEMAN_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"警员不存在"),
;
/**
* 错误编码
*/
private final Integer code;
/**
* 提示用户信息
*/
private final String message;
PolicemanExceptionEnum(Integer code, String message) {
this.code = code;
this.message = message;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/exception/enums/PolicemanFingerExceptionEnum.java 0 → 100644
package com.junmp.jyzb.exception.enums;
import com.junmp.v2.common.constant.CommonConstant;
import com.junmp.v2.common.exception.IExceptionEnum;
import lombok.Getter;
@Getter
public enum PolicemanFingerExceptionEnum implements IExceptionEnum {
/**
* 警员指纹已存在
*/
POLICEMAN_FINGER_EXCEPTION_ENUM(CommonConstant.DEFAULT_USER_ERROR_CODE,"警员指纹信息已存在"),
;
/**
* 错误编码
*/
private final Integer code;
/**
* 提示用户信息
*/
private final String message;
PolicemanFingerExceptionEnum(Integer code, String message) {
this.code = code;
this.message = message;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/CabinetBoxMapper.java
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.domain.CabinetBox;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.entity.CabinetBox;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import java.util.Map;
@Mapper
public interface CabinetBoxMapper {
public interface CabinetBoxMapper extends BaseMapper<CabinetBox> {
List<Map<String, Object>> getBoxMsg(String id);
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/CabinetMapper.java
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.domain.Cabinet;
import com.junmp.jyzb.domain.Policeman;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.entity.Cabinet;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -9,7 +9,7 @@ import java.util.List;
import java.util.Map;
@Mapper
public interface CabinetMapper {
public interface CabinetMapper extends BaseMapper<Cabinet> {
public int addCabinet(Cabinet cabinet);
......
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 com.junmp.jyzb.entity.EquipmentSize;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
......
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 com.junmp.jyzb.entity.EquipmentType;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/ExpireMapper.java
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.domain.Inventory;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@Mapper
......
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.EquipmentSize;
import com.junmp.jyzb.entity.Inventory;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -10,7 +9,7 @@ import java.util.List;
import java.util.Map;
@Mapper
public interface InventoryMapper extends BaseMapper<Inventory> {
public interface InventoryMapper extends BaseMapper<Inventory> {
Map<String, Object> getSum(String queryType, String typeId);
Map<String, Object> getOrgNum(String typeId);
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/OrderMainMapper.java
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.domain.OrderMain;
import com.junmp.jyzb.entity.OrderMain;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PoliceFingerMapper.java
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.domain.PoliceFinger;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.entity.PoliceFinger;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
......@@ -8,7 +9,7 @@ import java.util.List;
import java.util.Map;
@Mapper
public interface PoliceFingerMapper {
public interface PoliceFingerMapper extends BaseMapper<PoliceFinger> {
List<Map<String, Object>> getFingersByUserId(String userId);
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PolicemanMapper.java
package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.domain.Policeman;
import com.junmp.jyzb.entity.Policeman;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PubOrgMapper.java
package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.domain.Policeman;
import com.junmp.jyzb.domain.PubOrg;
import com.junmp.jyzb.entity.PubOrg;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/ShelfMapper.java
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.domain.Shelf;
import com.junmp.jyzb.entity.Shelf;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/SupplierMapper.java
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.domain.Supplier;
import com.junmp.jyzb.domain.Warehouse;
import com.junmp.jyzb.entity.Supplier;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/WarehouseAreaMapper.java
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.domain.Shelf;
import com.junmp.jyzb.domain.WarehouseArea;
import com.junmp.jyzb.entity.Shelf;
import com.junmp.jyzb.entity.WarehouseArea;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/WarehouseMapper.java
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.domain.Policeman;
import com.junmp.jyzb.domain.Warehouse;
import com.junmp.jyzb.entity.Warehouse;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/CabinetBoxService.java
package com.junmp.jyzb.service;
import com.junmp.jyzb.utils.ResponseResult;
import java.util.List;
import java.util.Map;
public interface CabinetBoxService{
List<Map<String, Object>> getAllBoxMsg(String id);
ResponseResult getCabinetBoxInfo(Map<String, Object> msg);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/CabinetService.java
package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.beanReq.CabinetReq;
import com.junmp.jyzb.entity.Cabinet;
import com.junmp.jyzb.utils.ResponseResult;
import java.util.List;
import java.util.Map;
public interface CabinetService{
public interface CabinetService extends IService<Cabinet> {
ResponseResult addCabinet(Map<String, Object> msg);
......@@ -26,4 +29,32 @@ public interface CabinetService{
ResponseResult getCabinetDetail(Map<String, Object> msg);
ResponseResult setCabinetInventory(Map<String, Object> msg);
/**
* 添加单警柜
* @param req
* @return
*/
boolean addCabinet(CabinetReq req) throws Exception;
/**
* 删除单警柜
* @param req
* @return
*/
boolean deleteCabinet(CabinetReq req);
/**
* 查询单警柜信息
* @param req
* @return
*/
List<Cabinet> getAllCabinet(CabinetReq req,String includeLowerLevel);
/**
* 修改单警柜信息
* @param req
* @return
*/
boolean updateCabinet(CabinetReq req) throws Exception;
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/InventoryService.java
......@@ -25,4 +25,7 @@ public interface InventoryService extends IService<Inventory> {
ResponseResult getInventoryByOrgId(Map<String, Object> msg);
ResponseResult getInventoryDevelop();
ResponseResult InvertoryBindBox(Map<String, Object> msg);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/PoliceFingerService.java
package com.junmp.jyzb.service;
import com.junmp.jyzb.domain.PoliceFinger;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.jyzb.beanReq.PolicemanFingerReq;
import com.junmp.jyzb.entity.PoliceFinger;
import com.junmp.jyzb.entity.Product;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.v2.db.api.page.PageResult;
import java.util.List;
import java.util.Map;
public interface PoliceFingerService{
public interface PoliceFingerService extends IService<PoliceFinger> {
List<Map<String, Object>> getFingersByUserId(String userId);
/**
* 新增指纹信息
* @param req
* @return
*/
boolean addFingerInfo(PolicemanFingerReq req);
/**
* 更新指纹信息
* @param req
* @return
*/
boolean updateFingerInfo(PolicemanFingerReq req);
/**
* 查询指纹信息列表
* @param req
* @return
*/
List<PoliceFinger> searchFingerInfo(PolicemanFingerReq req);
/**
* 删除指纹信息
* @param req
* @return
*/
boolean deleteFinger(PolicemanFingerReq req);
/**
* 分页信息
* @param req
* @return
*/
PageResult<PoliceFinger> findPage(PolicemanFingerReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/PolicemanService.java
package com.junmp.jyzb.service;
import com.junmp.jyzb.domain.Policeman;
import com.junmp.jyzb.entity.PoliceFinger;
import com.junmp.jyzb.utils.ResponseResult;
import javax.naming.spi.ResolveResult;
import java.util.List;
import java.util.Map;
......@@ -23,6 +22,10 @@ public interface PolicemanService{
List<String> getAllPoliceIdByCabinet(Map<String, Object> cabinetId);
ResponseResult addFingerInfo(Map<String, Object> msg);
//修改指纹信息
boolean updateFingerInfo(PoliceFinger req);
//查询指纹信息
ResponseResult searchFingerInfo(Map<String, Object> msg);
ResponseResult addFaceInfo(Map<String, Object> msg);
......@@ -33,4 +36,11 @@ public interface PolicemanService{
ResponseResult getAllPoliceman(Map<String, Object> orgId);
ResponseResult getPoliceData(Map<String, Object> cabinetId);
ResponseResult updateFaceInfo(Map<String, Object> msg);
ResponseResult searchFaceInfo(Map<String, Object> msg);
//通过单警柜获取组织机构id,再获取组织机构下的所有警员信息
ResponseResult getOrgPoliceman(Map<String, Object> msg);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/PubOrgService.java
......@@ -6,7 +6,7 @@ import com.junmp.jyzb.utils.ResponseResult;
import java.util.List;
import java.util.Map;
import com.junmp.jyzb.domain.PubOrg;
import com.junmp.jyzb.entity.PubOrg;
public interface PubOrgService extends IService<PubOrg> {
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/CabinetBoxServiceImpl.java
package com.junmp.jyzb.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.junmp.jyzb.entity.CabinetBox;
import com.junmp.jyzb.mapper.CabinetBoxMapper;
import com.junmp.jyzb.mapper.PoliceFingerMapper;
import com.junmp.jyzb.service.CabinetBoxService;
import com.junmp.jyzb.utils.HttpStatus;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.jyzb.utils.ReturnMsg;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
@Service
public class CabinetBoxServiceImpl implements CabinetBoxService {
......@@ -19,4 +25,23 @@ public class CabinetBoxServiceImpl implements CabinetBoxService {
public List<Map<String, Object>> getAllBoxMsg(String id) {
return cabinetBoxMapper.getBoxMsg(id);
}
/**
* @author lxh
* @description 通过cabinetId获取箱门信息列表
* @since 2023/7/18 22:20
* @param
* @return
**/
@Override
public ResponseResult getCabinetBoxInfo(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("cabinetId"), "cabinetId不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
List<CabinetBox> cabinetBoxList = cabinetBoxMapper.selectList(new LambdaQueryWrapper<CabinetBox>()
.eq(CabinetBox::getCabinetId, msg.get("cabinetId")));
return new ResponseResult<>(HttpStatus.SUCCESS,"操作成功",cabinetBoxList);
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/CabinetServiceImpl.java
package com.junmp.jyzb.service.impl;
import com.junmp.jyzb.domain.Cabinet;
import com.junmp.jyzb.domain.CabinetBox;
import com.junmp.jyzb.domain.PubOrg;
import com.junmp.jyzb.mapper.CabinetBoxMapper;
import com.junmp.jyzb.mapper.PolicemanMapper;
import com.junmp.jyzb.mapper.PubOrgMapper;
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.beanReq.CabinetReq;
import com.junmp.jyzb.entity.Cabinet;
import com.junmp.jyzb.entity.CabinetBox;
import com.junmp.jyzb.mapper.*;
import com.junmp.jyzb.service.CabinetService;
import com.junmp.jyzb.service.PubOrgService;
import com.junmp.jyzb.utils.*;
import com.junmp.v2.common.util.BeanPlusUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import com.junmp.jyzb.mapper.CabinetMapper;
import java.util.*;
import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
@Service
public class CabinetServiceImpl implements CabinetService {
public class CabinetServiceImpl extends ServiceImpl<CabinetMapper, Cabinet> implements CabinetService {
@Resource
private RedisUtils redisUtils;
......@@ -60,13 +61,11 @@ public class CabinetServiceImpl implements CabinetService {
if (onePubOrg == null || onePubOrg.equals("")){
return new ResponseResult(HttpStatus.ERROR,ReturnMsg.ERROR,"该组织机构不存在");
}
//查询是否有重复的cabinetNum
Map<String, Object> hashCabinetNum = cabinetMapper.getCabinetByCabinetNum(cabinetNum);
if (hashCabinetNum!=null){
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,"主柜编号重复");
}
Cabinet cabinet =new Cabinet();
//将警员相关信息添加到警员表
//生成一个uuid
......@@ -80,11 +79,9 @@ public class CabinetServiceImpl implements CabinetService {
cabinet.setName((String) msg.get("name"));
//cabinet.setUpdateUser((String) msg.get("updateUser"));
cabinet.setLocation((String) msg.get("location"));
cabinet.setNum((Integer) msg.get("num"));
cabinet.setNum((String) msg.get("num"));
cabinet.setCabinetNum(cabinetNum);
cabinetMapper.addCabinet(cabinet);
/**
* 更新缓存
* */
......@@ -97,7 +94,6 @@ public class CabinetServiceImpl implements CabinetService {
//将查询结果存入 Redis 中
redisUtils.set(redisKey, cachedDataTrue);
}
//构建Redis缓存键
redisKey = REDIS_CABINET + "false" +'_'+ msg.get("orgId").toString();
// 从 Redis 中获取数据
......@@ -408,4 +404,95 @@ public class CabinetServiceImpl implements CabinetService {
cabinetMapper.setCabinetPriceInventory(id);
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
}
/**
* 添加单警柜
* @param req
* @return
*/
@Override
public boolean addCabinet(CabinetReq req) throws Exception {
Cabinet cabinet = new Cabinet();
//查询传日的组织机构id是否存在
Long onePubOrg = pubOrgMapper.getOnePubOrg(req.getOrgId());
if(onePubOrg == null || onePubOrg.equals("")){
throw new Exception("该组织机构不存在");
}
//查询是否有重复的单警柜编号
Map<String, Object> hashCabinetNum = cabinetMapper.getCabinetByCabinetNum(req.getCabinetNum());
if (hashCabinetNum!=null){
throw new Exception("单警柜编号重复");
}
BeanPlusUtil.copyProperties(req,cabinet);
String uuid = UUID.randomUUID().toString().replaceAll("-", "");
cabinet.setId(uuid);
cabinet.setCreateTime(DateTimeUtil.getCurrentDateTime());
cabinet.setUpdateTime(DateTimeUtil.getCurrentDateTime());
return this.save(cabinet);
}
/**
* 删除单警柜
* @param req
* @return
*/
@Override
public boolean deleteCabinet(CabinetReq req) {
this.removeById(req.getId());
return true;
}
/**
* 获取单警柜列表
* @param req
* @return
*/
@Override
public List<Cabinet> getAllCabinet(CabinetReq req,String includeLowerLevel) {
return null;
}
/**
* 修改单警柜信息
* @param req
* @return
*/
@Override
public boolean updateCabinet(CabinetReq req) throws Exception {
//查询传日的组织机构id是否存在
Long onePubOrg = pubOrgMapper.getOnePubOrg(req.getOrgId());
if(onePubOrg == null || onePubOrg.equals("")){
throw new Exception("该组织机构不存在");
}
//查询是否有重复的cabinetNum
Map<String, Object> hashCabinetNum = cabinetMapper.getCabinetByCabinetNum(req.getCabinetNum());
//判断policeCode是否有变动
String oldCabinetNum = cabinetMapper.getCabinetNumById(req.getId());
if (oldCabinetNum!=null && !oldCabinetNum.equals(req.getCabinetNum())){
if (hashCabinetNum!=null){
throw new Exception("主柜编号重复");
}
}
Cabinet cabinet =new Cabinet();
BeanPlusUtil.copyProperties(req,cabinet);
return this.updateById(cabinet);
}
//查询的各种条件信息
private LambdaQueryWrapper<Cabinet> createWrapper(CabinetReq req) {
LambdaQueryWrapper<Cabinet> wrapper = new LambdaQueryWrapper<>();
if (ObjectUtil.isEmpty(req)) {
return wrapper;
}
//单警柜id
wrapper.like(ObjectUtil.isNotEmpty(req.getId()), Cabinet::getId, req.getId());
//模糊查询
//机构id
wrapper.like(ObjectUtil.isNotEmpty(req.getOrgId()), Cabinet::getOrgId, req.getOrgId());
wrapper.orderByDesc(Cabinet::getUpdateTime);
return wrapper;
}
}
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.entity.EquipmentSize;
import com.junmp.jyzb.mapper.EquipmentTypeMapper;
import com.junmp.jyzb.service.EquipmentSizeService;
import com.junmp.jyzb.utils.DateTimeUtil;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java
package com.junmp.jyzb.service.impl;
import 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.entity.EquipmentType;
import com.junmp.jyzb.mapper.SupplierMapper;
import com.junmp.jyzb.service.EquipmentTypeService;
import com.junmp.jyzb.utils.*;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java
......@@ -7,16 +7,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.dto.InventoryDto;
import com.junmp.jyzb.api.bean.req.InventoryReq;
import com.junmp.jyzb.domain.EquipmentSize;
import com.junmp.jyzb.domain.EquipmentType;
import com.junmp.jyzb.entity.Inventory;
import com.junmp.jyzb.service.CabinetService;
import com.junmp.jyzb.service.InventoryService;
import com.junmp.jyzb.service.ProductService;
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 lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
......@@ -24,10 +22,7 @@ import javax.annotation.Resource;
import com.junmp.jyzb.mapper.InventoryMapper;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
......@@ -39,17 +34,15 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
private InventoryMapper inventoryMapper;
@Resource
private EquipmentTypeServiceImpl equipmentTypeService;
@Resource
private PubOrgServiceImpl PubOrgService;
@Resource
private EquipmentSizeServiceImpl equipmentSizeService;
@Resource
private WarehouseService warehouseService;
@Resource
private PubOrgServiceImpl PubOrgService;
@Resource
private CabinetService cabinetService;
@Override
public InventoryDto getInventoryDetail(InventoryReq req) {
......@@ -86,7 +79,7 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
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);
......@@ -113,7 +106,7 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
//检查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");
......@@ -121,9 +114,9 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
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); //计算装备数量
......@@ -190,11 +183,11 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
public ResponseResult setInventoryMsg(){
inventoryMapper.deleteAllMsg(); //清空数据库中已存在的信息
//inventoryMapper.setOrgInventory(); //放入组织机构信息汇总
inventoryMapper.setOrgInventory(); //放入组织机构信息汇�
inventoryMapper.setCabinetInventory(); //放入组织机构信息汇总
inventoryMapper.setCabinetInventory(); //放入组织机构信息汇�
inventoryMapper.setWarehouseInventory(); //放入组织机构信息汇总
inventoryMapper.setWarehouseInventory(); //放入组织机构信息汇�
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
}
......@@ -208,7 +201,7 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
}
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")){
......@@ -235,7 +228,7 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
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);
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,returnMsg);
......@@ -253,7 +246,7 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
String orgId = msg.get("orgId").toString();
List<Map<String,Object>> returnMsg = inventoryMapper.getInventoryByOrgId(orgId);
List<Map<String, Object>> returnMsg = inventoryMapper.getInventoryByOrgId(orgId);
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,returnMsg);
}
......@@ -261,6 +254,29 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
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表达式
......@@ -282,5 +298,4 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
wrapper.orderByDesc(Inventory::getUpdateTime);
return wrapper;
}
}
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderServiceImpl.java
package com.junmp.jyzb.service.impl;
import com.junmp.jyzb.domain.OrderMain;
import com.junmp.jyzb.entity.OrderMain;
import com.junmp.jyzb.mapper.OrderMainMapper;
import com.junmp.jyzb.service.OrderService;
import com.junmp.jyzb.utils.DateTimeUtil;
......@@ -50,7 +50,6 @@ public class OrderServiceImpl implements OrderService {
order.setProcessId((String) msg.get("processId"));
order.setBussinessType((String) msg.get("bussinessType"));
order.setOrderCode((String) msg.get("orderCode"));
order.setOrgId((String) msg.get("orgId"));
order.setInventoryQuantity((Integer) msg.get("inventoryQuantity"));
order.setManualState((Integer) msg.get("manualState"));
order.setOrderState((Integer) msg.get("orderState"));
......@@ -105,7 +104,6 @@ public class OrderServiceImpl implements OrderService {
order.setProcessId((String) msg.get("processId"));
order.setBussinessType((String) msg.get("bussinessType"));
order.setOrderCode((String) msg.get("orderCode"));
order.setOrgId((String) msg.get("orgId"));
order.setInventoryQuantity((Integer) msg.get("inventoryQuantity"));
order.setManualState((Integer) msg.get("manualState"));
order.setOrderState((Integer) msg.get("orderState"));
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PoliceFingerServiceImpl.java
package com.junmp.jyzb.service.impl;
import com.junmp.jyzb.domain.PoliceFinger;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
import com.junmp.jyzb.beanReq.PolicemanFingerReq;
import com.junmp.jyzb.entity.PoliceFinger;
import com.junmp.jyzb.entity.Product;
import com.junmp.jyzb.exception.enums.PolicemanFingerExceptionEnum;
import com.junmp.jyzb.mapper.ProductMapper;
import com.junmp.jyzb.service.PoliceFingerService;
import com.junmp.jyzb.utils.DateTimeUtil;
import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.util.BeanPlusUtil;
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 lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import com.junmp.jyzb.mapper.PoliceFingerMapper;
......@@ -10,7 +27,8 @@ import java.util.List;
import java.util.Map;
@Service
public class PoliceFingerServiceImpl implements PoliceFingerService {
@Slf4j
public class PoliceFingerServiceImpl extends ServiceImpl<PoliceFingerMapper, PoliceFinger> implements PoliceFingerService {
@Resource
private PoliceFingerMapper policeFingerMapper;
......@@ -19,4 +37,81 @@ public class PoliceFingerServiceImpl implements PoliceFingerService {
public List<Map<String, Object>> getFingersByUserId(String userId) {
return policeFingerMapper.getFingersByUserId(userId);
}
//新增指纹信息
@Override
public boolean addFingerInfo(PolicemanFingerReq req) {
PoliceFinger policeFinger = new PoliceFinger();
BeanPlusUtil.copyProperties(req, policeFinger);
//创建时间
policeFinger.setCreateTime(DateTimeUtil.getCurrentDateTime());
//更新时间
policeFinger.setUpdateTime(DateTimeUtil.getCurrentDateTime());
return this.save(policeFinger);
}
//修改指纹信息
@Override
public boolean updateFingerInfo(PolicemanFingerReq req) {
PoliceFinger policeFinger = this.queryPolicemanFinger(req);
BeanPlusUtil.copyProperties(req,policeFinger);
//更新时间
policeFinger.setUpdateTime(DateTimeUtil.getCurrentDateTime());
return this.updateById(policeFinger);
}
//查询指纹信息
@Override
public List<PoliceFinger> searchFingerInfo(PolicemanFingerReq req) {
LambdaQueryWrapper<PoliceFinger> wrapper = createWrapper(req);
return this.list(wrapper);
}
// 删除指纹信息
@Override
public boolean deleteFinger(PolicemanFingerReq req) {
this.removeById(req.getId());
return true;
}
/**
* 分页查询
* @param req
* @return
*/
@Override
public PageResult<PoliceFinger> findPage(PolicemanFingerReq req) {
LambdaQueryWrapper<PoliceFinger> wrapper = createWrapper(req);
Page<PoliceFinger> page = this.page(PageFactory.getDefaultPage(), wrapper);
return PageResultFactory.createPageResult(page);
}
//添加指纹时判断指纹是否存在，如果存在则抛出异常
//异常信息为：指纹信息已经存在
private PoliceFinger queryPolicemanFinger(PolicemanFingerReq req) {
PoliceFinger policeFinger = this.getById(req);
if (ObjectUtil.isNull(policeFinger)) {
throw new ServiceException(PolicemanFingerExceptionEnum.POLICEMAN_FINGER_EXCEPTION_ENUM);
}
return policeFinger;
}
//查询的各种条件信息
private LambdaQueryWrapper<PoliceFinger> createWrapper(PolicemanFingerReq req) {
LambdaQueryWrapper<PoliceFinger> wrapper = new LambdaQueryWrapper<>();
if (ObjectUtil.isEmpty(req)) {
return wrapper;
}
//根据业务编码查询
//警员id
wrapper.like(ObjectUtil.isNotEmpty(req.getPoliceId()), PoliceFinger::getPoliceId, req.getPoliceId());
//根据企业名称模糊查询
//指纹名称
wrapper.like(ObjectUtil.isNotEmpty(req.getName()), PoliceFinger::getName, req.getName());
//指纹信息
wrapper.like(ObjectUtil.isNotEmpty(req.getFingerInfo()), PoliceFinger::getFingerInfo, req.getFingerInfo());
wrapper.orderByDesc(PoliceFinger::getUpdateTime);
return wrapper;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
package com.junmp.jyzb.service.impl;
import com.junmp.jyzb.domain.PoliceFinger;
import com.junmp.jyzb.domain.PubOrg;
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.entity.Cabinet;
import com.junmp.jyzb.entity.PoliceFinger;
import com.junmp.jyzb.mapper.*;
import com.junmp.jyzb.service.PolicemanService;
import com.junmp.jyzb.service.PubOrgService;
import com.junmp.jyzb.utils.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import com.junmp.jyzb.domain.Policeman;
import com.junmp.jyzb.entity.Policeman;
import javax.annotation.Resource;
import java.util.*;
......@@ -17,7 +21,8 @@ import java.util.*;
import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
@Service
public class PolicemanServiceImpl implements PolicemanService {
@Slf4j
public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman> implements PolicemanService {
@Resource
private RedisUtils redisUtils;
......@@ -430,6 +435,59 @@ public class PolicemanServiceImpl implements PolicemanService {
return new ResponseResult(HttpStatus.SUCCESS,"操作成功");
}
/**
* @author lxh
* @description 更新警员的指纹信息
* @since 2023/7/18 14:21
* @param
* @return
**/
@Override
public boolean updateFingerInfo(PoliceFinger req) {
//警员id,name,指纹信息不能为空
// PoliceFinger policeFinger = this.queryProduct(req);
// BeanPlusUtil.copyProperties(req, policeFinger);
// return this.updateById(policeFinger);
// try {
// checkNotBlank(msg.get("policeId"), "policeId不能为空");
// checkNotBlank(msg.get("name"), "name不能为空");
// checkNotBlank(msg.get("fingerInfo"), "fingerInfo不能为空");
// } catch (IllegalArgumentException e) {
// return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
// }
// PoliceFinger policeFinger = new PoliceFinger();
// policeFinger.setId((Integer) msg.get("id"));
// policeFinger.setPoliceId((String) msg.get("policeId"));
// policeFinger.setUpdateTime(DateTimeUtil.getCurrentDateTime());
// policeFinger.setFingerInfo((String) msg.get("fingerInfo"));
// policeFinger.setName((String) msg.get("name"));
// policeFingerMapper.update(policeFinger, new LambdaQueryWrapper<PoliceFinger>()
// .eq(PoliceFinger::getId, msg.get("id")));
// return new ResponseResult(HttpStatus.SUCCESS,"操作成功");
return false;
}
/**
* @author lxh
* @description 查询警员的指纹信息
* @since 2023/7/18 14:21
* @param msg (fingerId)
* @return
**/
@Override
public ResponseResult searchFingerInfo(Map<String, Object> msg) {
//警员id不能为空
try {
checkNotBlank(msg.get("policeId"), "policeId不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
List<PoliceFinger> fingerList = policeFingerMapper.selectList(new LambdaQueryWrapper<PoliceFinger>()
.eq(PoliceFinger::getPoliceId, msg.get("policeId")));
return new ResponseResult(HttpStatus.SUCCESS,"操作成功",fingerList);
}
@Override
public ResponseResult addFaceInfo(Map<String, Object> msg) {
try {
......@@ -438,7 +496,6 @@ public class PolicemanServiceImpl implements PolicemanService {
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
Date currentDate = DateTimeUtil.getCurrentDateTime();
Policeman police =new Policeman();
police.setId(msg.get("policeId").toString());
......@@ -635,4 +692,70 @@ public class PolicemanServiceImpl implements PolicemanService {
redisUtils.set(redisKey, allMsg);
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,allMsg);
}
/**
* @author lxh
* @description 更新人脸信息\删除人脸信息
* @since 2023/7/18 15:02
* @param
* @return
**/
@Override
public ResponseResult updateFaceInfo(Map<String, Object> msg) {
try{
checkNotBlank(msg.get("policeId"),"policeId不能为空");
}catch (IllegalArgumentException e){
return new ResponseResult(HttpStatus.ERROR,ReturnMsg.ERROR,e.getMessage());
}
Policeman police =new Policeman();
police.setId(msg.get("policeId").toString());
police.setFaceInfo(msg.get("faceInfo").toString());
police.setUpdateTime(DateTimeUtil.getCurrentDateTime());
policemanMapper.updatePolice(police);
return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS);
}
/**
* @author lxh
* @description 查询人脸信息
* @since 2023/7/18 15:02
* @param
* @return
**/
@Override
public ResponseResult searchFaceInfo(Map<String, Object> msg) {
//警员id不能为空
try {
checkNotBlank(msg.get("policeId"), "policeId不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
Policeman policeman = policemanMapper.selectOne(new LambdaQueryWrapper<Policeman>()
.eq(Policeman::getId, msg.get("policeId")));
return new ResponseResult(HttpStatus.SUCCESS,"操作成功",policeman);
}
//通过单警柜获取组织机构id,再获取组织机构下的所有警员信息
@Override
public ResponseResult getOrgPoliceman(Map<String, Object> msg) {
try {
checkNotBlank(msg.get("cabinetId"), "cabinetId不能为空");
} catch (IllegalArgumentException e) {
return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
}
//通过警柜id获取组织机构id
Cabinet cabinet = cabinetMapper.selectOne(new LambdaQueryWrapper<Cabinet>()
.eq(Cabinet::getId, msg.get("cabinetId")));
if (ObjectUtil.isNull(cabinet)){
return new ResponseResult(HttpStatus.ERROR,ReturnMsg.NO_DATA,ReturnData.NO_DATA);
}
long orgId = cabinet.getOrgId();
//通过机构id获取机构下所有的警员信息
List<Policeman> policemenList = policemanMapper.selectList(new LambdaQueryWrapper<Policeman>()
.eq(Policeman::getOrgId, orgId));
return new ResponseResult<>(HttpStatus.SUCCESS,"操作成功",policemenList);
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/SupplierServiceImpl.java
package com.junmp.jyzb.service.impl;
import com.junmp.jyzb.domain.Policeman;
import com.junmp.jyzb.domain.Supplier;
import com.junmp.jyzb.entity.Supplier;
import com.junmp.jyzb.service.SupplierService;
import com.junmp.jyzb.utils.*;
import org.springframework.stereotype.Service;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/WarehouseServiceImpl.java
package com.junmp.jyzb.service.impl;
import com.junmp.jyzb.domain.*;
import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.mapper.*;
import com.junmp.jyzb.service.PolicemanService;
import com.junmp.jyzb.service.PubOrgService;
......
jyzb-biz/src/main/java/com/junmp/jyzb/utils/ObjectToMap.java
package com.junmp.jyzb.utils;
import com.junmp.jyzb.domain.Policeman;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.Map;
......
jyzb-biz/src/main/resources/mapper/CabinetBoxMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.CabinetBoxMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.CabinetBox">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.CabinetBox">
<!--@mbg.generated-->
<!--@Table base_cabinet_box-->
<id column="id" jdbcType="VARCHAR" property="id" />
......
jyzb-biz/src/main/resources/mapper/CabinetMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.CabinetMapper">
<resultMap id="BaseCabinetResultMap" type="com.junmp.jyzb.entity.Cabinet">
<id property="id" column="id" />
<result property="cabinetNum" column="cabinet_num" />
<result property="name" column="name" />
<result property="orgIdInt" column="org_id_int" />
<result property="orgId" column="org_id" />
<result property="departmentId" column="department_id" />
<result property="location" column="location" />
<result property="state" column="state" />
<result property="sum" column="sum" />
<result property="inSum" column="in_sum" />
<result property="outSum" column="out_sum" />
<result property="priceTotal" column="price_total" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="createUser" column="create_user" />
<result property="updateUser" column="update_user" />
<result property="num" column="num" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
......@@ -8,7 +28,7 @@
create_user, update_user
</sql>
<insert id="addCabinet" parameterType="com.junmp.jyzb.domain.Warehouse">
<insert id="addCabinet" parameterType="com.junmp.jyzb.entity.Warehouse">
insert into base_cabinet
(id,cabinet_num,name,org_id,location,state,num,create_time,update_time)
values
......@@ -116,7 +136,7 @@
SET sum = (
SELECT count(i.id)
FROM base_cabinet_box AS b
JOIN base_inventory AS i ON b.id = i.location_id
JOIN base_AS i ON b.id = i.location_id
WHERE b.cabinet_id = c.id
)
<if test="updateId != null and updateId != ''">
......
jyzb-biz/src/main/resources/mapper/EquipmentSizeMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.EquipmentSizeMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.EquipmentSize">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.EquipmentSize">
<!--@mbg.generated-->
<!--@Table base_equipment_size-->
<id column="id" jdbcType="VARCHAR" property="id" />
......@@ -19,7 +19,7 @@
id, type_id, detail_id, code, `name`, create_time, update_time, note, epc_type
</sql>
<insert id="addSize" parameterType="com.junmp.jyzb.domain.EquipmentSize">
<insert id="addSize" parameterType="com.junmp.jyzb.entity.EquipmentSize">
insert into base_equipment_size
(id,type_id,code,name,create_time,update_time,note,price,state,epc_type)
values
......
jyzb-biz/src/main/resources/mapper/EquipmentTypeMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.EquipmentTypeMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.EquipmentType">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.EquipmentType">
<!--@mbg.generated-->
<!--@Table base_equipment_type-->
<id column="id" jdbcType="VARCHAR" property="id" />
......@@ -18,7 +18,7 @@
id, `name`, code, parent_id, create_time, update_time, `state`, note
</sql>
<select id="selectAllEquipment" resultType="com.junmp.jyzb.domain.EquipmentType">
<select id="selectAllEquipment" resultType="com.junmp.jyzb.entity.EquipmentType">
SELECT id,name,unit,unit_type,code,parent_id,state,note,code,create_time,update_time,type
FROM base_equipment_type
where type = 0
......@@ -47,7 +47,7 @@
<!-- END AS update_time-->
<!-- FROM base_equipment_type-->
<insert id="addEquipment" parameterType="com.junmp.jyzb.domain.EquipmentType">
<insert id="addEquipment" parameterType="com.junmp.jyzb.entity.EquipmentType">
insert into base_equipment_type
(id,name,unit_type,code,parent_id,create_time,update_time,state,note)
values
......@@ -100,7 +100,7 @@
where parent_id = #{parentId}
</select>
<insert id="addSupplier" parameterType="com.junmp.jyzb.domain.EquipmentType">
<insert id="addSupplier" parameterType="com.junmp.jyzb.entity.EquipmentType">
INSERT INTO base_supplier_type (id,supplier_id,type_id,state,create_time,update_time)
VALUES
<foreach collection="supplierList" item="supplier" separator=",">
......
jyzb-biz/src/main/resources/mapper/ExpireMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.ExpireMapper">
<!-- <resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.Inventory">-->
<!-- <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.Inventory">-->
<!-- &lt;!&ndash;@mbg.generated&ndash;&gt;-->
<!-- &lt;!&ndash;@Table base_equipment_size&ndash;&gt;-->
<!-- <id column="id" jdbcType="VARCHAR" property="id" />-->
......
jyzb-biz/src/main/resources/mapper/HistoryMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.HistoryMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.History">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.History">
<!--@mbg.generated-->
<!--@Table base_history-->
<id column="id" jdbcType="VARCHAR" property="id" />
......
jyzb-biz/src/main/resources/mapper/InventoryMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.InventoryMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.Inventory">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.Inventory">
<!--@mbg.generated-->
<!--@Table base_inventory-->
<id column="id" jdbcType="VARCHAR" property="id" />
......@@ -227,11 +227,12 @@ join base_supplier s on s.id = i.supplier_id
and size_id = #{sizeId}
</select>
<select id="getInventoryByOrgId" resultType="Map">
select
*
from base_inventory i
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/InventorySummaryMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.InventorySummaryMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.InventorySummary">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.InventorySummary">
<!--@mbg.generated-->
<!--@Table base_inventory_summary-->
<id column="id" jdbcType="VARCHAR" property="id" />
......
jyzb-biz/src/main/resources/mapper/LogDetailMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.LogDetailMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.LogDetail">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.LogDetail">
<!--@mbg.generated-->
<!--@Table base_log_detail-->
<id column="id" jdbcType="INTEGER" property="id" />
......
jyzb-biz/src/main/resources/mapper/LogSummaryMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.LogSummaryMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.LogSummary">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.LogSummary">
<!--@mbg.generated-->
<!--@Table base_log_summary-->
<id column="id" jdbcType="INTEGER" property="id" />
......
jyzb-biz/src/main/resources/mapper/OrderMainMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.OrderMainMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.OrderMain">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.OrderMain">
<!--@mbg.generated-->
<!--@Table bussiness_order_main-->
<id column="id" jdbcType="BIGINT" property="id" />
......@@ -29,7 +29,7 @@
inv_list, create_time, update_time, create_user, update_user
</sql>
<insert id="addOrder" parameterType="com.junmp.jyzb.domain.OrderMain" useGeneratedKeys="true" keyProperty="id">
<insert id="addOrder" parameterType="com.junmp.jyzb.entity.OrderMain" useGeneratedKeys="true" keyProperty="id">
insert into business_order_main
(order_type,process_id,bussiness_type,order_code,org_id,inventory_quantity,manual_state,order_state,attachment_location,inv_list,create_time,update_time)
values
......
jyzb-biz/src/main/resources/mapper/PackageInformationMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.PackageInformationMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.PackageInformation">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.PackageInformation">
<!--@mbg.generated-->
<!--@Table base_package_information-->
<id column="id" jdbcType="VARCHAR" property="id" />
......
jyzb-biz/src/main/resources/mapper/PackageMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.PackageMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.Package">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.Package">
<!--@mbg.generated-->
<!--@Table base_package-->
<id column="id" jdbcType="VARCHAR" property="id" />
<result column="count" jdbcType="INTEGER" property="count" />
<result column="org_id" jdbcType="VARCHAR" property="orgId" />
<result column="org_id_int" jdbcType="VARCHAR" property="orgId" />
<result column="location" jdbcType="VARCHAR" property="location" />
<result column="shelf_id" jdbcType="VARCHAR" property="shelfId" />
<result column="shelf_name" jdbcType="VARCHAR" property="shelfName" />
......
jyzb-biz/src/main/resources/mapper/PolicemanMapper.xml
......@@ -21,7 +21,7 @@
<!-- </collection>-->
<!--</resultMap>-->
<insert id="addPoliceman" parameterType="com.junmp.jyzb.domain.Policeman">
<insert id="addPoliceman" parameterType="com.junmp.jyzb.entity.Policeman">
insert into base_policeman
(id,org_id_int,name,police_code,sex,
cabinet_box_id,phone,id_card,photo,create_time,update_time)
......@@ -141,7 +141,7 @@
where cabinet_box_id=#{boxId}
</select>
<update id="addFaceInfo" parameterType="com.junmp.jyzb.domain.Policeman">
<update id="addFaceInfo" parameterType="com.junmp.jyzb.entity.Policeman">
update base_policeman p
set face_info=#{faceInfo},update_time=#{updateTime}
where p.id=#{id}
......
jyzb-biz/src/main/resources/mapper/PubOrgMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.PubOrgMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.PubOrg">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.PubOrg">
<!--@mbg.generated-->
<!--@Table pub_org-->
<id column="org_id" jdbcType="BIGINT" property="orgId" />
......@@ -31,7 +31,7 @@
update_time, update_user, guid
</sql>
<select id="selectAllOrg" resultType="com.junmp.jyzb.domain.PubOrg">
<select id="selectAllOrg" resultType="com.junmp.jyzb.entity.PubOrg">
SELECT
IFNULL(org_id, 'null') as orgId,
IFNULL(org_parent_id, 'null') as orgParentId,
......@@ -45,7 +45,7 @@ WHERE
del_flag = 1;
</select>
<select id="showAllPubOrgList" resultType="com.junmp.jyzb.domain.PubOrg">
<select id="showAllPubOrgList" resultType="com.junmp.jyzb.entity.PubOrg">
SELECT org_id,
IFNULL(org_id, 'null') as orgId,
IFNULL(org_parent_id, 'null') as orgParentId,
......
jyzb-biz/src/main/resources/mapper/ShelfMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.ShelfMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.Shelf">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.Shelf">
<!--@mbg.generated-->
<!--@Table base_shelf-->
<id column="shelf_id" jdbcType="VARCHAR" property="shelfId" />
......@@ -25,7 +25,7 @@
url, size_info, create_time, update_time, create_user, update_user
</sql>
<insert id="addShelf" parameterType="com.junmp.jyzb.domain.Shelf">
<insert id="addShelf" parameterType="com.junmp.jyzb.entity.Shelf">
insert into base_shelf
(shelf_id,shelf_name,code,type,warehouse_id,shelf_rows,shelf_columns,shelf_ranges,url,size_info,create_time,update_time)
values
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论