Skip to content

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

更新

上级 5e5efb84
显示空白字符变更
内嵌 并排
正在显示 包含 350 行增加 和 38 行删除
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java
浏览文件 @ bee87ec4
......@@ -26,6 +26,7 @@ import com.tykj.dev.misc.base.BusinessEnum;
import com.tykj.dev.misc.base.ResultObj;
import com.tykj.dev.misc.base.StatusEnum;
import com.tykj.dev.misc.exception.ApiException;
import com.tykj.dev.misc.utils.MapperUtils;
import com.tykj.dev.misc.utils.Snowflake;
import com.tykj.dev.misc.utils.StringSplitUtil;
import com.tykj.dev.misc.utils.TimestampUtil;
......@@ -43,6 +44,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
......@@ -130,9 +132,17 @@ public class AllotBillController {
//1.添加配发单
AllotBill a = allotBillSaveVo.toDo();
a.setSendUseraId(userUtils.getCurrentUserId());
AllotBill allotBillEntity = allotBillService.addEntity(a);
AllotBill allotBillEntity;
if (allotBillSaveVo.getTaskId()==null){
allotBillEntity = allotBillService.addEntity(a);
}
else {
AllotBill allotBill = allotBillService.getOne(taskService.get(allotBillSaveVo.getTaskId()).getBillId());
MapperUtils.copyNoNullProperties(a,allotBill);
allotBillEntity = allotBillService.update(allotBill);
}
Calendar calendar = Calendar.getInstance();
calendar.setTime(allotBillEntity.getCreateTime());
calendar.setTime(new Date());
int year = calendar.get(Calendar.YEAR);
String num = "NO:第" + year + "PF" + allotBillEntity.getId() + "号";
allotBillEntity.setNum(num);
......@@ -149,8 +159,16 @@ public class AllotBillController {
List<Integer> userIds = new ArrayList<>();
userIds.add(userId);
userIds.add(0);
TaskBto saveEntity;
if (allotBillSaveVo.getTaskId()==null) {
TaskBto taskBto = new TaskBto(StatusEnum.ALLOTING.id, "配发业务", null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds);
TaskBto saveEntity = taskService.start(taskBto);
saveEntity = taskService.start(taskBto);
}
else {
TaskBto taskBto = taskService.get(allotBillSaveVo.getTaskId());
taskBto.setOwnUnit(userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()));
saveEntity = taskService.moveToSpecial(taskBto,StatusEnum.ALLOTING,0);
}
List<FileVo> fileVoList = new ArrayList<>();
fileVoList.add(new FileVo("出库确认单", allotBillEntity.getFileName(), allotBillEntity.getFileUrl()));
//存装备日志
......@@ -419,6 +437,7 @@ public class AllotBillController {
//发起任务
TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_DRAFT.id, "配发业务", null, ".", allotBill.getId(), 3, userUtils.getCurrentUnitId(), 0, null, userIds);
TaskBto taskBto1 = taskService.start(taskBto);
myWebSocket.sendMessage1();
return ResponseEntity.ok("保存成功"+taskBto1.getId());
}
else {
......@@ -427,9 +446,9 @@ public class AllotBillController {
AllotBill allotBill = allotBillService.getOne(taskBto.getBillId());
AllotBill allotBill1 = allotBillSaveVo.toDo();
allotBill1.setAllotStatus(0);
allotBill1.setId(allotBill.getId());
MapperUtils.copyNoNullProperties(allotBill1,allotBill);
allotBillService.update(allotBill1);
return ResponseEntity.ok("更新成功");
return ResponseEntity.ok("更新成功"+taskBto.getId());
}
}
......@@ -440,6 +459,7 @@ public class AllotBillController {
//任务封存
TaskBto taskBto = taskService.get(taskId);
taskService.moveToArchive(taskBto);
myWebSocket.sendMessage1();
return ResponseEntity.ok("删除成功");
}
......
dev-allot/src/main/java/com/tykj/dev/device/allot/subject/domin/AllotBackBill.java
浏览文件 @ bee87ec4
......@@ -60,18 +60,21 @@ public class AllotBackBill {
@ApiModelProperty(value = "出库附件文件名")
private String fileName;
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "出库附件文件地址URL")
private String fileUrl;
@ApiModelProperty(value = "入库附件文件名")
private String receiveFileName;
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "入库附件文件地址URL")
private String receiveFileUrl;
@ApiModelProperty(value = "账单文件名")
private String billFileName;
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "账单文件地址URL")
private String billFileUrl;
......@@ -103,12 +106,14 @@ public class AllotBackBill {
@ApiModelProperty(value = "已接收装备数量")
private Integer receiveCount;
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "退回出库检查详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
private String backCheckDetail;
@ApiModelProperty(value = "退回出库检查结果")
private String backCheckResult;
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "退回接收方检查详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
private String receiveCheckDetail;
......
dev-allot/src/main/java/com/tykj/dev/device/allot/subject/domin/AllotBill.java
浏览文件 @ bee87ec4
......@@ -110,6 +110,7 @@ public class AllotBill {
/**
* 出库附件文件地址URL
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "出库附件文件地址URL")
private String fileUrl;
/**
......@@ -120,6 +121,7 @@ public class AllotBill {
/**
* 入库附件文件地址URL
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "入库附件文件地址URL")
private String receiveFileUrl;
/**
......@@ -130,6 +132,7 @@ public class AllotBill {
/**
* 账单文件地址URL
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "账单文件地址URL")
private String billFileUrl;
/**
......@@ -179,6 +182,7 @@ public class AllotBill {
/**
* 配发出库检查详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "配发出库检查详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
private String allotCheckDetail;
/**
......@@ -189,6 +193,7 @@ public class AllotBill {
/**
* 配发接收方检查详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "配发接收方检查详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
private String receiveCheckDetail;
/**
......
dev-apply/src/main/java/com/tykj/dev/device/apply/subject/domin/DeviceApplyBill.java
浏览文件 @ bee87ec4
......@@ -81,6 +81,7 @@ public class DeviceApplyBill {
/**
* 列装库主键idx数量(,作为分隔符),例如1x2,2x3,意为列装库id为1的申请2件,id为2的申请3件
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "列装库主键idx数量(,作为分隔符),例如1x2,2x3,意为列装库id为1的申请2件,id为2的申请3件")
private String applyDetail;
/**
......
dev-config/src/main/java/com/tykj/dev/config/LogType.java
浏览文件 @ bee87ec4
......@@ -202,6 +202,8 @@ public enum LogType {
REPAIR_SEND_10(87, REPAIR.id, ORIGIN_STATUS.id, END.id, "向(%receiveUnit)发起装备维修"),
REPAIR_BACK_7(88, REPAIR_BACK.id, ORIGIN_STATUS.id, END.id, "维修退回装备接收并发起入库"),
STORAGE_4(89, STORAGE.id, WAIT_STORAGE.id, ARCHIVE.id, "删除入库草稿"),
SCRAP_1(90,SCRAP.id, ORIGIN_STATUS.id, WAIT_UPLOAD_SCRAP_FILE.id, "发起装备报废"),
SCRAP_2(91,SCRAP.id, WAIT_UPLOAD_SCRAP_FILE.id, END.id, "上传报废单据"),
;
public Integer id;
......
dev-destroy/src/main/java/com/tykj/dev/device/destroy/entity/domain/DeviceDestroyBill.java
浏览文件 @ bee87ec4
......@@ -67,6 +67,7 @@ public class DeviceDestroyBill {
/**
* 出库附件文件地址URL
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "出库附件文件地址URL")
private String fileUrl;
/**
......@@ -77,11 +78,13 @@ public class DeviceDestroyBill {
/**
* 出库附件文件地址URL
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "销毁附件文件地址URL")
private String destroyFileUrl;
/**
* 装备销毁出库详情(装备主键id+核对结果(0缺失1无误2新增,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的新增
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "装备销毁出库详情(装备主键id+核对结果(0缺失1无误2新增,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的新增")
private String destroyDeviceDetail;
/**
......
dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryController.java
浏览文件 @ bee87ec4
......@@ -247,7 +247,7 @@ public class DeviceLibraryController {
}
if (libraryUpdateVo.getProdNumber() != null && !libraryUpdateVo.getProdNumber().equals(deviceLibraryEntity.getProdNumber())) {
//添加装备日志
String remark = "装备换新:将装备生产序列号由" + deviceLibraryEntity.getProdNumber() + "改为" + libraryUpdateVo.getProdNumber();
String remark = "将装备生产序列号由" + deviceLibraryEntity.getProdNumber() + "改为" + libraryUpdateVo.getProdNumber();
DeviceLogDto deviceLogDto = new DeviceLogDto(deviceEditVo.getDeviceId(), remark, null);
deviceLogService.addLog(deviceLogDto);
deviceLibraryEntity.setProdNumber(libraryUpdateVo.getProdNumber());
......@@ -260,7 +260,7 @@ public class DeviceLibraryController {
throw new ApiException("序列号"+libraryUpdateVo.getSeqNumber()+"已存在");
}
else {
String remark = "装备换新:将装备序列号由" + deviceLibraryEntity.getSeqNumber() + "改为" + libraryUpdateVo.getSeqNumber();
String remark = "将装备序列号由" + deviceLibraryEntity.getSeqNumber() + "改为" + libraryUpdateVo.getSeqNumber();
DeviceLogDto deviceLogDto = new DeviceLogDto(deviceEditVo.getDeviceId(), remark, null);
deviceLogService.addLog(deviceLogDto);
deviceLibraryEntity.setSeqNumber(libraryUpdateVo.getSeqNumber());
......
dev-library/src/main/java/com/tykj/dev/device/library/deviceRun.java 0 → 100644
浏览文件 @ bee87ec4
//package com.tykj.dev.device.library;
//
//import com.tykj.dev.device.library.service.DeviceLibraryService;
//import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.boot.CommandLineRunner;
//import org.springframework.stereotype.Component;
//
//import java.util.UUID;
//
//@Slf4j
//@Component
//public class deviceRun implements CommandLineRunner {
// @Autowired
// DeviceLibraryService deviceLibraryService;
// /**
// * Callback used to run the bean.
// *
// * @param args incoming main method arguments
// * @throws Exception on error
// */
// @Override
// public void run(String... args) throws Exception {
// int seq = 10000;
// for (int i=0;i<15000;i++){
// DeviceLibrary deviceLibrary = new DeviceLibrary();
// deviceLibrary.setLifeStatus(2);
// deviceLibrary.setRfidCardId(UUID.randomUUID().toString());
// deviceLibrary.setLocationUnit("省机要局");
// deviceLibrary.setPackingId(3);
// deviceLibrary.setType(1);
// deviceLibrary.setOwnUnit("省机要局");
// deviceLibrary.setInvisibleRange(3);
// deviceLibrary.setManageStatus(1);
// deviceLibrary.setMatchingRange(2);
// deviceLibrary.setModel("aa");
// deviceLibrary.setName("aa");
// deviceLibrary.setProdNumber("1111");
// deviceLibrary.setSeqNumber(String.valueOf(seq));
// seq++;
// deviceLibrary.setRfidSurfaceId("xxxxx");
// deviceLibrary.setSecretLevel(3);
// deviceLibrary.setIsPart(0);
// deviceLibrary.setStorageType(2);
// deviceLibraryService.addEntity(deviceLibrary);
// }
// }
//}
dev-library/src/main/java/com/tykj/dev/device/library/subject/domin/DeviceLibrary.java
浏览文件 @ bee87ec4
......@@ -143,6 +143,7 @@ public class DeviceLibrary {
/**
* 图片url地址
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "图片url地址")
private String imageUrl;
/**
......
dev-library/src/main/java/com/tykj/dev/device/library/subject/domin/DeviceLog.java
浏览文件 @ bee87ec4
......@@ -57,6 +57,7 @@ public class DeviceLog {
/**
* 相关附件信息(Ǵ作为每个附件分隔符,Ǒ作为附件内部分隔符,例如name1Ǒurl1Ǒ配发单Ǵname2Ǒurl2Ǒ入库确认单Ǵ)
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "相关附件信息(Ǵ作为每个附件分隔符,Ǒ作为附件内部分隔符,例如name1Ǒurl1Ǒ配发单Ǵname2Ǒurl2Ǒ入库确认单Ǵ)")
private String fileDetail;
/**
......
dev-library/src/main/java/com/tykj/dev/device/library/subject/vo/DeviceEditVo.java
浏览文件 @ bee87ec4
......@@ -30,4 +30,8 @@ public class DeviceEditVo {
@Min(value = 1,message = "deviceId不能小于1")
@ApiModelProperty(value = "装备id", example = "1")
private Integer deviceId;
@Min(value = 1,message = "id不能小于1")
@ApiModelProperty(value = "换新维修详情id", example = "1")
private Integer id;
}
dev-matching/src/main/java/com/tykj/dev/device/matching/subject/domin/MatchingDeviceBill.java
浏览文件 @ bee87ec4
......@@ -46,6 +46,7 @@ public class MatchingDeviceBill {
/**
* 设备主键id以x拼接
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "设备主键id以x拼接")
private String deviceDetail;
/**
......@@ -61,6 +62,7 @@ public class MatchingDeviceBill {
/**
* 附件url地址
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "附件url地址")
private String fileUrl;
/**
......
dev-matching/src/main/java/com/tykj/dev/device/matching/subject/domin/MatchingRepairBill.java
浏览文件 @ bee87ec4
......@@ -39,6 +39,7 @@ public class MatchingRepairBill {
@ApiModelProperty(name = "维修单名字")
private String fileName;
@Column(columnDefinition = "TEXT")
@ApiModelProperty(name = "维修单URL")
private String fileUrl;
......
dev-matching/src/main/java/com/tykj/dev/device/matching/subject/vo/MatchingDeviceSaveVo.java
浏览文件 @ bee87ec4
......@@ -7,6 +7,7 @@ import lombok.Data;
import org.springframework.beans.BeanUtils;
import javax.validation.constraints.NotNull;
import java.util.UUID;
/**
* @author dengdiyi
......@@ -39,7 +40,7 @@ public class MatchingDeviceSaveVo {
@ApiModelProperty(value = "rfid表面号")
private String rfidSurfaceId;
@NotNull(message = "rfidCardId不能为空")
// @NotNull(message = "rfidCardId不能为空")
@ApiModelProperty(value = "rfid卡号")
private String rfidCardId;
......@@ -48,6 +49,9 @@ public class MatchingDeviceSaveVo {
BeanUtils.copyProperties(this, matchingDeviceLibraryEntity);
matchingDeviceLibraryEntity.setLifeStatus(2);
matchingDeviceLibraryEntity.setDeviceId(0);
if (matchingDeviceLibraryEntity.getRfidCardId()==null||"".equals(matchingDeviceLibraryEntity.getRfidCardId())){
matchingDeviceLibraryEntity.setRfidCardId(UUID.randomUUID().toString());
}
return matchingDeviceLibraryEntity;
}
}
dev-misc/src/main/java/com/tykj/dev/misc/base/DeviceLifeStatus.java
浏览文件 @ bee87ec4
......@@ -24,7 +24,7 @@ public enum DeviceLifeStatus {
/**
* 运输中
*/
IN_TRANSIT(3, "运输中"),
IN_TRANSIT(3, "配发中"),
/**
* 维修中
*/
......
dev-misc/src/main/java/com/tykj/dev/misc/base/StatusEnum.java
浏览文件 @ bee87ec4
......@@ -206,7 +206,12 @@ public enum StatusEnum {
*/
WAIT_BACK(899, "待配发退回"),
ALLOT_BACKING(900, "配发退回中"),
ALLOT_BACK_CONFIRM(901, "配发退回入库待审核");
ALLOT_BACK_CONFIRM(901, "配发退回入库待审核"),
/**
* 报废状态
*/
WAIT_UPLOAD_SCRAP_FILE(2222, "待上传报废单");
public Integer id;
......
dev-misc/src/main/java/com/tykj/dev/misc/utils/MapperUtils.java
浏览文件 @ bee87ec4
......@@ -2,7 +2,14 @@ package com.tykj.dev.misc.utils;
import org.modelmapper.ModelMapper;
import org.modelmapper.convention.MatchingStrategies;
import org.modelmapper.internal.util.Assert;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.FatalBeanException;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Collection;
import java.util.List;
import java.util.function.Function;
......@@ -87,4 +94,38 @@ public class MapperUtils {
modelMapper.map(source, destination);
return destination;
}
/**
* 功能 : 只复制source对象的非空属性到target对象上
*/
public static void copyNoNullProperties(Object source, Object target) throws BeansException {
Assert.notNull(source, "Source must not be null");
Assert.notNull(target, "Target must not be null");
Class<?> actualEditable = target.getClass();
PropertyDescriptor[] targetPds = BeanUtils.getPropertyDescriptors(actualEditable);
for (PropertyDescriptor targetPd : targetPds) {
if (targetPd.getWriteMethod() != null) {
PropertyDescriptor sourcePd = BeanUtils.getPropertyDescriptor(source.getClass(), targetPd.getName());
if (sourcePd != null && sourcePd.getReadMethod() != null) {
try {
Method readMethod = sourcePd.getReadMethod();
if (!Modifier.isPublic(readMethod.getDeclaringClass().getModifiers())) {
readMethod.setAccessible(true);
}
Object value = readMethod.invoke(source);
// 这里判断以下value是否为空 当然这里也能进行一些特殊要求的处理 例如绑定时格式转换等等
if (value != null) {
Method writeMethod = targetPd.getWriteMethod();
if (!Modifier.isPublic(writeMethod.getDeclaringClass().getModifiers())) {
writeMethod.setAccessible(true);
}
writeMethod.invoke(target, value);
}
} catch (Throwable ex) {
throw new FatalBeanException("Could not copy properties from source to target", ex);
}
}
}
}
}
}
dev-packing/src/main/java/com/tykj/dev/device/packing/subject/domin/PackingLibrary.java
浏览文件 @ bee87ec4
......@@ -139,6 +139,7 @@ public class PackingLibrary {
/**
* 图片url地址
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "图片url地址")
private String imageUrl;
/**
......@@ -149,6 +150,7 @@ public class PackingLibrary {
/**
* 附件url地址
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "附件url地址")
private String fileUrl;
/**
......
dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java
浏览文件 @ bee87ec4
......@@ -2,12 +2,15 @@ package com.tykj.dev.device.repair.controller;
import com.tykj.dev.config.GlobalMap;
import com.tykj.dev.config.swagger.AutoDocument;
import com.tykj.dev.device.library.repository.DeviceLibraryDao;
import com.tykj.dev.device.library.service.DeviceChangeService;
import com.tykj.dev.device.library.service.DeviceLibraryService;
import com.tykj.dev.device.library.service.DeviceLogService;
import com.tykj.dev.device.library.subject.Dto.DeviceLogDto;
import com.tykj.dev.device.library.subject.domin.DeviceChange;
import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
import com.tykj.dev.device.library.subject.vo.DeviceEditVo;
import com.tykj.dev.device.library.subject.vo.DeviceLibraryUpdateVo;
import com.tykj.dev.device.library.subject.vo.FileVo;
import com.tykj.dev.device.repair.repository.RepairBackBillDao;
import com.tykj.dev.device.repair.repository.RepairDetailDao;
......@@ -122,6 +125,9 @@ public class RepairController {
@Autowired
private UnitsService unitsService;
@Autowired
private DeviceLibraryDao deviceLibraryDao;
@ApiOperation(value = "发起维修", notes = "可以通过这个接口发起维修")
@PostMapping(value = "/form")
@Transactional(rollbackFor = Exception.class)
......@@ -214,7 +220,7 @@ public class RepairController {
deviceLibraryEntity.setLifeStatus(4);
deviceLibraryEntity.setLocationUnit("中办");
} else {
deviceLibraryEntity.setLifeStatus(3);
deviceLibraryEntity.setLifeStatus(4);
}
deviceLibraryEntity.setManageStatus(0);
deviceLibraryService.update(deviceLibraryEntity);
......@@ -363,12 +369,7 @@ public class RepairController {
if (idList.size() > 0) {
for (Integer id : idList) {
DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id);
//如果当前为省像国家发起的
if (level == 1) {
deviceLibraryEntity.setLifeStatus(4);
} else {
deviceLibraryEntity.setLifeStatus(3);
}
deviceLibraryEntity.setManageStatus(0);
DeviceLogDto deviceLogDto = new DeviceLogDto(id, "审核成功并出库", null);
deviceLogService.addLog(deviceLogDto);
......@@ -686,7 +687,7 @@ public class RepairController {
repairDetail.setRepairStatus(7);
deviceRepairDetailService.update(repairDetail);
DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(d.getDeviceId());
deviceLibraryEntity.setLifeStatus(3);
deviceLibraryEntity.setLifeStatus(4);
deviceLibraryEntity.setManageStatus(0);
DeviceLogDto deviceLogDto = new DeviceLogDto(d.getDeviceId(), "向" + repairBackBillSaveVo.getReceiveUnit() + "退还维修装备", fileVoList);
deviceLogService.addLog(deviceLogDto);
......@@ -746,7 +747,7 @@ public class RepairController {
for (Integer id : idList) {
//改变装备状态
DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id);
deviceLibraryEntity.setLifeStatus(3);
deviceLibraryEntity.setLifeStatus(4);
deviceLibraryEntity.setManageStatus(0);
//添加装备日志
DeviceLogDto deviceLogDto = new DeviceLogDto(id, "维修退回审核成功并出库", null);
......@@ -858,14 +859,14 @@ public class RepairController {
Map<Integer,List<Integer>> messageMap = new HashMap<>();
if (level == 1) {
List<Integer> userIds = new ArrayList<>();
userIds.add(userId);
if (repairReceiveVo.getStatus()==0) {
userIds.add(userId);
TaskBto taskBto1 = new TaskBto(StatusEnum.END.id, "维修退回", null, ".", repairBackBill1.getId(), BusinessEnum.REPAIR_BACK.id, userUtils.getCurrentUnitId(), 0, null, userIds);
taskBto2 = taskService.start(taskBto1);
}
else {
userIds.add(0);
TaskBto taskBto1 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_FILE.id, "维修退回", null, ".", repairBackBill1.getId(), BusinessEnum.REPAIR_BACK.id, userUtils.getCurrentUnitId(), 1, null, userIds);
TaskBto taskBto1 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_FILE.id, "维修退回", null, ".", repairBackBill1.getId(), BusinessEnum.REPAIR_BACK.id, userUtils.getCurrentUnitId(), 0, null, userIds);
taskBto2 = taskService.start(taskBto1);
}
for (DeviceDetailVo d : repairReceiveVo.getDeviceList()) {
......@@ -942,8 +943,10 @@ public class RepairController {
else {
units.add(deviceLibraryEntity.getOwnUnit());
}
deviceLibraryEntity.setLifeStatus(2);
deviceLibraryEntity.setLocationUnit(userUtils.getCurrentUserUnitName());
if (deviceLibraryEntity.getOwnUnit().equals(deviceLibraryEntity.getLocationUnit())) {
deviceLibraryEntity.setLifeStatus(2);
}
//添加装备日志
DeviceLogDto deviceLogDto = new DeviceLogDto(id, "维修退回装备接收并发起入库", fileVoList);
deviceLogService.addLog(deviceLogDto);
......@@ -1058,7 +1061,9 @@ public class RepairController {
Integer id = Integer.parseInt(s.substring(0, s.length() - 1));
//更新装备状态
DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id);
if (deviceLibraryEntity.getOwnUnit().equals(deviceLibraryEntity.getLocationUnit())) {
deviceLibraryEntity.setLifeStatus(2);
}
//添加装备日志
DeviceLogDto deviceLogDto = new DeviceLogDto(id, "维修退回装备入库审核成功", null);
deviceLogService.addLog(deviceLogDto);
......@@ -1502,6 +1507,40 @@ public class RepairController {
return ResponseEntity.ok(repairDetails);
}
@ApiOperation(value = "维修换新", notes = "可以通过这个接口维修换新")
@PostMapping(value = "/changeNew")
@Transactional(rollbackFor = Exception.class)
public ResponseEntity change(@RequestBody DeviceEditVo deviceEditVo){
DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(deviceEditVo.getDeviceId());
if (deviceEditVo.getUpdateVoList() != null) {
DeviceLibraryUpdateVo libraryUpdateVo = deviceEditVo.getUpdateVoList();
if (libraryUpdateVo.getProdNumber() != null && !libraryUpdateVo.getProdNumber().equals(deviceLibraryEntity.getProdNumber())) {
//添加装备日志
String remark = "装备换新:将装备生产序列号由" + deviceLibraryEntity.getProdNumber() + "改为" + libraryUpdateVo.getProdNumber();
DeviceLogDto deviceLogDto = new DeviceLogDto(deviceEditVo.getDeviceId(), remark, null);
deviceLogService.addLog(deviceLogDto);
deviceLibraryEntity.setProdNumber(libraryUpdateVo.getProdNumber());
}
if (libraryUpdateVo.getSeqNumber() != null && !libraryUpdateVo.getSeqNumber().equals(deviceLibraryEntity.getSeqNumber())) {
if (deviceLibraryDao.getAllBySeqNumber(libraryUpdateVo.getSeqNumber()).size()>0){
throw new ApiException("序列号"+libraryUpdateVo.getSeqNumber()+"已存在");
}
else {
String remark = "装备换新:将装备序列号由" + deviceLibraryEntity.getSeqNumber() + "改为" + libraryUpdateVo.getSeqNumber();
DeviceLogDto deviceLogDto = new DeviceLogDto(deviceEditVo.getDeviceId(), remark, null);
deviceLogService.addLog(deviceLogDto);
deviceLibraryEntity.setSeqNumber(libraryUpdateVo.getSeqNumber());
//改变维修详情的序列号
repairDetailDao.findAllByDeviceId(deviceEditVo.getDeviceId()).forEach(repairDetail -> {
repairDetail.setSeqNumber(libraryUpdateVo.getSeqNumber());
deviceRepairDetailService.update(repairDetail);
});
}
}
}
return ResultUtil.success("更新成功");
}
/**
* @param repairBillId 维修单id
* @return 维修详情列表
......
dev-repair/src/main/java/com/tykj/dev/device/repair/repository/RepairDetailDao.java
浏览文件 @ bee87ec4
......@@ -11,4 +11,5 @@ public interface RepairDetailDao extends JpaRepository<RepairDetail, Integer>, J
List<RepairDetail> findByRepairBackBillId(Integer billId);
List<RepairDetail> findAllByRepairStatusAndOwnUnit(Integer repairStatus,String ownUnit);
List<RepairDetail> findAllByRepairStatus(Integer repairStatus);
List<RepairDetail> findAllByDeviceId(Integer deviceId);
}
dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairBillServiceImpl.java
浏览文件 @ bee87ec4
......@@ -97,7 +97,7 @@ public class RepairBillServiceImpl implements RepairBillService {
predicateBuilder.lt("createTime", deviceRepairBillSelectVo.getEndTime());
}
}
predicateBuilder.eq("repairStatus", 5);
// predicateBuilder.eq("repairStatus", 5);
return predicateBuilder.build();
}
}
dev-repair/src/main/java/com/tykj/dev/device/repair/subject/domin/RepairBackBill.java
浏览文件 @ bee87ec4
......@@ -101,6 +101,7 @@ public class RepairBackBill {
/**
* 出库附件文件地址URL
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "出库附件文件地址URL")
private String fileUrl;
/**
......@@ -111,6 +112,7 @@ public class RepairBackBill {
/**
* 入库附件文件地址URL
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "入库附件文件地址URL")
private String receiveFileUrl;
/**
......@@ -121,6 +123,7 @@ public class RepairBackBill {
/**
* 账单文件地址URL
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "账单文件地址URL")
private String billFileUrl;
/**
......@@ -146,6 +149,7 @@ public class RepairBackBill {
/**
* 维修完成出库详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "维修完成出库详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
private String backCheckDetail;
/**
......@@ -156,6 +160,7 @@ public class RepairBackBill {
/**
* 维修完成接收入库详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "维修完成接收入库详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
private String backReciveCheckDetail;
/**
......
dev-repair/src/main/java/com/tykj/dev/device/repair/subject/domin/RepairSendBill.java
浏览文件 @ bee87ec4
......@@ -99,11 +99,13 @@ public class RepairSendBill {
@ApiModelProperty(value = "维修状态(0:维修任务待审核,1:维修任务审核失败,2:维修装备送到上级中,3:上级接收维修装备待审核,4:上级接收维修装备审核失败,5:维修中,6:维修完成退回中,7:维修完成)")
private Integer repairStatus;
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "Ǵ作为分隔符,维修装备的主键id加备注,例如x1Ǵ备注1Ǵx2Ǵ备注2Ǵx,意为id为1的装备在维修，备注为备注1,id为2的装备在维修，备注为备注2")
private String repairDeviceDetail;
/**
* 送修装备出库详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "送修装备出库详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
private String repairDeviceCheckDetail;
/**
......@@ -114,6 +116,7 @@ public class RepairSendBill {
/**
* 送修装备接收入库详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "送修装备接收入库详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
private String repairReciveCheckDetail;
/**
......@@ -129,6 +132,7 @@ public class RepairSendBill {
/**
* 出库附件文件地址URL
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "出库附件文件地址URL")
private String fileUrl;
/**
......@@ -139,6 +143,7 @@ public class RepairSendBill {
/**
* 入库附件文件地址URL
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "入库附件文件地址URL")
private String receiveFileUrl;
/**
......@@ -149,6 +154,7 @@ public class RepairSendBill {
/**
* 账单文件地址URL
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "账单文件地址URL")
private String billFileUrl;
/**
......
dev-retired/src/main/java/com/tykj/dev/device/retired/entity/domain/DeviceRetiredBill.java
浏览文件 @ bee87ec4
......@@ -61,6 +61,7 @@ public class DeviceRetiredBill {
/**
* 列装库主键id(x作为分隔符)，例如1x2,意为列装库id为1和2的退装
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "列装库主键id(x作为分隔符)，例如x1x2,意为列装库id为1和2的退装")
private String retiredDetail;
/**
......
dev-rfid/src/main/java/com/tykj/dev/rfid/entity/domin/RfidChangeBill.java
浏览文件 @ bee87ec4
......@@ -100,6 +100,7 @@ public class RfidChangeBill {
/**
* 附件文件地址URL
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "附件文件地址URL")
private String fileUrl;
......
dev-scrap/pom.xml
浏览文件 @ bee87ec4
......@@ -27,5 +27,9 @@
<groupId>com.tykj.dev</groupId>
<artifactId>blockcha</artifactId>
</dependency>
<dependency>
<groupId>com.tykj</groupId>
<artifactId>dev-task</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
dev-scrap/src/main/java/com/tykj/dev/device/scrap/controller/DeviceScrapController.java
浏览文件 @ bee87ec4
......@@ -2,11 +2,19 @@ package com.tykj.dev.device.scrap.controller;
import com.tykj.dev.config.swagger.AutoDocument;
import com.tykj.dev.device.library.service.DeviceLibraryService;
import com.tykj.dev.device.library.service.DeviceLogService;
import com.tykj.dev.device.library.subject.Dto.DeviceLogDto;
import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
import com.tykj.dev.device.library.subject.vo.FileVo;
import com.tykj.dev.device.scrap.service.ScrapBillService;
import com.tykj.dev.device.scrap.subject.domin.ScrapBill;
import com.tykj.dev.device.scrap.subject.vo.ScrapSaveVo;
import com.tykj.dev.device.scrap.subject.vo.ScrapSelectVo;
import com.tykj.dev.device.scrap.subject.vo.UploadVo;
import com.tykj.dev.device.task.service.TaskService;
import com.tykj.dev.device.task.subject.bto.TaskBto;
import com.tykj.dev.device.user.util.UserUtils;
import com.tykj.dev.misc.base.StatusEnum;
import com.tykj.dev.misc.utils.StringSplitUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -34,6 +42,15 @@ public class DeviceScrapController {
@Autowired
private ScrapBillService scrapBillService;
@Autowired
private UserUtils userUtils;
@Autowired
private TaskService taskService;
@Autowired
private DeviceLogService deviceLogService;
@ApiOperation(value = "查询列表", notes = "可以通过这个接口查询销毁单")
@PostMapping(value = "/summary")
public ResponseEntity selectRepairBill(@RequestBody ScrapSelectVo scrapSelectVo) {
......@@ -54,7 +71,7 @@ public class DeviceScrapController {
return ResponseEntity.ok(list);
}
@ApiOperation(value = "提交报废单", notes = "提交报废单")
@ApiOperation(value = "发起报废", notes = "发起报废单")
@PostMapping(value = "/form")
@Transactional(rollbackFor = Exception.class)
public ResponseEntity commitScrap(@RequestBody @Validated ScrapSaveVo scrapSaveVo) {
......@@ -78,9 +95,41 @@ public class DeviceScrapController {
int year = calendar.get(Calendar.YEAR);
String num = "NO:第" + year + "BF" + scrapBill1.getId() + "号";
scrapBill1.setDocNumber(num);
scrapBillService.update(scrapBill1);
return ResponseEntity.ok(scrapBill1);
ScrapBill scrapBill2 = scrapBillService.update(scrapBill1);
//发起任务
Integer userId = userUtils.getCurrentUserId();
List<Integer> userIds = new ArrayList<>();
userIds.add(userId);
userIds.add(0);
TaskBto taskBto = new TaskBto(StatusEnum.WAIT_UPLOAD_SCRAP_FILE.id, "报废业务", null, ".", scrapBill2.getId(), 23, userUtils.getCurrentUnitId(), 1, null, userIds);
taskService.start(taskBto);
//添加装备日志
for (Integer id:scrapSaveVo.getDeviceIds()) {
DeviceLogDto deviceLogDto = new DeviceLogDto(id,"发起报废",null);
deviceLogService.addLog(deviceLogDto);
}
return ResponseEntity.ok("发起报废成功");
}
@ApiOperation(value = "上传报废单", notes = "上传报废单")
@PostMapping(value = "/upload")
@Transactional(rollbackFor = Exception.class)
public ResponseEntity uploadScrap(@RequestBody @Validated UploadVo uploadVo) {
TaskBto taskBto = taskService.get(uploadVo.getTaskId());
ScrapBill scrapBill = scrapBillService.getOne(taskBto.getBillId());
scrapBill.setFileName(uploadVo.getFileName());
scrapBill.setFileUrl(uploadVo.getFileUrl());
scrapBillService.update(scrapBill);
taskService.addInvolveUser(taskBto,userUtils.getCurrentUserId());
taskService.moveToEnd(taskBto);
List<FileVo> fileVos = new ArrayList<>();
fileVos.add(new FileVo("报废单", scrapBill.getFileName(), scrapBill.getFileUrl()));
//添加装备日志
for (Integer id:StringSplitUtil.userIdSplit(scrapBill.getScrapDetail())) {
DeviceLogDto deviceLogDto = new DeviceLogDto(id,"上传报废单",fileVos);
deviceLogService.addLog(deviceLogDto);
}
return ResponseEntity.ok("上传成功");
}
}
dev-scrap/src/main/java/com/tykj/dev/device/scrap/subject/domin/ScrapBill.java
浏览文件 @ bee87ec4
......@@ -61,15 +61,19 @@ public class ScrapBill {
@ApiModelProperty(value = "报废单文件名")
private String fileName;
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "报废单文件URL")
private String fileUrl;
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "报废装备主键Id以x拼接")
private String scrapDetail;
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "报废型号，以,拼接")
private String models;
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "报废名称，以,拼接")
private String names;
......
dev-scrap/src/main/java/com/tykj/dev/device/scrap/subject/vo/UploadVo.java 0 → 100644
浏览文件 @ bee87ec4
package com.tykj.dev.device.scrap.subject.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
/**
* @author dengdiyi
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@ApiModel(value = "报废单上传类", description = "报废单上传类")
public class UploadVo {
@Min(value = 1,message = "taskId不能小于1")
@ApiModelProperty(value = "任务id")
private Integer taskId;
@NotNull(message = "fileName不能为空")
@ApiModelProperty(value = "报废单名字")
private String fileName;
@NotNull(message = "fileUrl不能为空")
@ApiModelProperty(value = "报废单路径")
private String fileUrl;
}
dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/subject/domin/SelfCheckBill.java
浏览文件 @ bee87ec4
......@@ -81,6 +81,7 @@ public class SelfCheckBill {
/**
* 自查详情(装备主键id+核对结果(0缺失1无误2新增,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的新增
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "自查详情(装备主键id+核对结果(0缺失1无误2新增,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的新增")
private String checkDetail;
/**
......@@ -125,6 +126,7 @@ public class SelfCheckBill {
/**
* 自查未入库新增装备详情(RFID卡号以.为分隔符)
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "自查未入库新增装备详情(RFID卡号以.为分隔符)")
private String newDeviceDetail;
......
dev-statistical/src/main/java/com/tykj/dev/statistical/service/impl/BigScreenServiceImpl.java
浏览文件 @ bee87ec4
......@@ -256,6 +256,10 @@ public class BigScreenServiceImpl implements BigScreenService {
repairDevice.setRepairStatus("完成");
repairDevices.add(repairDevice);
break;
case 7:
repairDevice.setRepairStatus("完成");
repairDevices.add(repairDevice);
break;
default:break;
}
}
......
dev-storage/src/main/java/com/tykj/dev/device/storage/controller/StorageBillController.java
浏览文件 @ bee87ec4
......@@ -28,10 +28,7 @@ import com.tykj.dev.device.user.util.UserUtils;
import com.tykj.dev.misc.base.BusinessEnum;
import com.tykj.dev.misc.base.StatusEnum;
import com.tykj.dev.misc.exception.ApiException;
import com.tykj.dev.misc.utils.DeviceSeqUtil;
import com.tykj.dev.misc.utils.JacksonUtil;
import com.tykj.dev.misc.utils.ResultUtil;
import com.tykj.dev.misc.utils.StringSplitUtil;
import com.tykj.dev.misc.utils.*;
import com.tykj.dev.socket.MyWebSocket;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -200,8 +197,8 @@ public class StorageBillController {
taskEntity1 = taskService.get(storageBillSaveVo.getTaskId());
StorageBill storageBill = storageBillService.getOne(taskEntity1.getBillId());
StorageBill storageBill1 = storageBillSaveVo.toDo();
storageBill1.setId(storageBill.getId());
storageBillEntity = storageBillService.update(storageBill1);
MapperUtils.copyNoNullProperties(storageBill1,storageBill);
storageBillEntity = storageBillService.update(storageBill);
//结束Task
taskService.moveToEnd(taskEntity1);
}
......@@ -360,6 +357,7 @@ public class StorageBillController {
//发起任务
TaskBto taskBto = new TaskBto(StatusEnum.WAIT_STORAGE.id, "入库业务", null, ".", storageBill.getId(), 2, userUtils.getCurrentUnitId(), 0, null, userIds);
TaskBto taskBto1 = taskService.start(taskBto);
myWebSocket.sendMessage1();
return ResponseEntity.ok("保存成功"+taskBto1.getId());
}
else {
......@@ -367,10 +365,10 @@ public class StorageBillController {
TaskBto taskBto = taskService.get(storageBillSaveVo.getTaskId());
StorageBill storageBill = storageBillService.getOne(taskBto.getBillId());
StorageBill storageBill1 = storageBillSaveVo.toDo();
storageBill1.setId(storageBill.getId());
storageBill1.setStorageStatus(0);
storageBillService.update(storageBill1);
return ResponseEntity.ok("更新成功");
MapperUtils.copyNoNullProperties(storageBill1,storageBill);
storageBillService.update(storageBill);
return ResponseEntity.ok("更新成功"+taskBto.getId());
}
}
......@@ -381,6 +379,7 @@ public class StorageBillController {
//任务封存
TaskBto taskBto = taskService.get(taskId);
taskService.moveToArchive(taskBto);
myWebSocket.sendMessage1();
return ResponseEntity.ok("删除成功");
}
......
dev-storage/src/main/java/com/tykj/dev/device/storage/subject/domin/StorageBill.java
浏览文件 @ bee87ec4
......@@ -89,6 +89,7 @@ public class StorageBill {
/**
* 账单文件地址URL
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "账单文件地址URL")
private String fileUrl;
/**
......@@ -99,6 +100,7 @@ public class StorageBill {
/**
* 入库附件文件地址URL
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "入库附件文件地址URL")
private String receiveFileUrl;
/**
......@@ -114,6 +116,7 @@ public class StorageBill {
/**
* 入库详情(列装主键idx列装数量x装备主键id(字符,作为不同列装的分隔符)),例如1x2x3x4,2x1x5,意为列装库中id为1的入库2件(装备id分别为3，4),列装库中id为2的入库1件(装备id为5)
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "入库详情(装备主键id+核对结果(0缺失1无误2不匹配,字符x作为分隔符)),例如10x21x32,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
private String storageDetail;
/**
......
dev-task/src/main/java/com/tykj/dev/device/task/subject/domin/Task.java
浏览文件 @ bee87ec4
......@@ -79,18 +79,22 @@ public class Task {
@ApiModelProperty(value = "所属单位")
private Integer ownUnit;
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "用户置顶信息")
private String topFlagDetail;
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "用户阅读信息")
private String userReadDetail;
@ApiModelProperty(value = "数字类型，用于代表指针目前的下标")
private Integer currentPoint;
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "自定义信息，针对不同业务需要保存一些自定信息")
private String customInfo;
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "工作涉及人员id(x作为分隔符),例如x1x2x,意为id为1,2的用户参与了该任务")
private String involveUsers;
......
dev-task/src/main/java/com/tykj/dev/device/task/subject/domin/TaskLog.java
浏览文件 @ bee87ec4
......@@ -51,6 +51,7 @@ public class TaskLog {
/**
* 相关附件信息(Ǵ作为每个附件分隔符,Ǒ作为附件内部分隔符,例如name1Ǒurl1Ǒ配发单Ǵname2Ǒurl2Ǒ入库确认单Ǵ)
*/
@Column(columnDefinition = "TEXT")
@ApiModelProperty(value = "相关附件信息(Ǵ作为每个附件分隔符,Ǒ作为附件内部分隔符,例如name1Ǒurl1Ǒ配发单Ǵname2Ǒurl2Ǒ入库确认单Ǵ)")
private String fileDetail;
/**
......
dev-union/src/main/java/com/tykj/dev/union/LogAspect.java
浏览文件 @ bee87ec4
......@@ -24,6 +24,8 @@ import com.tykj.dev.device.repair.subject.domin.RepairBackBill;
import com.tykj.dev.device.repair.subject.domin.RepairBill;
import com.tykj.dev.device.repair.subject.domin.RepairSendBill;
import com.tykj.dev.device.retired.service.DeviceRetiredBillService;
import com.tykj.dev.device.scrap.service.ScrapBillService;
import com.tykj.dev.device.scrap.subject.domin.ScrapBill;
import com.tykj.dev.device.selfcheck.service.SelfCheckBillService;
import com.tykj.dev.device.sendback.entity.domain.SendBackBill;
import com.tykj.dev.device.sendback.entity.domain.SendBackBillDetail;
......@@ -439,6 +441,16 @@ public class LogAspect {
getFieldsParam(workHandoverDao.getOne(outPutTask.getBillId()));
}
break;
case 23:
ScrapBillService scrapBillService = SpringUtils.getBean("scrapBillServiceImpl");
if (scrapBillService != null) {
ScrapBill scrapBill = scrapBillService.getOne(outPutTask.getBillId());
getFieldsParam(scrapBill);
if ((this.oldStatus.equals(StatusEnum.WAIT_UPLOAD_SCRAP_FILE.id) && this.newStatus.equals(StatusEnum.END.id))) {
this.fileVos.add(new FileVo("报废单", scrapBill.getFileName(), scrapBill.getFileUrl()));
}
}
break;
default:
break;
}
......
dev-user/src/main/java/com/tykj/dev/device/user/config/SecurityConfig.java
浏览文件 @ bee87ec4
......@@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpMethod;
import org.springframework.security.config.annotation.ObjectPostProcessor;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.WebSecurity;
......@@ -21,8 +20,6 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.core.session.SessionRegistryImpl;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.NoOpPasswordEncoder;
import org.springframework.security.web.access.intercept.FilterSecurityInterceptor;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
import org.springframework.security.web.authentication.session.ConcurrentSessionControlAuthenticationStrategy;
import org.springframework.security.web.session.ConcurrentSessionFilter;
......@@ -149,7 +146,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
@Override
public void configure(WebSecurity web) {
//swagger静态资源访问
web.ignoring().antMatchers("/v2/api-docs", "/v2/api-docs-ext", "/configuration/ui", "/swagger-resources/**", "/configuration/security", "/swagger-ui/", "/swagger-ui/**", "/swagger-ui.html", "/doc.html", "/webjars/**", "/swagger-resources/configuration/ui", "**/swagge‌​r-ui.html", "/static/**", "/**/index.html", "index.html", "/js/**", "/css/**", "/fonds/**", "/img/**","/access/send","/user/s");
web.ignoring().antMatchers("/v2/api-docs", "/v2/api-docs-ext", "/configuration/ui", "/swagger-resources/**", "/configuration/security", "/swagger-ui/", "/swagger-ui/**", "/swagger-ui.html", "/doc.html", "/webjars/**", "/swagger-resources/configuration/ui", "**/swagge‌​r-ui.html", "/static/**", "/**/index.html", "**/index.html", "/index.html", "/js/**", "/css/**", "/fonds/**", "/img/**","/access/send","/user/s");
}
@Bean
......
dev-user/src/main/java/com/tykj/dev/device/user/task/userRun.java
浏览文件 @ bee87ec4
......@@ -95,6 +95,7 @@ public class userRun implements CommandLineRunner {
userRoleRun();
log.info("用户模块模拟数据生成");
} else {
// userService.updateUserPass();
log.info("已有用户不新建");
}
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论