Skip to content

D
device-back
提交 024f55eb authored 作者: 邓砥奕's avatar 邓砥奕
浏览文件
操作

修改bug

上级 3f901863
隐藏空白字符变更
内嵌 并排
正在显示 包含 136 行增加 和 105 行删除
dev-config/src/main/java/com/tykj/dev/config/LogType.java
浏览文件 @ 024f55eb
......@@ -3,6 +3,7 @@ package com.tykj.dev.config;
import lombok.AllArgsConstructor;
import static com.tykj.dev.misc.base.StatusEnum.*;
import static com.tykj.dev.misc.base.BusinessEnum.*;
/**
* @author dengdiyi
......@@ -13,166 +14,171 @@ public enum LogType {
/**
* 发起列装
*/
PACKING_1(1, ORIGIN_STATUS.id, PACKING_CONFIRM.id, "发起列装"),
PACKING_1(1,PACKING.id,ORIGIN_STATUS.id, PACKING_CONFIRM.id, "发起列装"),
/**
* 列装审核成功
*/
PACKING_2(2, PACKING_CONFIRM.id, END.id, "列装审核成功"),
PACKING_2(2,PACKING.id, PACKING_CONFIRM.id, END.id, "列装审核成功"),
/**
* 列装审核失败
*/
PACKING_3(3, PACKING_CONFIRM.id, ARCHIVE.id, "列装审核失败"),
PACKING_3(3,PACKING.id, PACKING_CONFIRM.id, ARCHIVE.id, "列装审核失败"),
STORAGE_1(4, ORIGIN_STATUS.id, STORAGE_CONFIRM.id, "发起入库"),
STORAGE_1(4,STORAGE.id, ORIGIN_STATUS.id, STORAGE_CONFIRM.id, "发起入库"),
STORAGE_2(5, STORAGE_CONFIRM.id, END.id, "入库审核成功"),
STORAGE_2(5,STORAGE.id, STORAGE_CONFIRM.id, END.id, "入库审核成功"),
STORAGE_3(6, STORAGE_CONFIRM.id, ARCHIVE.id, "入库审核失败"),
STORAGE_3(6,STORAGE.id, STORAGE_CONFIRM.id, ARCHIVE.id, "入库审核失败"),
ALLOT_1(7, ORIGIN_STATUS.id, ALLOT_SEND_CONFIRM.id, "对(%receiveUnit)发起配发"),
ALLOT_1(7,ALLOT.id, ORIGIN_STATUS.id, ALLOT_SEND_CONFIRM.id, "对(%receiveUnit)发起配发"),
ALLOT_2(8, WAIT_ALLOT.id, ALLOT_SEND_CONFIRM.id, "对(%receiveUnit)发起配发"),
ALLOT_2(8,ALLOT.id, WAIT_ALLOT.id, ALLOT_SEND_CONFIRM.id, "对(%receiveUnit)发起配发"),
ALLOT_3(9, ALLOT_SEND_CONFIRM.id, ARCHIVE.id, "配发出库审核失败"),
ALLOT_3(9,ALLOT.id, ALLOT_SEND_CONFIRM.id, ARCHIVE.id, "配发出库审核失败"),
ALLOT_4(10, ALLOT_SEND_CONFIRM.id, ALLOTING.id, "审核成功并出库"),
ALLOT_4(10,ALLOT.id, ALLOT_SEND_CONFIRM.id, ALLOTING.id, "审核成功并出库"),
ALLOT_5(11, ALLOTING.id, ALLOT_RECEIVE_CONFIRM.id, "接收并发起入库"),
ALLOT_5(11,ALLOT.id, ALLOTING.id, ALLOT_RECEIVE_CONFIRM.id, "接收并发起入库"),
ALLOT_6(12, ALLOT_RECEIVE_CONFIRM.id, END.id, "审核成功并入库"),
ALLOT_6(12,ALLOT.id, ALLOT_RECEIVE_CONFIRM.id, END.id, "审核成功并入库"),
ALLOT_7(13, ALLOT_RECEIVE_CONFIRM.id, ARCHIVE.id, "配发入库审核失败"),
ALLOT_7(13,ALLOT.id, ALLOT_RECEIVE_CONFIRM.id, ARCHIVE.id, "配发入库审核失败"),
RFID_1(14, ORIGIN_STATUS.id, RFID_BUSINESS_NEED_CONFIRM.id, "发起标签替换"),
RFID_1(14,TAG.id, ORIGIN_STATUS.id, RFID_BUSINESS_NEED_CONFIRM.id, "发起标签替换"),
RFID_2(15, RFID_BUSINESS_NEED_CONFIRM.id, END.id, "标签替换审核成功"),
RFID_2(15,TAG.id, RFID_BUSINESS_NEED_CONFIRM.id, END.id, "标签替换审核成功"),
RFID_3(16, RFID_BUSINESS_NEED_CONFIRM.id, ARCHIVE.id, "标签替换审核失败"),
RFID_3(16,TAG.id, RFID_BUSINESS_NEED_CONFIRM.id, ARCHIVE.id, "标签替换审核失败"),
SELF_CHECK_1(17, ORIGIN_STATUS.id, SELF_CHECK_CONFIRM.id, "手动发起自查"),
SELF_CHECK_1(17,SELF_CHECK.id, ORIGIN_STATUS.id, SELF_CHECK_CONFIRM.id, "手动发起自查"),
SELF_CHECK_2(18, WAIT_SELF_CHECK.id, SELF_CHECK_CONFIRM.id, "周期发起自查"),
SELF_CHECK_2(18,SELF_CHECK.id, WAIT_SELF_CHECK.id, SELF_CHECK_CONFIRM.id, "周期发起自查"),
SELF_CHECK_3(19, SELF_CHECK_CONFIRM.id, END.id, "自查审核成功"),
SELF_CHECK_3(19,SELF_CHECK.id, SELF_CHECK_CONFIRM.id, END.id, "自查审核成功"),
SELF_CHECK_4(20, SELF_CHECK_CONFIRM.id, ARCHIVE.id, "自查审核失败"),
SELF_CHECK_4(20,SELF_CHECK.id, SELF_CHECK_CONFIRM.id, ARCHIVE.id, "自查审核失败"),
APPLY_1(21, ORIGIN_STATUS.id, DEVICE_APPLY_CONFIRM.id, "发起装备申请"),
APPLY_1(21,APPLY.id, ORIGIN_STATUS.id, DEVICE_APPLY_CONFIRM.id, "发起装备申请"),
APPLY_2(22, DEVICE_APPLY_CONFIRM.id, END.id, "装备申请批复通过"),
APPLY_2(22,APPLY.id, DEVICE_APPLY_CONFIRM.id, END.id, "装备申请批复通过"),
APPLY_3(23, DEVICE_APPLY_CONFIRM.id, ARCHIVE.id, "装备申请批复驳回"),
APPLY_3(23,APPLY.id, DEVICE_APPLY_CONFIRM.id, ARCHIVE.id, "装备申请批复驳回"),
DESTROY_1(24, ORIGIN_STATUS.id, DESTROY_BUSINESS_NEED_CONFIRM.id, "发起销毁"),
DESTROY_1(24,DESTROY.id, ORIGIN_STATUS.id, DESTROY_BUSINESS_NEED_CONFIRM.id, "发起销毁"),
DESTROY_3(26, DESTROY_BUSINESS_NEED_CONFIRM.id, ARCHIVE.id, "销毁出库审核失败"),
DESTROY_3(26,DESTROY.id, DESTROY_BUSINESS_NEED_CONFIRM.id, ARCHIVE.id, "销毁出库审核失败"),
MATCHING_1(27, ORIGIN_STATUS.id, ADD_MATCHING_DEVICE_CONFIRM.id, "发起新增配套设备"),
MATCHING_1(27,ADD_MATCHING_DEVICE.id, ORIGIN_STATUS.id, ADD_MATCHING_DEVICE_CONFIRM.id, "发起新增配套设备"),
MATCHING_2(28, ADD_MATCHING_DEVICE_CONFIRM.id, END.id, "添加配套设备审核成功"),
MATCHING_2(28,ADD_MATCHING_DEVICE.id, ADD_MATCHING_DEVICE_CONFIRM.id, END.id, "添加配套设备审核成功"),
MATCHING_3(29, ADD_MATCHING_DEVICE_CONFIRM.id, ARCHIVE.id, "添加配套设备审核失败"),
MATCHING_3(29,ADD_MATCHING_DEVICE.id, ADD_MATCHING_DEVICE_CONFIRM.id, ARCHIVE.id, "添加配套设备审核失败"),
REPAIR_SEND_1(30, ORIGIN_STATUS.id, WAIT_RECEIVE.id, "向(%receiveUnit)发起装备维修"),
REPAIR_SEND_1(30,REPAIR.id, ORIGIN_STATUS.id, WAIT_RECEIVE.id, "向(%receiveUnit)发起装备维修"),
REPAIR_SEND_2(31, REPAIR_SEND_CONFIRM.id, WAIT_RECEIVE.id, "审核成功并出库"),
REPAIR_SEND_2(31,REPAIR.id, REPAIR_SEND_CONFIRM.id, WAIT_RECEIVE.id, "审核成功并出库"),
DESTROY_2(25, DESTROY_BUSINESS_NEED_CONFIRM.id, WAIT_UPLOAD_BILL_FILE.id, "销毁出库审核成功"),
DESTROY_2(25,DESTROY.id, DESTROY_BUSINESS_NEED_CONFIRM.id, WAIT_UPLOAD_BILL_FILE.id, "销毁出库审核成功"),
REPAIR_SEND_3(32, REPAIR_SEND_CONFIRM.id, ARCHIVE.id, "维修出库审核失败"),
REPAIR_SEND_3(32,REPAIR.id, REPAIR_SEND_CONFIRM.id, ARCHIVE.id, "维修出库审核失败"),
REPAIR_SEND_4(33, WAIT_RECEIVE.id, REPAIRING.id, "接收维修装备并发起入库"),
REPAIR_SEND_4(33,REPAIR.id, WAIT_RECEIVE.id, REPAIRING.id, "接收维修装备并发起入库"),
DESTROY_4(100, WAIT_UPLOAD_BILL_FILE.id, END.id, "上传销毁单"),
DESTROY_4(100,DESTROY.id, WAIT_UPLOAD_BILL_FILE.id, END.id, "上传销毁单"),
REPAIR_SEND_5(34, REPAIR_RECEIVE_CONFIRM.id, REPAIRING.id, "审核成功并入库维修"),
REPAIR_SEND_5(34,REPAIR.id, REPAIR_RECEIVE_CONFIRM.id, REPAIRING.id, "审核成功并入库维修"),
REPAIR_SEND_6(35, REPAIR_RECEIVE_CONFIRM.id, ARCHIVE.id, "维修装备入库审核失败"),
REPAIR_SEND_6(35,REPAIR.id, REPAIR_RECEIVE_CONFIRM.id, ARCHIVE.id, "维修装备入库审核失败"),
REPAIR_SEND_7(36, REPAIR_SEND_CONFIRM.id, COUNTRY_REPAIRING.id, "审核成功并出库"),
REPAIR_SEND_7(36,REPAIR.id, REPAIR_SEND_CONFIRM.id, COUNTRY_REPAIRING.id, "审核成功并出库"),
REPAIR_BACK_1(37, ORIGIN_STATUS.id, WAIT_BACK_RECEIVE.id, "向(%receiveUnit)退还维修装备"),
REPAIR_BACK_1(37,REPAIR_BACK.id, ORIGIN_STATUS.id, WAIT_BACK_RECEIVE.id, "向(%receiveUnit)退还维修装备"),
REPAIR_BACK_2(38, REPAIR_BACK_CONFIRM.id, WAIT_BACK_RECEIVE.id, "维修退回审核成功并出库"),
REPAIR_BACK_2(38,REPAIR_BACK.id, REPAIR_BACK_CONFIRM.id, WAIT_BACK_RECEIVE.id, "维修退回审核成功并出库"),
REPAIR_BACK_3(39, REPAIR_BACK_CONFIRM.id, ARCHIVE.id, "维修退回出库审核失败"),
REPAIR_BACK_3(39,REPAIR_BACK.id, REPAIR_BACK_CONFIRM.id, ARCHIVE.id, "维修退回出库审核失败"),
REPAIR_BACK_4(40, WAIT_BACK_RECEIVE.id, END.id, "维修退回装备接收并发起入库"),
REPAIR_BACK_4(40,REPAIR_BACK.id, WAIT_BACK_RECEIVE.id, END.id, "维修退回装备接收并发起入库"),
REPAIR_BACK_5(41, REPAIR_BACK_RECEIVE_CONFIRM.id, END.id, "维修退回装备入库审核成功"),
REPAIR_BACK_5(41,REPAIR_BACK.id, REPAIR_BACK_RECEIVE_CONFIRM.id, END.id, "维修退回装备入库审核成功"),
REPAIR_BACK_6(42, REPAIR_BACK_RECEIVE_CONFIRM.id, ARCHIVE.id, "维修退回装备入库审核失败"),
REPAIR_BACK_6(42,REPAIR_BACK.id, REPAIR_BACK_RECEIVE_CONFIRM.id, ARCHIVE.id, "维修退回装备入库审核失败"),
RETIRED_1(43, ORIGIN_STATUS.id, RETIRED_BUSINESS_NEED_CONFIRM.id, "发起退装"),
RETIRED_1(43,RETIRED.id, ORIGIN_STATUS.id, RETIRED_BUSINESS_NEED_CONFIRM.id, "发起退装"),
RETIRED_2(44, RETIRED_BUSINESS_NEED_CONFIRM.id, END.id, "退装审核成功"),
RETIRED_2(44,RETIRED.id,RETIRED_BUSINESS_NEED_CONFIRM.id, END.id, "退装审核成功"),
RETIRED_3(45, RETIRED_BUSINESS_NEED_CONFIRM.id, ARCHIVE.id, "退装审核失败"),
RETIRED_3(45,RETIRED.id, RETIRED_BUSINESS_NEED_CONFIRM.id, ARCHIVE.id, "退装审核失败"),
TRAIN_1(46, ORIGIN_STATUS.id, TRAIN1000.id, "发起培训"),
TRAIN_1(46,TRAIN.id, ORIGIN_STATUS.id, TRAIN1000.id, "发起培训"),
CONFIRM_CHECK_DETAIL_NORMAL_0(401, ORIGIN_STATUS.id, CHECK_DETAIL_0.id, "核查详情任务开始"),
CONFIRM_CHECK_DETAIL_NORMAL_0(401,CONFIRM_CHECK_DETAIL.id, ORIGIN_STATUS.id, CHECK_DETAIL_0.id, "核查详情任务开始"),
CONFIRM_CHECK_DETAIL_NORMAL_1(402, CHECK_DETAIL_0.id, CHECK_DETAIL_1.id, "A岗核查成功,等待专管员B操作"),
CONFIRM_CHECK_DETAIL_NORMAL_1(402,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_0.id, CHECK_DETAIL_1.id, "A岗核查成功,等待专管员B操作"),
CONFIRM_CHECK_DETAIL_NORMAL_2(403, CHECK_DETAIL_1.id, CHECK_DETAIL_2.id, "B岗核查成功,等待核查组成员A审核"),
CONFIRM_CHECK_DETAIL_NORMAL_2(403,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_1.id, CHECK_DETAIL_2.id, "B岗核查成功,等待核查组成员A审核"),
CONFIRM_CHECK_DETAIL_NORMAL_3(404, CHECK_DETAIL_2.id, CHECK_DETAIL_3.id, "核查组成员A核查成功,等待核查组成员B审核"),
CONFIRM_CHECK_DETAIL_NORMAL_3(404,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_2.id, CHECK_DETAIL_3.id, "核查组成员A核查成功,等待核查组成员B审核"),
CONFIRM_CHECK_DETAIL_NORMAL_4(405, CHECK_DETAIL_3.id, END.id, "核查组成员B核查成功,任务结束,上传数据到统计信息"),
CONFIRM_CHECK_DETAIL_NORMAL_4(405,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_3.id, END.id, "核查组成员B核查成功,任务结束,上传数据到统计信息"),
CONFIRM_CHECK_DETAIL_OTHER_1(406, CHECK_DETAIL_1.id, END.id, "B岗核查成功,该任务没有核查组成员,任务结束,上传数据到统计信息"),
CONFIRM_CHECK_DETAIL_OTHER_1(406,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_1.id, END.id, "B岗核查成功,该任务没有核查组成员,任务结束,上传数据到统计信息"),
CONFIRM_CHECK_DETAIL_OTHER_2(407, CHECK_DETAIL_1.id, CHECK_DETAIL_0.id, "B岗审核失败,跳回A岗人员操作"),
CONFIRM_CHECK_DETAIL_OTHER_2(407,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_1.id, CHECK_DETAIL_0.id, "B岗审核失败,跳回A岗人员操作"),
CONFIRM_CHECK_DETAIL_OTHER_3(408, CHECK_DETAIL_2.id, CHECK_DETAIL_0.id, "核查组成员A审核失败,跳回A岗人员操作"),
CONFIRM_CHECK_DETAIL_OTHER_3(408,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_2.id, CHECK_DETAIL_0.id, "核查组成员A审核失败,跳回A岗人员操作"),
CONFIRM_CHECK_DETAIL_OTHER_4(409, CHECK_DETAIL_3.id, CHECK_DETAIL_0.id, "核查组成员B审核失败,跳回A岗人员操作"),
CONFIRM_CHECK_DETAIL_OTHER_4(409,CONFIRM_CHECK_DETAIL.id, CHECK_DETAIL_3.id, CHECK_DETAIL_0.id, "核查组成员B审核失败,跳回A岗人员操作"),
CONFIRM_CHECK_DETAIL_STAT_0(410, ORIGIN_STATUS.id, CHECK_STAT_0.id, "核查统计任务开始"),
CONFIRM_CHECK_DETAIL_STAT_0(410,CONFIRM_CHECK_STAT.id, ORIGIN_STATUS.id, CHECK_STAT_0.id, "核查统计任务开始"),
CONFIRM_CHECK_DETAIL_STAT_1(411, CHECK_STAT_0.id, CHECK_STAT_1.id, "地区数据已统计完毕,等待确认"),
CONFIRM_CHECK_DETAIL_STAT_1(411,CONFIRM_CHECK_STAT.id, CHECK_STAT_0.id, CHECK_STAT_1.id, "地区数据已统计完毕,等待确认"),
CONFIRM_CHECK_DETAIL_STAT_2(412, CHECK_STAT_1.id, END.id, "地区数据已确认完毕,将统计上传,任务完结"),
CONFIRM_CHECK_DETAIL_STAT_2(412,CONFIRM_CHECK_STAT.id, CHECK_STAT_1.id, END.id, "地区数据已确认完毕,将统计上传,任务完结"),
ALLOT_BACK_1(57, ORIGIN_STATUS.id, ALLOT_BACKING.id, "发起配发装备退回"),
ALLOT_BACK_1(57,ALLOT_BACK.id, ORIGIN_STATUS.id, ALLOT_BACKING.id, "发起配发装备退回"),
ALLOT_BACK_2(58, ALLOT_BACKING.id, ALLOT_BACK_CONFIRM.id, "配发退回装备接收成功"),
ALLOT_BACK_2(58,ALLOT_BACK.id, ALLOT_BACKING.id, ALLOT_BACK_CONFIRM.id, "配发退回装备接收成功"),
ALLOT_BACK_3(59, ALLOT_BACK_CONFIRM.id, END.id, "配发退回装备接收审核成功"),
ALLOT_BACK_3(59,ALLOT_BACK.id, ALLOT_BACK_CONFIRM.id, END.id, "配发退回装备接收审核成功"),
ALLOT_BACK_4(60, ALLOT_BACK_CONFIRM.id, ARCHIVE.id, "配发退回装备接收审核失败"),
ALLOT_BACK_4(60,ALLOT_BACK.id, ALLOT_BACK_CONFIRM.id, ARCHIVE.id, "配发退回装备接收审核失败"),
TRAIN1(61, ORIGIN_STATUS.id, TRAIN1000.id, "创建培训成功,等待报名"),
TRAIN2(62, TRAIN1000.id, TRAIN1010.id, "报名结束,待培训"),
TRAIN3(63, TRAIN1010.id, TRAIN1004.id, "培训中"),
TRAIN4(64, TRAIN1004.id, TRAIN1005.id, "市培训成绩录入完成"),
TRAIN5(65, TRAIN1005.id, TRAIN1006.id, "市向省申请发证"),
TRAIN6(66, TRAIN1006.id, END.id, "市培训完成"),
TRAIN7(67, TRAIN1004.id, TRAIN1007.id, "省培训成绩录入完成，等待审核"),
TRAIN8(68, TRAIN1007.id, END.id, "省培训完成"),
TRAIN1(61,TRAIN.id, ORIGIN_STATUS.id, TRAIN1000.id, "创建培训成功,等待报名"),
TRAIN2(62,TRAIN.id, TRAIN1000.id, TRAIN1010.id, "报名结束,待培训"),
TRAIN3(63,TRAIN.id, TRAIN1010.id, TRAIN1004.id, "培训中"),
TRAIN4(64,TRAIN.id, TRAIN1004.id, TRAIN1005.id, "市培训成绩录入完成"),
TRAIN5(65,TRAIN.id, TRAIN1005.id, TRAIN1006.id, "市向省申请发证"),
TRAIN6(66,TRAIN.id, TRAIN1006.id, END.id, "市培训完成"),
TRAIN7(67,TRAIN.id, TRAIN1004.id, TRAIN1007.id, "省培训成绩录入完成，等待审核"),
TRAIN8(68,TRAIN.id, TRAIN1007.id, END.id, "省培训完成"),
SEND_BACK_1(69, ORIGIN_STATUS.id, SEND_BACK_1200.id, "清退任务创建完成,等待下属单位把装备退回"),
SEND_BACK_2(70, ORIGIN_STATUS.id, SEND_BACK_1203.id, "等待装备清退出库"),
SEND_BACK_3(71, SEND_BACK_1203.id, SEND_BACK_1206.id, "(%sendUnit)装备清退出库完成,向(%receiveUnit)发起清退装备,等待签收"),
SEND_BACK_4(72, SEND_BACK_1206.id, END.id, "(%receiveUnit)签收(%sendUnit)单位清退的装备,装备入库成功"),
SEND_BACK_7(75, ORIGIN_STATUS.id, SEND_BACK_1205.id, "异常装备任务生成,等待填写装备异常信息"),
SEND_BACK_8(76, SEND_BACK_1205.id, END.id, "异常装备处理完成"),
SEND_BACK_9(77, ORIGIN_STATUS.id, SEND_BACK_1207.id, "异常装备的确认任务"),
SEND_BACK_10(78, SEND_BACK_1207.id, END.id, "异常装备的确认任务通过"),
SEND_BACK_1(69,SEND_BACK.id, ORIGIN_STATUS.id, SEND_BACK_1200.id, "清退任务创建完成,等待下属单位把装备退回"),
SEND_BACK_2(70,SEND_BACK.id, ORIGIN_STATUS.id, SEND_BACK_1203.id, "等待装备清退出库"),
SEND_BACK_3(71,SEND_BACK.id, SEND_BACK_1203.id, SEND_BACK_1206.id, "(%sendUnit)装备清退出库完成,向(%receiveUnit)发起清退装备,等待签收"),
SEND_BACK_4(72,SEND_BACK.id, SEND_BACK_1206.id, END.id, "(%receiveUnit)签收(%sendUnit)单位清退的装备,装备入库成功"),
SEND_BACK_7(75,SEND_BACK.id, ORIGIN_STATUS.id, SEND_BACK_1205.id, "异常装备任务生成,等待填写装备异常信息"),
SEND_BACK_8(76,SEND_BACK.id, SEND_BACK_1205.id, END.id, "异常装备处理完成"),
SEND_BACK_9(77,SEND_BACK.id, ORIGIN_STATUS.id, SEND_BACK_1207.id, "异常装备的确认任务"),
SEND_BACK_10(78,SEND_BACK.id, SEND_BACK_1207.id, END.id, "异常装备的确认任务通过"),
WORK_H1(79, ORIGIN_STATUS.id, WORKHANDOVER1011.id, "工作交接任务生成完成,等待上传交接单"),
WORK_H2(80, WORKHANDOVER1011.id, END.id, "工作交接完成"),
ALLOT_8(82, ORIGIN_STATUS.id, ALLOTING.id, "对(%receiveUnit)发起配发"),
ALLOT_9(83, ALLOTING.id, END.id, "接收配发装备"),
ALLOT_10(84, WAIT_ALLOT.id, ALLOTING.id, "对(%receiveUnit)发起配发"),
ALLOT_11(85, ALLOTING.id, ARCHIVE.id, "拒绝接收配发装备"),
ALLOT_BACK_5(86, ALLOT_BACKING.id, END.id, "接收配发退回装备"),
REPAIR_SEND_10(87, ORIGIN_STATUS.id, COUNTRY_REPAIRING.id, "向(%receiveUnit)发起装备维修"),
WORK_H1(79,WORK_HANDOVER.id, ORIGIN_STATUS.id, WORKHANDOVER1011.id, "工作交接任务生成完成,等待上传交接单"),
WORK_H2(80,WORK_HANDOVER.id, WORKHANDOVER1011.id, END.id, "工作交接完成"),
ALLOT_8(82,ALLOT.id, ORIGIN_STATUS.id, ALLOTING.id, "对(%receiveUnit)发起配发"),
ALLOT_9(83,ALLOT.id, ALLOTING.id, END.id, "接收配发装备"),
ALLOT_10(84,ALLOT.id, WAIT_ALLOT.id, ALLOTING.id, "对(%receiveUnit)发起配发"),
ALLOT_11(85,ALLOT.id, ALLOTING.id, ARCHIVE.id, "拒绝接收配发装备"),
ALLOT_BACK_5(86,ALLOT_BACK.id, ALLOT_BACKING.id, END.id, "接收配发退回装备"),
REPAIR_SEND_10(87,REPAIR.id, ORIGIN_STATUS.id, COUNTRY_REPAIRING.id, "向(%receiveUnit)发起装备维修"),
;
public Integer id;
/**
* 业务类型
*/
public Integer businessType;
/**
* 旧状态
*/
......
dev-file/src/main/java/com/tykj/dev/device/file/Controller/FileController.java
浏览文件 @ 024f55eb
package com.tykj.dev.device.file.Controller;
import com.itextpdf.text.Document;
import com.itextpdf.text.DocumentException;
import com.itextpdf.text.Image;
import com.itextpdf.text.Rectangle;
import com.itextpdf.text.*;
import com.itextpdf.text.pdf.PdfWriter;
import com.tykj.dev.config.swagger.AutoDocument;
import com.tykj.dev.device.file.entity.FileRet;
......@@ -109,7 +106,7 @@ public class FileController {
File file = new File(url + "print/" + fileName);
// 第一步：创建一个document对象。
Document document = new Document();
Document document = new Document(PageSize.A4.rotate());
document.setMargins(0, 0, 0, 0);
// 第二步：
// 创建一个PdfWriter实例，
......@@ -121,10 +118,15 @@ public class FileController {
//转成
// Image.byte()
//多文件上传 图片专程byte 2进制
img.setAlignment(Image.ALIGN_CENTER);
// img.setAlignment(Image.ALIGN_CENTER);
// 根据图片大小设置页面，一定要先设置页面，再newPage（），否则无效
document.setPageSize(new Rectangle(img.getWidth(), img.getHeight()));
// document.setPageSize(new Rectangle(PageSize.A4.getWidth(), PageSize.A4.getHeight()));
document.newPage();
float height = img.getHeight();
float width = img.getWidth();
int percent = getPercent(height, width);
img.setAlignment(Image.MIDDLE);
img.scalePercent(percent);
document.add(img);
}
......@@ -190,4 +192,23 @@ public class FileController {
return new FileRet(originalFilename, url + newName, preview + newName);
}
/**
* 等比压缩，获取压缩百分比
*
* @param height 图片的高度
* @param weight 图片的宽度
* @return 压缩百分比
*/
private static int getPercent(float height, float weight) {
float percent = 0.0F;
if (height > weight) {
percent = PageSize.A4.rotate().getHeight() / height * 100;
} else {
percent = PageSize.A4.rotate().getWidth() / weight * 100;
}
return Math.round(percent);
}
}
dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java
浏览文件 @ 024f55eb
......@@ -262,14 +262,15 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
public List<DeviceLibrary> getList(DeviceLibrarySelectVo deviceLibrarySelectVo) {
List<DeviceLibrary> deviceLibraryEntities = deviceLibraryDao.findAll(getSelectSpecification(deviceLibrarySelectVo));
//返回父子结构
Map<Integer, DeviceLibrary> nodeCollect =
deviceLibraryEntities.stream().collect(Collectors.toMap(DeviceLibrary::getId, deviceLibraryEntity -> deviceLibraryEntity));
return GetTreeUtils.parseTreeFromDown(
deviceLibraryEntities,
DeviceLibrary::getId,
deviceLibraryEntity -> Optional.ofNullable(nodeCollect.get(deviceLibraryEntity.getPartParentId())),
DeviceLibrary::addChildNode
);
// Map<Integer, DeviceLibrary> nodeCollect =
// deviceLibraryEntities.stream().collect(Collectors.toMap(DeviceLibrary::getId, deviceLibraryEntity -> deviceLibraryEntity));
// return GetTreeUtils.parseTreeFromDown(
// deviceLibraryEntities,
// DeviceLibrary::getId,
// deviceLibraryEntity -> Optional.ofNullable(nodeCollect.get(deviceLibraryEntity.getPartParentId())),
// DeviceLibrary::addChildNode
// );
return deviceLibraryEntities.stream().sorted(Comparator.comparing(DeviceLibrary::getLifeStatus)).collect(Collectors.toList());
}
public List<DeviceLibrary> getList2(DeviceLibrarySelectVo deviceLibrarySelectVo) {
......
dev-packing/src/main/java/com/tykj/dev/device/packing/subject/domin/PackingLibrary.java
浏览文件 @ 024f55eb
......@@ -203,6 +203,9 @@ public class PackingLibrary {
@ApiModelProperty(value = "申请数量")
@Transient
private Integer applyNum;
@ApiModelProperty(value = "预分配的装备序列号")
@Transient
private String seq;
public void addChildNode(PackingLibrary packingLibraryEntity) {
childs.add(packingLibraryEntity);
......
dev-union/src/main/java/com/tykj/dev/union/LogAspect.java
浏览文件 @ 024f55eb
......@@ -162,7 +162,7 @@ public class LogAspect {
this.newStatus = this.outPutTask.getBillStatus();
if (this.inputTask.getId() != null) {
for (LogType l : LogType.values()) {
if (l.oldStatus.equals(oldStatus) && l.newStatus.equals(newStatus)) {
if (l.oldStatus.equals(oldStatus) && l.newStatus.equals(newStatus) &&l.businessType.equals(outPutTask.getBusinessType())) {
this.opreation = l.getOperation();
break;
}
......@@ -170,7 +170,7 @@ public class LogAspect {
} else {
this.oldStatus = 0;
for (LogType l : LogType.values()) {
if (l.oldStatus == 0 && l.newStatus.equals(newStatus)) {
if (l.oldStatus == 0 && l.newStatus.equals(newStatus)&&l.businessType.equals(outPutTask.getBusinessType())) {
this.opreation = l.getOperation();
break;
}
......@@ -184,7 +184,7 @@ public class LogAspect {
opreation = this.replaceParam(opreation);
}
if (this.opreation == null) {
log.warn("[业务操作日志]存储失败:找不到旧状态为" + this.oldStatus + ",新状态为" + this.newStatus + "的日志模板");
log.warn("[业务操作日志]存储失败:找不到业务类型为+"+outPutTask.getBusinessType()+",旧状态为" + this.oldStatus + ",新状态为" + this.newStatus + "的日志模板");
} else {
TaskLogBto taskLogBto = new TaskLogBto(this.outPutTask.getId(), this.opreation, this.fileVos);
taskLogService.addLog(taskLogBto);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论