库存管理基础

gly-base-core/src/main/java/cn/com/taiji/core/entity/invw/InvwQryCardBatch.java

@@ -0,0 +1,84 @@
+package cn.com.taiji.core.entity.invw;
+
+import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+import java.time.LocalDateTime;
+
+/** 卡片发行批次 */
+@Getter
+@Setter
+@Entity
+@Table(name = "INVW_QRY_CARD_BATCH")
+public class InvwQryCardBatch extends StringPropertyUUIDEntity {
+    /** 单号数据的结果集 */
+    @Column(name = "DATAS")
+    private String datas;
+
+    /** 批次号 */
+    @Column(name = "BATCH_NO")
+    private String batchNo;
+
+    /** 批次申请日期 */
+    @Column(name = "BATCH_DATE")
+    private String batchDate;
+
+    /** 卡片类型 */
+    @Column(name = "CARD_TYPE")
+    private String cardType;
+
+    /** 卡片起始号 */
+    @Column(name = "START_NUM")
+    private String startNum;
+
+    /** 卡片结束号 */
+    @Column(name = "END_NUM")
+    private String endNum;
+
+    /** 批次总张数 */
+    @Column(name = "TOTAL_COUNT")
+    private String totalCount;
+
+    /** 申请状态
+     * APP-申请中
+     * ISSUEING-发行中
+     * DONE-发行完成
+     * PERMIT-审批完成[数据就绪]
+     * REJECT-拒绝
+     * JUDGEING-审批中
+     * REJNOTRDY-驳回，待修正
+     * FAIL-失败
+     * APPROVAL-审批通过[待预制]
+     * PRECUT-预制数据中
+     * */
+    @Column(name = "STATUS")
+    private String status;
+
+    /** 卡片版本号 */
+    @Column(name = "CARD_VERSION")
+    private Integer cardVersion;
+
+    /** 设备类型
+     * CARD-卡
+     * SCOBU-单片OBU
+     * */
+    @Column(name = "SE_TYPE")
+    private String seType;
+
+    /** 发行方代码
+     * 01-贵州工行
+     * 02-黔通智联
+     * 03-贵州建行
+     * */
+    @Column(name = "ORG_ID")
+    private String orgId;
+
+    /** 渠道 */
+    @Column(name = "CHANEL")
+    private String chanel;
+
+    /** 入库时间*/
+    @Column(name = "INSERT_TIME")
+    private LocalDateTime insertTime;
+}

gly-base-core/src/main/java/cn/com/taiji/core/entity/invw/InvwQryCards.java

@@ -0,0 +1,73 @@
+package cn.com.taiji.core.entity.invw;
+
+import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+import java.time.LocalDateTime;
+
+/** 卡片一发 */
+@Getter
+@Setter
+@Entity
+@Table(name = "INVW_QRY_CARDS")
+public class InvwQryCards extends StringPropertyUUIDEntity {
+    /** 单号数据的结果集 */
+    @Column(name = "DATAS")
+    private String datas;
+
+    /** 批次号 */
+    @Column(name = "BATCH_NO")
+    private String batchNo;
+
+    /** 卡号 */
+    @Column(name = "CARD_NO")
+    private String cardNo;
+
+    /** 卡片厂商 */
+    @Column(name = "PROVIDER")
+    private String provider;
+
+    /** 卡片类型 */
+    @Column(name = "CARD_TYPE")
+    private String cardType;
+
+    /** 发行状态
+     * 0-流通中
+     * 2-一发成功
+     * */
+    @Column(name = "STATUS")
+    private Integer status;
+
+    /** 格式化日期 一发日期*/
+    @Column(name = "FORMAT_TIME")
+    private String formatTime;
+
+    /** 最后修改日期 二发/客服日期*/
+    @Column(name = "LAST_UPDATE_TIME")
+    private String lastUpdateTime;
+
+    /** 卡片SNR */
+    @Column(name = "CARD_SNR")
+    private String cardSnr;
+
+    /** 发行次数 */
+    @Column(name = "ISSUE_COUNT")
+    private Integer issueCount;
+
+    /** 渠道 */
+    @Column(name = "CHANEL")
+    private String chanel;
+
+    /** 渠道ID */
+    @Column(name = "CHANEL_ID")
+    private String chanelId;
+
+    /** 卡片厂商代码 */
+    @Column(name = "PROVIDER_ID")
+    private String providerID;
+
+    /** 入库时间*/
+    @Column(name = "INSERT_TIME")
+    private LocalDateTime insertTime;
+}

gly-base-core/src/main/java/cn/com/taiji/core/entity/invw/InvwQryObuBatch.java

@@ -0,0 +1,61 @@
+package cn.com.taiji.core.entity.invw;
+
+import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+import java.time.LocalDateTime;
+
+/** OBU发行批次 */
+@Getter
+@Setter
+@Entity
+@Table(name = "INVW_QRY_OBU_BATCH")
+public class InvwQryObuBatch extends StringPropertyUUIDEntity {
+    /** 单号数据的结果集 */
+    @Column(name = "DATAS")
+    private String datas;
+
+    /** 批次号 */
+    @Column(name = "BATCH_NO")
+    private String batchNo;
+
+    /** 批次申请日期 */
+    @Column(name = "APPLY_DATE")
+    private String applyDate;
+
+    /** OBU类型
+     * 0-单片OBU
+     * 非0-双片OBU
+     * */
+    @Column(name = "OBU_TYPE")
+    private String obuType;
+
+    /** OBU起始号 */
+    @Column(name = "START_NUM")
+    private String startNum;
+
+    /** OBU结束号 */
+    @Column(name = "END_NUM")
+    private String endNum;
+
+    /** 卡片起始号 */
+    @Column(name = "START_CARD_NUM")
+    private String startCardNum;
+
+    /** 卡片结束号 */
+    @Column(name = "END_CARD_NUM")
+    private String endCardNum;
+
+    /** 批次总张数 */
+    @Column(name = "TOTAL_COUNT")
+    private String totalCount;
+
+    /** 渠道名称 */
+    @Column(name = "CHANEL")
+    private String chanel;
+
+    /** 入库时间*/
+    @Column(name = "INSERT_TIME")
+    private LocalDateTime insertTime;
+}

gly-base-core/src/main/java/cn/com/taiji/core/entity/invw/InvwQryObus.java

@@ -0,0 +1,85 @@
+package cn.com.taiji.core.entity.invw;
+
+import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+import java.time.LocalDateTime;
+
+/** OBU一次发行明细 */
+@Getter
+@Setter
+@Entity
+@Table(name = "INVW_QRY_OBUS")
+public class InvwQryObus extends StringPropertyUUIDEntity {
+    /** 单号数据的结果集 */
+    @Column(name = "DATAS")
+    private String datas;
+
+    /** 批次号 */
+    @Column(name = "BATCH_NO")
+    private String batchNo;
+
+    /** 合同序列号 */
+    @Column(name = "SERIAL_NO")
+    private String serialNo;
+
+    /** 卡号 */
+    @Column(name = "CARD_NO")
+    private String cardNo;
+
+    /** 卡片类型
+     * 03-应急卡
+     * 22-储值卡
+     * 23-记账卡
+     */
+    @Column(name = "CARD_TYPE")
+    private String cardType;
+
+    /** 卡片厂商 */
+    @Column(name = "PROVIDER")
+    private String provider;
+
+    /** 卡片厂商代码 */
+    @Column(name = "PROVIDER_ID")
+    private String providerId;
+
+    /** 激活日期 */
+    @Column(name = "ACTIVE_DATE")
+    private String activeDate;
+
+    /** 发行状态
+     * 0-流通中
+     * 2-一发成功
+     * */
+    @Column(name = "STATUS")
+    private Integer status;
+
+    /** 格式化日期 一发日期*/
+    @Column(name = "FORMAT_TIME")
+    private String formatTime;
+
+    /** 最后修改日期 二发/客服日期*/
+    @Column(name = "LAST_UPDATE_TIME")
+    private String lastUpdateTime;
+
+    /** OBU 物理号 */
+    @Column(name = "OBU_MAC")
+    private String obuMac;
+
+    /** 卡片SNR */
+    @Column(name = "CARD_SNR")
+    private String cardSnr;
+
+    /** 渠道 */
+    @Column(name = "CHANEL")
+    private String chanel;
+
+    /** 渠道ID */
+    @Column(name = "CHANEL_ID")
+    private String chanelId;
+
+    /** 入库时间*/
+    @Column(name = "INSERT_TIME")
+    private LocalDateTime insertTime;
+}

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/invw/InvwQryCardBatchRepo.java

@@ -0,0 +1,8 @@
+package cn.com.taiji.core.repo.jpa.invw;
+
+import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
+import cn.com.taiji.core.entity.invw.InvwQryCardBatch;
+
+public interface InvwQryCardBatchRepo extends AbstractJpaRepo<InvwQryCardBatch, String>{
+
+}

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/invw/InvwQryCardsRepo.java

@@ -0,0 +1,8 @@
+package cn.com.taiji.core.repo.jpa.invw;
+
+import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
+import cn.com.taiji.core.entity.invw.InvwQryCards;
+
+public interface InvwQryCardsRepo extends AbstractJpaRepo<InvwQryCards, String>{
+
+}

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/invw/InvwQryObuBatchRepo.java

@@ -0,0 +1,8 @@
+package cn.com.taiji.core.repo.jpa.invw;
+
+import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
+import cn.com.taiji.core.entity.invw.InvwQryObuBatch;
+
+public interface InvwQryObuBatchRepo extends AbstractJpaRepo<InvwQryObuBatch, String>{
+
+}

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/invw/InvwQryObusRepo.java

@@ -0,0 +1,8 @@
+package cn.com.taiji.core.repo.jpa.invw;
+
+import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
+import cn.com.taiji.core.entity.invw.InvwQryObus;
+
+public interface InvwQryObusRepo extends AbstractJpaRepo<InvwQryObus, String>{
+
+}

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/invw/InvwQryCardBatchPageRequest.java

@@ -0,0 +1,41 @@
+package cn.com.taiji.core.repo.request.invw;
+
+import cn.com.taiji.common.pub.StringTools;
+import cn.com.taiji.common.pub.dao.HqlBuilder;
+import cn.com.taiji.common.repo.request.jpa.JpaDateTimePageableDataRequest;
+import cn.com.taiji.core.entity.invw.InvwQryCardBatch;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class InvwQryCardBatchPageRequest extends JpaDateTimePageableDataRequest<InvwQryCardBatch> {
+
+	private String batchNo;                // 批次号
+	private String providerID;             // 卡片厂商代码
+	private String version;                // 卡片版本号
+	private String cardType;               // 卡片类型
+	private String batchDateStart;         // 申请时间开始
+	private String batchDateEnd;           // 申请时间结束
+
+	public InvwQryCardBatchPageRequest() {
+		this.orderBy = "insertTime";
+		this.desc = true;
+	}
+
+	@Override
+	public HqlBuilder toSelectHql() {
+		HqlBuilder hql = new HqlBuilder("from InvwQryCardBatch where 1=1 ");
+		hql.append(" and batchNo=:batchNo", batchNo);
+		hql.append(" and version=:version", version);
+		hql.append(" and cardType=:cardType", cardType);
+		if (StringTools.hasText(batchDateStart)) {
+			hql.append(" and batchDate >= :batchDateStart", batchDateStart);
+		}
+		if (StringTools.hasText(batchDateEnd)) {
+			hql.append(" and batchDate <= :batchDateEnd", batchDateEnd);
+		}
+		hql.append(" and providerID=:providerID", providerID);
+		return hql;
+	}
+}

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/invw/InvwQryCardsPageRequest.java

@@ -0,0 +1,47 @@
+package cn.com.taiji.core.repo.request.invw;
+
+import cn.com.taiji.common.pub.StringTools;
+import cn.com.taiji.common.pub.dao.HqlBuilder;
+import cn.com.taiji.common.repo.request.jpa.JpaDateTimePageableDataRequest;
+import cn.com.taiji.core.entity.invw.InvwQryCards;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class InvwQryCardsPageRequest extends JpaDateTimePageableDataRequest<InvwQryCards> {
+
+    private String batchNo;        // 批次号
+    private String cardNo;         // 卡号
+    private String startCardNo;    // 起始卡号
+    private String endCardNo;      // 结束卡号
+    private String providerID;     // 厂商代码
+    private String version;        // 卡片版本号
+    private String cardType;       // 卡片类型
+    private Integer status;        // 发行状态
+//    private String formatTimeStart;     // 格式化日期
+//    private String formatTimeEnd;       // 格式化日期
+
+    public InvwQryCardsPageRequest() {
+        this.orderBy = "insertTime";
+        this.desc = true;
+    }
+
+    @Override
+    public HqlBuilder toSelectHql() {
+        HqlBuilder hql = new HqlBuilder("from InvwQryCards where 1=1 ");
+        hql.append(" and batchNo=:batchNo", batchNo);
+        hql.append(" and cardNo=:cardNo", cardNo);
+        hql.append(" and startCardNo=:startCardNo", startCardNo);
+        hql.append(" and endCardNo=:endCardNo", endCardNo);
+        hql.append(" and providerID=:providerID", providerID);
+        hql.append(" and version=:version", version);
+        hql.append(" and cardType=:cardType", cardType);
+        hql.append(" and status=:status", status);
+//        if(StringTools.hasText(formatTimeStart))
+//            hql.append(" and formatTime>=:formatTimeStart", formatTimeStart);
+//        if(StringTools.hasText(formatTimeEnd))
+//            hql.append(" and formatTime<=:formatTimeEnd", formatTimeEnd);
+        return hql;
+    }
+}

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/invw/InvwQryObuBatchPageRequest.java

@@ -0,0 +1,39 @@
+package cn.com.taiji.core.repo.request.invw;
+
+import cn.com.taiji.common.pub.StringTools;
+import cn.com.taiji.common.pub.dao.HqlBuilder;
+import cn.com.taiji.common.repo.request.jpa.JpaDateTimePageableDataRequest;
+import cn.com.taiji.core.entity.invw.InvwQryObuBatch;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class InvwQryObuBatchPageRequest extends JpaDateTimePageableDataRequest<InvwQryObuBatch> {
+
+    private String batchNo;             // 批次号
+    private String providerID;          // 厂商代码
+    private String version;             // 版本号
+    private String obuType;             // OBU类型
+    private String applyDateStart; 		// 申请时间开始
+    private String applyDateEnd;   		// 申请时间结束
+
+    public InvwQryObuBatchPageRequest() {
+        this.orderBy = "insertTime";
+        this.desc = true;
+    }
+
+    @Override
+    public HqlBuilder toSelectHql() {
+        HqlBuilder hql = new HqlBuilder("from InvwQryObuBatch where 1=1 ");
+        hql.append(" and batchNo=:batchNo", batchNo);
+        hql.append(" and version=:version", version);
+        hql.append(" and obuType=:obuType", obuType);
+        if (StringTools.hasText(applyDateStart))
+            hql.append(" and applyDate>=:applyDateStart", applyDateStart);
+        if (StringTools.hasText(applyDateEnd))
+            hql.append(" and applyDate<=:applyDateEnd", applyDateEnd);
+        hql.append(" and providerID=:providerID", providerID);
+        return hql;
+    }
+}

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/invw/InvwQryObusPageRequest.java

@@ -0,0 +1,43 @@
+package cn.com.taiji.core.repo.request.invw;
+
+import cn.com.taiji.common.pub.dao.HqlBuilder;
+import cn.com.taiji.common.repo.request.jpa.JpaDateTimePageableDataRequest;
+import cn.com.taiji.core.entity.invw.InvwQryObus;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class InvwQryObusPageRequest extends JpaDateTimePageableDataRequest<InvwQryObus> {
+
+    private String batchNo;        // 批次号
+    private String serialNo;       // OBU合同序列号
+    private String providerID;     // 卡片厂商代码
+    private String startSerialNo;  // 起始OBU合同序列号
+    private String endSerialNo;    // 结束OBU合同序列号
+    private Integer status;        // 发行状态
+//    private String formatTimeStart;     // 格式化日期
+//    private String formatTimeEnd;       // 格式化日期
+
+
+    public InvwQryObusPageRequest() {
+        this.orderBy = "insertTime";
+        this.desc = true;
+    }
+
+    @Override
+    public HqlBuilder toSelectHql() {
+        HqlBuilder hql = new HqlBuilder("from InvwQryObus where 1=1 ");
+        hql.append(" and batchNo=:batchNo", batchNo);
+        hql.append(" and serialNo=:serialNo", serialNo);
+        hql.append(" and startSerialNo=:startSerialNo", startSerialNo);
+        hql.append(" and endSerialNo=:endSerialNo", endSerialNo);
+        hql.append(" and status=:status", status);
+        hql.append(" and providerID=:providerID", providerID);
+//        if(StringTools.hasText(formatTimeStart))
+//            hql.append(" and formatTime>=:formatTimeStart", formatTimeStart);
+//        if(StringTools.hasText(formatTimeEnd))
+//            hql.append(" and formatTime<=:formatTimeEnd", formatTimeEnd);
+        return hql;
+    }
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/comm/InvwQryCardBatchController.java

@@ -0,0 +1,31 @@
+package cn.com.taiji.invw.api.comm;
+
+import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.common.web.ApiResponse;
+import cn.com.taiji.invw.api.MyValidController;
+import cn.com.taiji.invw.dto.comm.InvwQryCardBatchDTO;
+import cn.com.taiji.invw.manager.comm.InvwQryCardBatchManager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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.validation.Valid;
+
+@Api(tags = {"001-卡片发行批次"})
+@RestController
+@RequestMapping("/api/cardBatch")
+public class InvwQryCardBatchController extends MyValidController {
+
+    @Autowired
+    private InvwQryCardBatchManager manager;
+
+    @ApiOperation(value = "01-卡片发行批次分页")
+    @PostMapping("/page")
+    public ApiResponse<Pagination> page(@Valid @RequestBody InvwQryCardBatchDTO req) {
+        return ApiResponse.of(manager.page(req));
+    }
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/comm/InvwQryCardsController.java

@@ -0,0 +1,31 @@
+package cn.com.taiji.invw.api.comm;
+
+import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.common.web.ApiResponse;
+import cn.com.taiji.invw.api.MyValidController;
+import cn.com.taiji.invw.dto.comm.InvwQryCardsDTO;
+import cn.com.taiji.invw.manager.comm.InvwQryCardsManager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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.validation.Valid;
+
+@Api(tags = {"002-卡片一发"})
+@RestController
+@RequestMapping("/api/cards")
+public class InvwQryCardsController extends MyValidController {
+
+    @Autowired
+    private InvwQryCardsManager manager;
+
+    @ApiOperation(value = "01-卡片发行分页")
+    @PostMapping("/page")
+    public ApiResponse<Pagination> page(@Valid @RequestBody InvwQryCardsDTO req) {
+        return ApiResponse.of(manager.page(req));
+    }
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/comm/InvwQryObuBatchController.java

@@ -0,0 +1,31 @@
+package cn.com.taiji.invw.api.comm;
+
+import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.common.web.ApiResponse;
+import cn.com.taiji.invw.api.MyValidController;
+import cn.com.taiji.invw.dto.comm.InvwQryObuBatchDTO;
+import cn.com.taiji.invw.manager.comm.InvwQryObuBatchManager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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.validation.Valid;
+
+@Api(tags = {"003-OBU发行批次"})
+@RestController
+@RequestMapping("/api/qrySmObuBatch")
+public class InvwQryObuBatchController extends MyValidController {
+
+    @Autowired
+    private InvwQryObuBatchManager manager;
+
+    @ApiOperation(value = "01-OBU发行批次分页")
+    @PostMapping("/page")
+    public ApiResponse<Pagination> page(@Valid @RequestBody InvwQryObuBatchDTO req) {
+        return ApiResponse.of(manager.page(req));
+    }
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/comm/InvwQryObusController.java

@@ -0,0 +1,31 @@
+package cn.com.taiji.invw.api.comm;
+
+import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.common.web.ApiResponse;
+import cn.com.taiji.invw.api.MyValidController;
+import cn.com.taiji.invw.dto.comm.InvwQryObusDTO;
+import cn.com.taiji.invw.manager.comm.InvwQryObusManager;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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.validation.Valid;
+
+@Api(tags = {"004-OBU一次发行明细"})
+@RestController
+@RequestMapping("/api/queryGmobus")
+public class InvwQryObusController extends MyValidController {
+
+    @Autowired
+    private InvwQryObusManager manager;
+
+    @ApiOperation(value = "01-OBU发行批次分页")
+    @PostMapping("/page")
+    public ApiResponse<Pagination> page(@Valid @RequestBody InvwQryObusDTO req) {
+        return ApiResponse.of(manager.page(req));
+    }
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/AbstractBizRequestDTO.java

@@ -0,0 +1,50 @@
+package cn.com.taiji.invw.dto;
+
+import cn.com.taiji.common.valid.BaseValidDTO;
+import cn.com.taiji.common.valid.ViolationValidator;
+import cn.com.taiji.core.entity.dict.basic.SourceType;
+import cn.com.taiji.core.model.comm.protocol.constraint.FixedLength;
+import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+import org.springframework.validation.annotation.Validated;
+
+import javax.validation.constraints.NotBlank;
+
+@Setter
+@Getter
+@Accessors(chain = true)
+@Validated
+public abstract class AbstractBizRequestDTO extends BaseValidDTO {
+    // 前端公参
+    @NotBlank(message = "openId不能为空")
+    private String openId;
+    @NotBlank(message = "loginSource不能为空")
+    private String loginSource;
+    @NotBlank(message = "agentId不能为空")
+    @FixedLength(length = 11)
+    private String agentId;
+    @NotBlank(message = "channelId不能为空")
+//    @FixedLength(length = 19)
+    private String channelId;
+    @IntegerConstant(values = "1,2", message = "网点类型错误！线下网点填写2")
+    private Integer channelType;
+    private String staffId;
+    private String terminalId;
+
+    private String orgCode;
+
+
+    public SourceType getOrderSource() {
+        return SourceType.findByCode(loginSource);
+    }
+
+    @Override
+    protected void validate(ViolationValidator validator) {
+        if (getOrderSource() == SourceType.SERVICE_HALL) {
+            validator.validFieldNotBlank("staffId", staffId);
+        }
+    }
+
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/comm/InvwQryCardBatchDTO.java

@@ -0,0 +1,37 @@
+package cn.com.taiji.invw.dto.comm;
+
+import cn.com.taiji.common.model.finals.SysFinals;
+import cn.com.taiji.invw.dto.AbstractBizRequestDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+@ApiModel(description = "卡片发行批次")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class InvwQryCardBatchDTO extends AbstractBizRequestDTO {
+    @ApiModelProperty(value = "批次号")
+    private String batchNo;                // 批次号
+    @ApiModelProperty(value = "卡片厂商代码")
+    private String providerID;             // 卡片厂商代码
+    @ApiModelProperty(value = "版本号")
+    private String version;                // 卡片版本号
+    @ApiModelProperty(value = "卡片类型")
+    private String cardType;               // 卡片类型
+    @ApiModelProperty(value = "起始卡号")
+    private String batchDateStart;         // 申请时间开始
+    @ApiModelProperty(value = "结束卡号")
+    private String batchDateEnd;           // 申请时间结束
+    //    @ApiModelProperty(value = "起始卡号")
+    //    private String lastUpdateTimeStart;    // 最新更新日期开始
+    //    @ApiModelProperty(value = "结束卡号")
+    //    private String lastUpdateTimeEnd;      // 最新更新日期结束
+
+    @ApiModelProperty(value = "页码")
+    private Integer pageNo = SysFinals.DEFAULT_PAGE_NUM;
+    @ApiModelProperty(value = "每页数量")
+    private Integer pageSize = SysFinals.DEFAULT_PAGE_SIZE;
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/comm/InvwQryCardsDTO.java

@@ -0,0 +1,41 @@
+package cn.com.taiji.invw.dto.comm;
+
+import cn.com.taiji.common.model.finals.SysFinals;
+import cn.com.taiji.invw.dto.AbstractBizRequestDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+@ApiModel(description = "卡片一发")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class InvwQryCardsDTO extends AbstractBizRequestDTO {
+    @ApiModelProperty(value = "批次号")
+    private String batchNo;        // 批次号
+    @ApiModelProperty(value = "卡号")
+    private String cardNo;         // 卡号
+    @ApiModelProperty(value = "起始卡号")
+    private String startCardNo;    // 起始卡号
+    @ApiModelProperty(value = "结束卡号")
+    private String endCardNo;      // 结束卡号
+    @ApiModelProperty(value = "厂商代码")
+    private String providerID;     // 厂商代码
+    @ApiModelProperty(value = "版本号")
+    private String version;        // 卡片版本号
+    @ApiModelProperty(value = "卡片类型")
+    private String cardType;       // 卡片类型
+    @ApiModelProperty(value = "发行状态")
+    private Integer status;        // 发行状态
+//    @ApiModelProperty(value = "开始时间")
+//    private String formatTimeStart;     // 格式化日期
+//    @ApiModelProperty(value = "结束时间")
+//    private String formatTimeEnd;       // 格式化日期
+
+    @ApiModelProperty(value = "页码")
+    private Integer pageNo = SysFinals.DEFAULT_PAGE_NUM;
+    @ApiModelProperty(value = "每页数量")
+    private Integer pageSize = SysFinals.DEFAULT_PAGE_SIZE;
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/comm/InvwQryObuBatchDTO.java

@@ -0,0 +1,34 @@
+package cn.com.taiji.invw.dto.comm;
+
+import cn.com.taiji.common.model.finals.SysFinals;
+import cn.com.taiji.invw.dto.AbstractBizRequestDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+@ApiModel(description = "OBU发行批次")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class InvwQryObuBatchDTO extends AbstractBizRequestDTO {
+    @ApiModelProperty(value = "批次号")
+    private String batchNo;             // 批次号
+    @ApiModelProperty(value = "卡片厂商代码")
+    private String providerID;          // 厂商代码
+    @ApiModelProperty(value = "卡片版本号")
+    private String version;             // 版本号
+    @ApiModelProperty(value = "卡片类型")
+    private String obuType;             // OBU类型
+    @ApiModelProperty(value = "申请时间开始")
+    private String applyDateStart; 		// 申请时间开始
+    @ApiModelProperty(value = "申请时间结束")
+    private String applyDateEnd;   		// 申请时间结束
+
+
+    @ApiModelProperty(value = "页码")
+    private Integer pageNo = SysFinals.DEFAULT_PAGE_NUM;
+    @ApiModelProperty(value = "每页数量")
+    private Integer pageSize = SysFinals.DEFAULT_PAGE_SIZE;
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/comm/InvwQryObusDTO.java

@@ -0,0 +1,38 @@
+package cn.com.taiji.invw.dto.comm;
+
+import cn.com.taiji.common.model.finals.SysFinals;
+import cn.com.taiji.invw.dto.AbstractBizRequestDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+@ApiModel(description = "OBU一次发行明细")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class InvwQryObusDTO extends AbstractBizRequestDTO {
+    @ApiModelProperty(value = "批次号")
+    private String batchNo;        // 批次号
+    @ApiModelProperty(value = "OBU合同序列号")
+    private String serialNo;       // OBU合同序列号
+    @ApiModelProperty(value = "卡片厂商代码")
+    private String providerID;     // 卡片厂商代码
+    @ApiModelProperty(value = "起始OBU合同序列号")
+    private String startSerialNo;  // 起始OBU合同序列号
+    @ApiModelProperty(value = "结束OBU合同序列号")
+    private String endSerialNo;    // 结束OBU合同序列号
+    @ApiModelProperty(value = "发行状态")
+    private Integer status;        // 发行状态
+//    @ApiModelProperty(value = "开始时间")
+//    private String formatTimeStart;     // 格式化日期
+//    @ApiModelProperty(value = "结束时间")
+//    private String formatTimeEnd;       // 格式化日期
+
+
+    @ApiModelProperty(value = "页码")
+    private Integer pageNo = SysFinals.DEFAULT_PAGE_NUM;
+    @ApiModelProperty(value = "每页数量")
+    private Integer pageSize = SysFinals.DEFAULT_PAGE_SIZE;
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/comm/InvwQryCardBatchManager.java

@@ -0,0 +1,8 @@
+package cn.com.taiji.invw.manager.comm;
+
+import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.invw.dto.comm.InvwQryCardBatchDTO;
+
+public interface InvwQryCardBatchManager {
+    Pagination page(InvwQryCardBatchDTO request);
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/comm/InvwQryCardBatchManagerImpl.java

@@ -0,0 +1,23 @@
+package cn.com.taiji.invw.manager.comm;
+
+import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.core.repo.jpa.invw.InvwQryCardBatchRepo;
+import cn.com.taiji.core.repo.request.invw.InvwQryCardBatchPageRequest;
+import cn.com.taiji.invw.dto.comm.InvwQryCardBatchDTO;
+import cn.com.taiji.invw.manager.AbstractCommManager;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class InvwQryCardBatchManagerImpl extends AbstractCommManager implements InvwQryCardBatchManager {
+
+    @Autowired
+    private InvwQryCardBatchRepo invwQryCardBatchRepo;
+    @Override
+    public Pagination page(InvwQryCardBatchDTO request) {
+        InvwQryCardBatchPageRequest req = new InvwQryCardBatchPageRequest();
+        BeanUtils.copyProperties(request, req);
+        return invwQryCardBatchRepo.page(req);
+    }
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/comm/InvwQryCardsManager.java

@@ -0,0 +1,8 @@
+package cn.com.taiji.invw.manager.comm;
+
+import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.invw.dto.comm.InvwQryCardsDTO;
+
+public interface InvwQryCardsManager {
+    Pagination page(InvwQryCardsDTO request);
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/comm/InvwQryCardsManagerImpl.java

@@ -0,0 +1,23 @@
+package cn.com.taiji.invw.manager.comm;
+
+import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.core.repo.jpa.invw.InvwQryCardsRepo;
+import cn.com.taiji.core.repo.request.invw.InvwQryCardsPageRequest;
+import cn.com.taiji.invw.dto.comm.InvwQryCardsDTO;
+import cn.com.taiji.invw.manager.AbstractCommManager;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class InvwQryCardsManagerImpl extends AbstractCommManager implements InvwQryCardsManager {
+
+    @Autowired
+    private InvwQryCardsRepo invwQryCardsRepo;
+    @Override
+    public Pagination page(InvwQryCardsDTO request) {
+        InvwQryCardsPageRequest req = new InvwQryCardsPageRequest();
+        BeanUtils.copyProperties(request, req);
+        return invwQryCardsRepo.page(req);
+    }
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/comm/InvwQryObuBatchManager.java

@@ -0,0 +1,8 @@
+package cn.com.taiji.invw.manager.comm;
+
+import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.invw.dto.comm.InvwQryObuBatchDTO;
+
+public interface InvwQryObuBatchManager {
+    Pagination page(InvwQryObuBatchDTO request);
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/comm/InvwQryObuBatchManagerImpl.java

@@ -0,0 +1,24 @@
+package cn.com.taiji.invw.manager.comm;
+
+import cn.com.taiji.common.model.dao.Pagination;
+
+import cn.com.taiji.core.repo.jpa.invw.InvwQryObuBatchRepo;
+import cn.com.taiji.core.repo.request.invw.InvwQryObuBatchPageRequest;
+import cn.com.taiji.invw.dto.comm.InvwQryObuBatchDTO;
+import cn.com.taiji.invw.manager.AbstractCommManager;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class InvwQryObuBatchManagerImpl extends AbstractCommManager implements InvwQryObuBatchManager {
+
+    @Autowired
+    private InvwQryObuBatchRepo invwQryObuBatchRepo;
+    @Override
+    public Pagination page(InvwQryObuBatchDTO request) {
+        InvwQryObuBatchPageRequest req = new InvwQryObuBatchPageRequest();
+        BeanUtils.copyProperties(request, req);
+        return invwQryObuBatchRepo.page(req);
+    }
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/comm/InvwQryObusManager.java

@@ -0,0 +1,8 @@
+package cn.com.taiji.invw.manager.comm;
+
+import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.invw.dto.comm.InvwQryObusDTO;
+
+public interface InvwQryObusManager {
+    Pagination page(InvwQryObusDTO request);
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/comm/InvwQryObusManagerImpl.java

@@ -0,0 +1,23 @@
+package cn.com.taiji.invw.manager.comm;
+
+import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.core.repo.jpa.invw.InvwQryObusRepo;
+import cn.com.taiji.core.repo.request.invw.InvwQryObusPageRequest;
+import cn.com.taiji.invw.dto.comm.InvwQryObusDTO;
+import cn.com.taiji.invw.manager.AbstractCommManager;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class InvwQryObusManagerImpl extends AbstractCommManager implements InvwQryObusManager {
+
+    @Autowired
+    private InvwQryObusRepo invwQryObusRepo;
+    @Override
+    public Pagination page(InvwQryObusDTO request) {
+        InvwQryObusPageRequest req = new InvwQryObusPageRequest();
+        BeanUtils.copyProperties(request, req);
+        return invwQryObusRepo.page(req);
+    }
+}