Skip to content

D
dev_move
提交 b6b0462e authored 作者: 邓砥奕's avatar 邓砥奕
浏览文件
操作

代码提交

上级 e7aeec77
隐藏空白字符变更
内嵌 并排
正在显示 包含 615 行增加 和 115 行删除
src/main/java/com/example/removetolocal/config/base/DeviceInvisibleRange.java 0 → 100644
浏览文件 @ b6b0462e
package com.example.removetolocal.config.base;
import lombok.AllArgsConstructor;
/**
* @author dengdiyi
* 装备可见范围枚举
*/
@AllArgsConstructor
public enum DeviceInvisibleRange {
/**
* 省一级
*/
SHEN(1, "省一级"),
/**
* 市一级
*/
SHI(2, "市一级"),
/**
* 县一级
*/
XIAN(3, "县一级");
public Integer id;
public String name;
}
src/main/java/com/example/removetolocal/config/base/DeviceSecretLevel.java 0 → 100644
浏览文件 @ b6b0462e
package com.example.removetolocal.config.base;
import lombok.AllArgsConstructor;
/**
* @author dengdiyi
* 装备可见范围枚举
*/
@AllArgsConstructor
public enum DeviceSecretLevel {
/**
* 省一级
*/
SECRETLEVEL_1(1, "绝密"),
/**
* 县一级
*/
SECRETLEVEL_2(2, "秘密"),
/**
* 市一级
*/
SECRETLEVEL_3(3, "机密"),
/**
* 县一级
*/
SECRETLEVEL_4(4, "无");
public Integer id;
public String name;
}
src/main/java/com/example/removetolocal/config/base/DeviceStyle.java 0 → 100644
浏览文件 @ b6b0462e
package com.example.removetolocal.config.base;
import lombok.AllArgsConstructor;
/**
* @author dengdiyi
* 装备形态枚举
*/
@AllArgsConstructor
public enum DeviceStyle {
/**
* 密码机
*/
STYLE_1(1, "密码机"),
/**
* 密码模块
*/
STYLE_2(2, "密码模块"),
/**
* 密码芯片
*/
STYLE_3(3, "密码芯片"),
/**
* 说明书
*/
STYLE_4(4, "说明书"),
/**
* U盘
*/
STYLE_5(5, "U盘"),
/**
* 光盘
*/
STYLE_6(6, "光盘"),
/**
* 密码软件
*/
STYLE_7(7, "密码软件"),
/**
* 密码卡
*/
STYLE_8(8, "密码卡"),
STYLE_9(9, "其它");
public Integer id;
public String name;
}
src/main/java/com/example/removetolocal/config/base/GlobalMap.java 0 → 100644
浏览文件 @ b6b0462e
package com.example.removetolocal.config.base;
import java.util.Arrays;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* @author dengdiyi
*/
public class GlobalMap {
private static final Map<Integer, MatchingRange> matchingRangeMap;
private static final Map<Integer, DeviceInvisibleRange> deviceInvisibleRangeMap;
private static final Map<Integer,DeviceSecretLevel> deviceSecretLevelMap;
private static final Map<Integer, DeviceStyle> deviceStyleMap;
static {
deviceStyleMap = Arrays.stream(DeviceStyle.values())
.collect(Collectors.toMap(deviceStyle -> deviceStyle.id, Function.identity()));
matchingRangeMap = Arrays.stream(MatchingRange.values())
.collect(Collectors.toMap(matchingRange -> matchingRange.id, Function.identity()));
deviceInvisibleRangeMap = Arrays.stream(DeviceInvisibleRange.values())
.collect(Collectors.toMap(deviceInvisibleRange -> deviceInvisibleRange.id, Function.identity()));
deviceSecretLevelMap = Arrays.stream(DeviceSecretLevel.values())
.collect(Collectors.toMap(deviceSecretLevel -> deviceSecretLevel.id, Function.identity()));
}
public static Map<Integer, DeviceStyle> getDeviceStyleMap() {
return deviceStyleMap;
}
public static Map<Integer, MatchingRange> getMatchingRangeMap() {
return matchingRangeMap;
}
public static Map<Integer, DeviceSecretLevel> getDeviceSecretLevelMap() {
return deviceSecretLevelMap;
}
public static Map<Integer, DeviceInvisibleRange> getDeviceInvisibleRangeMap() {
return deviceInvisibleRangeMap;
}
}
src/main/java/com/example/removetolocal/config/base/MatchingRange.java 0 → 100644
浏览文件 @ b6b0462e
package com.example.removetolocal.config.base;
import lombok.AllArgsConstructor;
/**
* @author dengdiyi
* 配用范围枚举
*/
@AllArgsConstructor
public enum MatchingRange {
/**
* 中央到省
*/
MATCHINGRANGE_2(2, "中央到省"),
/**
* 省以下纵向
*/
PROVINCIAL_VERTICAL(1, "省以下纵向"),
/**
* 省以下横向
*/
MATCHINGRANGE_3(3, "省以下横向"),
/**
* 其它
*/
MATCHINGRANGE_4(4, "其它");
public Integer id;
public String name;
}
src/main/java/com/example/removetolocal/newentity/dao/NewRepairBackBillDao.java
浏览文件 @ b6b0462e
......@@ -13,5 +13,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
*/
public interface NewRepairBackBillDao extends JpaRepository<RepairBackBill, Integer>, JpaSpecificationExecutor<RepairBackBill> {
RepairBackBill findByDeviceRepairBillId(Integer repairBillId);
RepairBackBill findByOldId(Integer oldId);
}
src/main/java/com/example/removetolocal/newentity/dao/NewRepairDetailDao.java
浏览文件 @ b6b0462e
......@@ -8,4 +8,6 @@ import java.util.List;
public interface NewRepairDetailDao extends JpaRepository<RepairDetail, Integer>, JpaSpecificationExecutor<RepairDetail> {
List<RepairDetail> findByDeviceRepairBillId(Integer billId);
RepairDetail findByPid(Integer pid);
RepairDetail findByOldId(Integer oldId);
}
src/main/java/com/example/removetolocal/newentity/entity/Area.java
浏览文件 @ b6b0462e
......@@ -48,6 +48,7 @@ public class Area {
@Column(name = "father_id")
private Integer fatherId;
@Column(name = "old_id")
private String oldId;
}
src/main/java/com/example/removetolocal/newentity/entity/DeviceLibrary.java
浏览文件 @ b6b0462e
......@@ -172,4 +172,6 @@ public class DeviceLibrary {
@Column(name = "record_id")
private String recordId;
@Column(name = "old_id")
private Integer oldId;
}
src/main/java/com/example/removetolocal/newentity/entity/DeviceLog.java
浏览文件 @ b6b0462e
......@@ -83,4 +83,6 @@ public class DeviceLog {
@Column(name = "record_id")
private String recordId;
@Column(name = "old_id")
private Integer oldId;
}
src/main/java/com/example/removetolocal/newentity/entity/Mgrcert.java
浏览文件 @ b6b0462e
......@@ -60,5 +60,6 @@ public class Mgrcert {
@Column(name = "cert_name")
private String certName;
@Column(name = "old_id")
private Integer oldId;
}
src/main/java/com/example/removetolocal/newentity/entity/PackingLibrary.java
浏览文件 @ b6b0462e
......@@ -172,4 +172,6 @@ public class PackingLibrary {
@Column(name = "delete_tag")
private Integer deleteTag = 0;
@Column(name = "old_id")
private Integer oldId;
}
src/main/java/com/example/removetolocal/newentity/entity/RepairBackBill.java
浏览文件 @ b6b0462e
......@@ -88,7 +88,7 @@ public class RepairBackBill {
* deleteTag
*/
@Column(name = "delete_tag")
private Integer deleteTag;
private Integer deleteTag = 0;
/**
* deviceRepairBillId
*/
......@@ -217,4 +217,12 @@ public class RepairBackBill {
@Column(name = "send_files")
private String sendFiles;
@Column(name = "old_id")
private Integer oldId;
@Column(name = "receive_files",columnDefinition = "TEXT")
private String receiveFiles;
@Column(name = "script_json",columnDefinition = "TEXT")
private String scriptJson;
}
src/main/java/com/example/removetolocal/newentity/entity/RepairBill.java
浏览文件 @ b6b0462e
......@@ -48,7 +48,7 @@ public class RepairBill {
* deleteTag
*/
@Column(name = "delete_tag")
private Integer deleteTag;
private Integer deleteTag = 0;
/**
* docNum
*/
......@@ -122,4 +122,6 @@ public class RepairBill {
@LastModifiedBy
private Integer updateUserId;
@Column(name = "old_id")
private Integer oldId;
}
src/main/java/com/example/removetolocal/newentity/entity/RepairDetail.java
浏览文件 @ b6b0462e
......@@ -43,7 +43,7 @@ public class RepairDetail {
* deleteTag
*/
@Column(name = "delete_tag")
private Integer deleteTag;
private Integer deleteTag = 0;
/**
* deviceId
*/
......@@ -147,4 +147,9 @@ public class RepairDetail {
@Column(name = "pid")
private Integer pid;
@Column(name = "old_id")
private Integer oldId;
@Column(name = "back_remark")
private String backRemark;
}
src/main/java/com/example/removetolocal/newentity/entity/RepairSendBill.java
浏览文件 @ b6b0462e
......@@ -63,7 +63,7 @@ public class RepairSendBill {
* deleteTag
*/
@Column(name = "delete_tag")
private Integer deleteTag;
private Integer deleteTag = 0;
/**
* deviceRepairBillId
*/
......@@ -209,7 +209,15 @@ public class RepairSendBill {
/**
* sendFiles
*/
@Column(name = "send_files")
@Column(name = "send_files",columnDefinition = "TEXT")
private String sendFiles;
@Column(name = "receive_files",columnDefinition = "TEXT")
private String receiveFiles;
@Column(name = "script_json",columnDefinition = "TEXT")
private String scriptJson;
@Column(name = "old_id")
private Integer oldId;
}
src/main/java/com/example/removetolocal/newentity/entity/Task.java
浏览文件 @ b6b0462e
......@@ -69,7 +69,7 @@ public class Task {
* deleteTag
*/
@Column(name = "delete_tag")
private Integer deleteTag;
private Integer deleteTag = 0;
/**
* involveUsers
*/
......
src/main/java/com/example/removetolocal/newentity/entity/TaskLog.java
浏览文件 @ b6b0462e
......@@ -44,7 +44,7 @@ public class TaskLog {
* deleteTag
*/
@Column(name = "delete_tag")
private Integer deleteTag;
private Integer deleteTag = 0;
/**
* fileDetail
*/
......@@ -78,4 +78,6 @@ public class TaskLog {
@Column(name = "record_id")
private String recordId;
@Column(name = "old_id")
private Integer oldId;
}
src/main/java/com/example/removetolocal/newentity/entity/Units.java
浏览文件 @ b6b0462e
......@@ -65,4 +65,7 @@ public class Units {
@Column(name = "show_order")
private Integer showOrder;
@Column(name = "old_id")
private String oldId;
}
src/main/java/com/example/removetolocal/newentity/entity/User.java
浏览文件 @ b6b0462e
......@@ -112,4 +112,9 @@ public class User {
@Column(name = "train_status")
private Integer trainStatus;
@Column(name = "old_id")
private String oldId;
@Column(name = "old_code")
private String oldCode;
}
src/main/java/com/example/removetolocal/newrepair/vo/ScriptSaveVo.java 0 → 100644
浏览文件 @ b6b0462e
package com.example.removetolocal.newrepair.vo;
import com.example.removetolocal.utils.JacksonUtil;
import lombok.Data;
/**
* @author dengdiyi
*/
@Data
public class ScriptSaveVo {
private String model;
private String type;
private String name;
private String seqNumber;
private String secretLevel;
private String invisibleRange;
private String allotType;
private Integer num;
private Integer id;
private String remark;
private Integer detailId;
private String allotTypeNum;
public String toJson(){
return JacksonUtil.toJSon(this);
}
}
src/main/java/com/example/removetolocal/newstorage/bto/TaskBto.java
浏览文件 @ b6b0462e
......@@ -100,6 +100,20 @@ public class TaskBto {
return task;
}
/**
* bto类转化为do类
*/
public com.example.removetolocal.newentity.entity.Task toDo2() {
//复制相同属性
ModelMapper modelMapper = BeanHelper.getUserMapper();
com.example.removetolocal.newentity.entity.Task task = modelMapper.map(this, com.example.removetolocal.newentity.entity.Task.class);
//set组合字段
task.setInvolveUsers(StringSplitUtil.idListToString(this.involveUserIdList));
task.setUserReadDetail(StringSplitUtil.idListToString(this.userReadDetailList));
task.setTopFlagDetail(StringSplitUtil.idListToString(this.topFlagDetailList));
return task;
}
/**
* @return 最后一个参与该任务的人员id, 用于任务状态变化时人员不变的情况
*/
......
src/main/java/com/example/removetolocal/service/MysqlToSTService.java
浏览文件 @ b6b0462e
......@@ -2,4 +2,5 @@ package com.example.removetolocal.service;
public interface MysqlToSTService {
void dbToDb();
void oldIdMove();
}
src/main/java/com/example/removetolocal/service/impl/DeviceServiceImpl.java
浏览文件 @ b6b0462e
......@@ -101,6 +101,8 @@ public class DeviceServiceImpl implements DeviceService {
packingLibrary.setNature(devCatalogEntity.getPackingProperty());
if (devCatalogEntity.getStyle()!=null) {
switch (devCatalogEntity.getStyle()) {
case 0:
packingLibrary.setType(9);
case 1:
packingLibrary.setType(7);
break;
......@@ -130,6 +132,9 @@ public class DeviceServiceImpl implements DeviceService {
break;
}
}
else {
packingLibrary.setType(9);
}
if (devCatalogEntity.getVisibleRange()!=null) {
switch (devCatalogEntity.getVisibleRange()) {
case 1:
......@@ -158,19 +163,22 @@ public class DeviceServiceImpl implements DeviceService {
packingLibrary.setMatchingRange(1);
break;
case 3:
packingLibrary.setMatchingRange(2);
packingLibrary.setMatchingRange(3);
break;
case 4:
packingLibrary.setMatchingRange(5);
packingLibrary.setMatchingRange(4);
break;
case 5:
packingLibrary.setMatchingRange(4);
packingLibrary.setMatchingRange(1);
break;
default:
packingLibrary.setMatchingRange(devCatalogEntity.getMatchingArea());
break;
}
}
else {
packingLibrary.setMatchingRange(4);
}
if (devCatalogEntity.getAppType()!=null) {
switch (devCatalogEntity.getAppType()) {
case 4:
......@@ -291,7 +299,7 @@ public class DeviceServiceImpl implements DeviceService {
deviceLibrary.setProdNumber(devRecordEntity.getProNum());
// deviceLibrary.setRfidCardId(devRecordEntity.getRfid());
// deviceLibrary.setRfidSurfaceId(makeRfidNumber(packingLibrary.getType()==null?"0":String.valueOf(packingLibrary.getType()),devRecordEntity.getSerNum(),devRecordEntity.getProNum(),devRecordEntity.getModel()));
deviceLibrary.setRfidSurfaceId(deviceLibrary.getSeqNumber());
deviceLibrary.setRfidSurfaceId(null);
if (devRecordEntity.getWhereUnit()!=null){
if (sysCompanyDao.findById(devRecordEntity.getWhereUnit()).isPresent()) {
deviceLibrary.setLocationUnit(sysCompanyDao.findById(devRecordEntity.getWhereUnit()).get().getCompanyName());
......
src/main/java/com/example/removetolocal/service/impl/MysqlToSTServiceImpl.java
浏览文件 @ b6b0462e
......@@ -160,14 +160,54 @@ public class MysqlToSTServiceImpl implements MysqlToSTService {
log.info("task_log表迁移成功");
userRoleToSt();
log.info("user_role表迁移成功");
repairBillToSt();
log.info("repair_bill表迁移成功");
repairSendBillToSt();
log.info("repair_send_bill表迁移成功");
repairBackBillToSt();
log.info("repair_back_bill表迁移成功");
repairDetailToSt();
log.info("repair_detail表迁移成功");
// repairBillToSt();
// log.info("repair_bill表迁移成功");
// repairSendBillToSt();
// log.info("repair_send_bill表迁移成功");
// repairBackBillToSt();
// log.info("repair_back_bill表迁移成功");
// repairDetailToSt();
// log.info("repair_detail表迁移成功");
}
@Override
public void oldIdMove() {
userDao.findAll().forEach(user -> {
com.example.removetolocal.newentity.entity.User user1 = newUserDaoSt.findById(user.getUserId()).get();
user1.setOldCode(user.getOldCode());
user1.setOldId(user.getOldId());
newUserDaoSt.save(user1);
});
unitsDao.findAll().forEach(units -> {
com.example.removetolocal.newentity.entity.Units units1 = newUnitsDaoSt.findById(units.getUnitId()).get();
units1.setOldId(units.getOldId());
newUnitsDaoSt.save(units1);
});
mgrcertDao.findAll().forEach(mgrcert -> {
com.example.removetolocal.newentity.entity.Mgrcert units1 = newMgrcertDaoSt.findById(mgrcert.getId()).get();
units1.setOldId(mgrcert.getOldId());
newMgrcertDaoSt.save(units1);
});
areaDao.findAll().forEach(area -> {
com.example.removetolocal.newentity.entity.Area units1 = newAreaDaoSt.findById(area.getId()).get();
units1.setOldId(area.getOldId());
newAreaDaoSt.save(units1);
});
deviceLibraryDao.findAll().forEach(deviceLibrary -> {
com.example.removetolocal.newentity.entity.DeviceLibrary units1 = newDeviceLibraryDaoSt.findById(deviceLibrary.getId()).get();
units1.setOldId(deviceLibrary.getOldId());
newDeviceLibraryDaoSt.save(units1);
});
packingLibraryDao.findAll().forEach(packingLibrary -> {
com.example.removetolocal.newentity.entity.PackingLibrary units1 = newPackingLibraryDaoSt.findById(packingLibrary.getId()).get();
units1.setOldId(packingLibrary.getOldId());
newPackingLibraryDaoSt.save(units1);
});
deviceLogDao.findAll().forEach(deviceLog -> {
com.example.removetolocal.newentity.entity.DeviceLog units1 = newDeviceLogDao.findById(deviceLog.getId()).get();
units1.setOldId(deviceLog.getOldId());
newDeviceLogDao.save(units1);
});
}
private void userRoleToSt(){
......
src/main/java/com/example/removetolocal/service/impl/RepairServiceImpl.java
浏览文件 @ b6b0462e
package com.example.removetolocal.service.impl;
import com.example.removetolocal.config.base.GlobalMap;
import com.example.removetolocal.newdevice.dao.DeviceLibraryDao;
import com.example.removetolocal.newdevice.domin.DeviceLibrary;
import com.example.removetolocal.newrepair.dao.RepairBackBillDao;
import com.example.removetolocal.newrepair.dao.RepairBillDao;
import com.example.removetolocal.newrepair.dao.RepairDetailDao;
import com.example.removetolocal.newrepair.dao.RepairSendBillDao;
import com.example.removetolocal.newrepair.entity.RepairBackBill;
import com.example.removetolocal.newrepair.entity.RepairBill;
import com.example.removetolocal.newrepair.entity.RepairDetail;
import com.example.removetolocal.newrepair.entity.RepairSendBill;
import com.example.removetolocal.newentity.dao.*;
import com.example.removetolocal.newentity.entity.RepairBackBill;
import com.example.removetolocal.newentity.entity.RepairBill;
import com.example.removetolocal.newentity.entity.RepairDetail;
import com.example.removetolocal.newentity.entity.RepairSendBill;
import com.example.removetolocal.newrepair.vo.ScriptSaveVo;
import com.example.removetolocal.newstorage.bto.TaskBto;
import com.example.removetolocal.newstorage.dao.TaskDao;
import com.example.removetolocal.newstorage.dao.TaskLogDao;
import com.example.removetolocal.newstorage.entity.Task;
import com.example.removetolocal.newstorage.entity.TaskLog;
import com.example.removetolocal.newentity.entity.Task;
import com.example.removetolocal.newentity.entity.TaskLog;
import com.example.removetolocal.newuser.dao.UnitsDao;
import com.example.removetolocal.newuser.dao.UserDao;
import com.example.removetolocal.oldentity.*;
import com.example.removetolocal.oldentity.dao.*;
import com.example.removetolocal.service.RepairService;
import com.example.removetolocal.service.UserService;
import com.example.removetolocal.utils.JacksonUtil;
import com.example.removetolocal.utils.StringSplitUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
......@@ -35,13 +34,13 @@ import java.util.stream.Collectors;
public class RepairServiceImpl implements RepairService {
@Autowired
RepairBillDao repairBillDao;
NewRepairBillDao repairBillDao;
@Autowired
RepairSendBillDao repairSendBillDao;
NewRepairSendBillDao repairSendBillDao;
@Autowired
RepairDetailDao repairDetailDao;
NewRepairDetailDao repairDetailDao;
@Autowired
RepairBackBillDao repairBackBillDao;
NewRepairBackBillDao repairBackBillDao;
@Autowired
DevRepairDao devRepairDao;
@Autowired
......@@ -57,11 +56,11 @@ public class RepairServiceImpl implements RepairService {
@Autowired
DevTaskmainDao devTaskmainDao;
@Autowired
TaskDao taskDao;
NewTaskDao taskDao;
@Autowired
DevTasklogDao devTasklogDao;
@Autowired
TaskLogDao taskLogDao;
NewTaskLogDao taskLogDao;
@Autowired
UnitsDao unitsDao;
@Autowired
......@@ -75,7 +74,7 @@ public class RepairServiceImpl implements RepairService {
List<DevRepair> devRepairs = devRepairDao.findAll();
devRepairs.forEach(devRepair -> {
List<DevRepairdetail> devRepairdetails = devRepairdetailDao.findAllByRepairid(devRepair.getId());
if (devRepair.getStatus()==4&& devRepairdetails.stream().noneMatch(devRepairdetail -> devRepairdetail.getStatus() != 7 || (devRepairdetail.getRepairReceiveid() != null && devRepairReceiveDao.findById(devRepairdetail.getRepairReceiveid()).get().getStatus() != 4))){
if (devRepair.getStatus()>0){
RepairBill repairBill = new RepairBill();
repairBill.setCreateTime(devRepair.getApplyTime());
repairBill.setUpdateTime(devRepair.getHandleTime());
......@@ -91,15 +90,24 @@ public class RepairServiceImpl implements RepairService {
repairBill.setDocNum(devRepair.getDocNo());
repairBill.setReceiveUnit(userService.getUnitNameByOldId(devRepair.getHandleUnit()));
repairBill.setSendUnit(userService.getUnitNameByOldId(devRepair.getApplyUnit()));
repairBill.setRepairStatus(4);
if (devRepair.getStatus()==4) {
repairBill.setRepairStatus(4);
}
else {
repairBill.setRepairStatus(2);
}
if (devRepair.getHandleUser()!=null&&!"".equals(devRepair.getHandleUser())) {
repairBill.setRepairUsera(userService.getUserNameByOldId(devRepair.getHandleUser()));
}
if (devRepair.getHandleConfirmUser()!=null&&!"".equals(devRepair.getHandleConfirmUser())) {
repairBill.setRepairUserb(userService.getUserNameByOldId(devRepair.getHandleConfirmUser()));
}
repairBill.setStartUsera(userService.getUserNameByOldId(devRepair.getApplyUser()));
repairBill.setStartUserb(userService.getUserNameByOldId(devRepair.getApplyConfirmUser()));
if (devRepair.getApplyUser()!=null&&!"".equals(devRepair.getApplyUser())) {
repairBill.setStartUsera(userService.getUserNameByOldId(devRepair.getApplyUser()));
}
if (devRepair.getApplyConfirmUser()!=null&&!"".equals(devRepair.getApplyConfirmUser())) {
repairBill.setStartUserb(userService.getUserNameByOldId(devRepair.getApplyConfirmUser()));
}
repairBill.setOldId(devRepair.getId());
RepairBill repairBill1 = repairBillDao.save(repairBill);
RepairSendBill repairSendBill = new RepairSendBill();
......@@ -114,9 +122,16 @@ public class RepairServiceImpl implements RepairService {
repairSendBill.setSendingCount(devRepair.getTotal());
repairSendBill.setReceiveTime(devRepair.getHandleTime());
repairSendBill.setReceiveUnit(repairBill1.getReceiveUnit());
repairSendBill.setRepairStatus(5);
if (devRepair.getStatus()==4) {
repairSendBill.setRepairStatus(5);
}
else {
repairSendBill.setRepairStatus(2);
}
repairSendBill.setRepairDeviceCheckResult("0x0");
repairSendBill.setRepairReciveCheckResult("0x0");
repairSendBill.setSendFiles(devRepair.getReceiptNum());
repairSendBill.setReceiveFiles(devRepair.getAnnex());
List<Integer> deviceIds = new ArrayList<>();
StringBuffer stringBuffer = new StringBuffer();
devRepairdetailDao.findAllByRepairid(devRepair.getId()).forEach(devRepairdetail -> {
......@@ -160,22 +175,127 @@ public class RepairServiceImpl implements RepairService {
repairDetail.setModel(devRepairdetail.getModel());
repairDetail.setName(deviceLibrary.getName());
repairDetail.setOwnUnit(userService.getUnitNameByOldId(devRepairdetail.getOwnUnit()));
repairDetail.setLocationUnit(userService.getUnitNameByOldId(devRepairdetail.getHandleUnit()));
repairDetail.setRemark(devRepairdetail.getErrorDesc());
repairDetail.setRepairStatus(5);
if (devRepairdetail.getFrontRepairid()!=null) {
repairDetail.setPid(repairDetailDao.findByOldId(devRepairdetail.getFrontRepairid()).getId());
}
if (devRepairdetail.getStatus()==7) {
repairDetail.setRepairStatus(5);
}
else if (devRepairdetail.getStatus()==1){
repairDetail.setRepairStatus(0);
if (repairDetail.getPid()!=null){
RepairDetail repairDetail1 = repairDetailDao.findById(repairDetail.getPid()).get();
repairDetail1.setRepairStatus(8);
repairDetailDao.save(repairDetail1);
if (repairDetail1.getPid()!=null){
RepairDetail repairDetail2 = repairDetailDao.findById(repairDetail1.getPid()).get();
repairDetail2.setRepairStatus(8);
repairDetailDao.save(repairDetail2);
}
}
}
else if (devRepairdetail.getStatus()==2){
repairDetail.setRepairStatus(0);
if (repairDetail.getPid()!=null){
RepairDetail repairDetail1 = repairDetailDao.findById(repairDetail.getPid()).get();
repairDetail1.setRepairStatus(8);
repairDetailDao.save(repairDetail1);
if (repairDetail1.getPid()!=null){
RepairDetail repairDetail2 = repairDetailDao.findById(repairDetail1.getPid()).get();
repairDetail2.setRepairStatus(8);
repairDetailDao.save(repairDetail2);
}
}
}
else if(devRepairdetail.getStatus()==3){
repairDetail.setRepairStatus(1);
}
else if (devRepairdetail.getStatus()==4||devRepairdetail.getStatus()==5){
repairDetail.setRepairStatus(2);
if (repairDetail.getPid()!=null){
RepairDetail repairDetail1 = repairDetailDao.findById(repairDetail.getPid()).get();
repairDetail1.setRepairStatus(8);
repairDetailDao.save(repairDetail1);
if (repairDetail1.getPid()!=null){
RepairDetail repairDetail2 = repairDetailDao.findById(repairDetail1.getPid()).get();
repairDetail2.setRepairStatus(8);
repairDetailDao.save(repairDetail2);
}
}
}
repairDetail.setRfidSurfaceId(deviceLibrary.getRfidSurfaceId());
repairDetail.setSeqNumber(deviceLibrary.getSeqNumber());
repairDetail.setType(deviceLibrary.getType());
repairDetail.setRepairBackBillId(devRepairdetail.getRepairReceiveid());
repairDetail.setOldId(devRepairdetail.getId());
repairDetail.setBackRemark(devRepairdetail.getRepairDesc());
repairDetailDao.save(repairDetail);
});
//set scriptSaveVo
repairSendBillDao.findAll().forEach(repairSendBill2 -> {
List<ScriptSaveVo> scriptSaveVos = new ArrayList<>();
List<RepairDetail> repairDetails = repairDetailDao.findByDeviceRepairBillId(repairSendBill2.getDeviceRepairBillId());
repairDetails.forEach(repairDetail -> {
ScriptSaveVo scriptSaveVo = new ScriptSaveVo();
DeviceLibrary deviceLibrary = deviceLibraryDao.findById(repairDetail.getDeviceId()).get();
scriptSaveVo.setDetailId(repairDetail.getId());
scriptSaveVo.setAllotType(GlobalMap.getMatchingRangeMap().get(deviceLibrary.getMatchingRange()).name);
scriptSaveVo.setAllotTypeNum(String.valueOf(deviceLibrary.getMatchingRange()));
scriptSaveVo.setId(deviceLibrary.getId());
scriptSaveVo.setInvisibleRange(GlobalMap.getDeviceInvisibleRangeMap().get(deviceLibrary.getInvisibleRange()).name);
scriptSaveVo.setModel(deviceLibrary.getModel());
scriptSaveVo.setName(deviceLibrary.getName());
scriptSaveVo.setNum(1);
scriptSaveVo.setRemark(repairDetail.getRemark());
scriptSaveVo.setSecretLevel(GlobalMap.getDeviceSecretLevelMap().get(deviceLibrary.getSecretLevel()).name);
scriptSaveVo.setSeqNumber(repairDetail.getSeqNumber());
scriptSaveVo.setType(GlobalMap.getDeviceStyleMap().get(deviceLibrary.getType()).name);
scriptSaveVos.add(scriptSaveVo);
});
repairSendBill2.setScriptJson(JacksonUtil.toJSon(scriptSaveVos));
repairSendBillDao.save(repairSendBill2);
});
//task转换
DevTaskmain devTaskmain = devTaskmainDao.findByTypeAndResourceId(3,devRepair.getId());
if (devTaskmain.getIsComplete()==1||devTaskmain.getIsSeal()==1) {
TaskBto taskBto = devTaskmain.parseToTaskBto();
taskBto.setBillId(repairBill1.getId());
taskBto.setOldId(devTaskmain.getId());
Task task = taskDao.save(taskBto.toDo());
if ("1".equals(devRepair.getApplyUnit())){
taskBto.setBillStatus(704);
taskBto.setCustomInfo("country");
}
Task task = taskDao.save(taskBto.toDo2());
//添加业务日志
List<DevTasklog> devTasklogs = devTasklogDao.findAllByTaskId(devTaskmain.getId());
devTasklogs.forEach(devTasklog -> {
TaskLog taskLog = new TaskLog();
taskLog.setCreateTime(devTasklog.getOperateTime());
taskLog.setCreateUserId(userService.getUserByOldId(devTasklog.getOperater()).getUserId());
taskLog.setUpdateTime(taskLog.getCreateTime());
taskLog.setUpdateUserId(taskLog.getCreateUserId());
taskLog.setFileDetail("Ǵ");
taskLog.setRemark(devTasklog.getNote());
taskLog.setTaskId(task.getId());
taskLog.setOldId(devTasklog.getId());
taskLogDao.save(taskLog);
});
}
else if (devRepair.getStatus()==2){
TaskBto taskBto = devTaskmain.parseToTaskBto();
taskBto.setBillId(repairBill1.getId());
taskBto.setOldId(devTaskmain.getId());
taskBto.setBillStatus(701);
Task task = taskDao.save(taskBto.toDo2());
//生成子任务（发件方上传回执单）
TaskBto taskBto2 = new TaskBto(722, task.getTitle(), task.getId(), task.getNodeIdDetail() + task.getId() + ".", task.getBillId(), 5, unitsDao.findByOldId(devRepair.getApplyUnit()).getUnitId(), 0, null, Collections.singletonList(0));
taskBto2.setCreateUserId(task.getCreateUserId());
taskBto2.setCreateTime(task.getCreateTime());
taskBto2.setUpdateUserId(task.getCreateUserId());
taskBto2.setUpdateTime(task.getCreateTime());
taskDao.save(taskBto2.toDo2());
//添加业务日志
List<DevTasklog> devTasklogs = devTasklogDao.findAllByTaskId(devTaskmain.getId());
devTasklogs.forEach(devTasklog -> {
......@@ -252,6 +372,8 @@ public class RepairServiceImpl implements RepairService {
repairBackBill.setSendUnit(userService.getUnitNameByOldId(devRepairReceive.getApplyUnit()));
repairBackBill.setTitle(devRepairReceive.getTitle());
repairBackBill.setOldId(devRepairReceive.getId());
repairBackBill.setSendFiles(devRepairReceive.getAnnex());
repairBackBill.setReceiveFiles(devRepairReceive.getHandleannex());
RepairBackBill repairBackBill1 = repairBackBillDao.save(repairBackBill);
//task转换
DevTaskmain devTaskmain = devTaskmainDao.findByTypeAndResourceId(4,devRepairReceive.getId());
......@@ -259,7 +381,7 @@ public class RepairServiceImpl implements RepairService {
TaskBto taskBto = devTaskmain.parseToTaskBto();
taskBto.setBillId(repairBackBill1.getId());
taskBto.setOldId(devTaskmain.getId());
Task task = taskDao.save(taskBto.toDo());
Task task = taskDao.save(taskBto.toDo2());
//添加业务日志
List<DevTasklog> devTasklogs = devTasklogDao.findAllByTaskId(devTaskmain.getId());
devTasklogs.forEach(devTasklog -> {
......@@ -277,10 +399,39 @@ public class RepairServiceImpl implements RepairService {
}
}
});
//set scriptSaveVo
repairBackBillDao.findAll().forEach(repairBackBill -> {
List<ScriptSaveVo> scriptSaveVos = new ArrayList<>();
List<DevRepairReceivedetail> repairDetails = devRepairReceivedetailDao.findAllByRepairReceiveId(repairBackBill.getOldId());
repairDetails.forEach(devRepairReceivedetail -> {
ScriptSaveVo scriptSaveVo = new ScriptSaveVo();
DeviceLibrary deviceLibrary = deviceLibraryDao.findByOldId(devRepairReceivedetail.getDevId());
scriptSaveVo.setDetailId(devRepairReceivedetail.getRepairDetailId());
scriptSaveVo.setAllotType(GlobalMap.getMatchingRangeMap().get(deviceLibrary.getMatchingRange()).name);
scriptSaveVo.setAllotTypeNum(String.valueOf(deviceLibrary.getMatchingRange()));
scriptSaveVo.setId(deviceLibrary.getId());
scriptSaveVo.setInvisibleRange(GlobalMap.getDeviceInvisibleRangeMap().get(deviceLibrary.getInvisibleRange()).name);
scriptSaveVo.setModel(deviceLibrary.getModel());
scriptSaveVo.setName(deviceLibrary.getName());
scriptSaveVo.setNum(1);
scriptSaveVo.setSecretLevel(GlobalMap.getDeviceSecretLevelMap().get(deviceLibrary.getSecretLevel()).name);
scriptSaveVo.setSeqNumber(devRepairReceivedetail.getSerNum());
scriptSaveVo.setType(GlobalMap.getDeviceStyleMap().get(deviceLibrary.getType()).name);
scriptSaveVo.setRemark(repairDetailDao.findByOldId(scriptSaveVo.getDetailId()).getBackRemark());
scriptSaveVos.add(scriptSaveVo);
});
repairBackBill.setScriptJson(JacksonUtil.toJSon(scriptSaveVos));
repairBackBillDao.save(repairBackBill);
});
//set detail receiveId
repairDetailDao.findAll().forEach(repairDetail -> {
if (repairDetail.getRepairBackBillId()!=null){
repairDetail.setRepairBackBillId(repairBackBillDao.findByOldId(repairDetail.getRepairBackBillId()).getId());
if (repairBackBillDao.findByOldId(repairDetail.getRepairBackBillId())!=null) {
repairDetail.setRepairBackBillId(repairBackBillDao.findByOldId(repairDetail.getRepairBackBillId()).getId());
}
else {
repairDetail.setRepairBackBillId(null);
}
repairDetailDao.save(repairDetail);
}
});
......
src/main/java/com/example/removetolocal/service/impl/UserServiceImpl.java
浏览文件 @ b6b0462e
......@@ -62,7 +62,7 @@ public class UserServiceImpl implements UserService {
Integer fatherId = area1.getId();
changeUnitsByArea(devAreaEntity1.getId(),fatherId);
setAcrossUnit();
setAcrossUser();
// setAcrossUser();
changeByFatherArea(devAreaEntity1.getId(),fatherId);
}
......@@ -82,7 +82,7 @@ public class UserServiceImpl implements UserService {
return oldId;
}
else {
return !sysUserDao.findById(oldId).isPresent() ? devManagerDao.findAllById(oldId).get(0).getUsername() : sysUserDao.findById(oldId).get().getUserName();
return sysUserDao.findById(oldId).isPresent() ? sysUserDao.findById(oldId).get().getUserName() : devManagerDao.findAllById(oldId).get(0).getUsername();
}
}
......@@ -223,14 +223,22 @@ public class UserServiceImpl implements UserService {
List<DevAcrossunit> devAcrossunits = devAcrossunitDao.findAll();
if (devAcrossunits.size()>0){
devAcrossunits.forEach(devAcrossunit -> {
List<String> unitNames = Arrays.asList("省机科技处设备部分","省机通信报务处");
Boolean isSpecialUnit = unitNames.contains(devAcrossunit.getUnitname());
Units units = new Units();
units.setName(devAcrossunit.getUnitname());
units.setUnitDesc(devAcrossunit.getUnitname());
units.setLevel(4);
if (isSpecialUnit){
units.setLevel(3);
units.setType(1);
}
else {
units.setLevel(4);
units.setType(2);
}
units.setIdDel(0);
units.setOldId(devAcrossunit.getId());
units.setAreaId(0);
units.setType(2);
units.setShowOrder(devAcrossunit.getShoworder().intValue());
unitsDao.save(units);
});
......@@ -255,7 +263,7 @@ public class UserServiceImpl implements UserService {
user.setShowOrder(devManagerEntity.getShoworder().intValue());
}
user.setPosition(1);
user.setTrainStatus(2);
user.setTrainStatus(5);
user.setUnitsId(0);
if (devManagerEntity.getIsLock()==1&&devManagerEntity.getStatus()==0){
user.setIsDel(1);
......@@ -276,70 +284,70 @@ public class UserServiceImpl implements UserService {
sysUserEntities.forEach(sysUserEntity -> {
User user = new User();
List<DevManagerEntity> devManagerEntities = devManagerDao.findAllById(sysUserEntity.getCode()).stream().sorted(Comparator.comparing(DevManagerEntity::getCreateTime,Comparator.nullsLast(Date::compareTo)).reversed()).collect(Collectors.toList());
if (sysUserEntity.getCode()!=null&&!devManagerEntities.isEmpty()){
DevManagerEntity devManagerEntity = devManagerEntities.get(0);
user.setName(sysUserEntity.getUserName());
user.setPassword("123456");
user.setNoPassword("123456");
user.setUsername(sysUserEntity.getLoginid());
user.setShowOrder(sysUserEntity.getShoworder().intValue());
user.setMobile(devManagerEntity.getMobile());
user.setTelphone(devManagerEntity.getTel());
user.setEmail(sysUserEntity.getEmail());
user.setFax(sysUserEntity.getFax());
user.setIsDel(sysUserEntity.getIsdel());
if (devManagerEntity.getStatus()==0||devManagerEntity.getStatus()==4){
user.setIsDel(1);
}
user.setIdCard(sysUserEntity.getIdcardno());
user.setSex(sysUserEntity.getSex());
user.setUnitsId(newUnitId);
user.setPosition(1);
user.setOldId(sysUserEntity.getUserId());
user.setOldCode(devManagerEntity.getId());
}
else {
user.setName(sysUserEntity.getUserName());
user.setPassword("123456");
user.setNoPassword("123456");
user.setUsername(sysUserEntity.getLoginid());
if (sysUserEntity.getShoworder()!=null) {
if (sysUserEntity.getLoginid()!=null&&!"".equals(sysUserEntity.getLoginid())) {
if (sysUserEntity.getCode() != null && !devManagerEntities.isEmpty()) {
DevManagerEntity devManagerEntity = devManagerEntities.get(0);
user.setName(sysUserEntity.getUserName());
user.setPassword("123456");
user.setNoPassword("123456");
user.setUsername(sysUserEntity.getLoginid());
user.setShowOrder(sysUserEntity.getShoworder().intValue());
user.setMobile(devManagerEntity.getMobile());
user.setTelphone(devManagerEntity.getTel());
user.setEmail(sysUserEntity.getEmail());
user.setFax(sysUserEntity.getFax());
user.setIsDel(sysUserEntity.getIsdel());
if (devManagerEntity.getStatus() == 0 || devManagerEntity.getStatus() == 4) {
user.setIsDel(1);
}
user.setIdCard(sysUserEntity.getIdcardno());
user.setSex(sysUserEntity.getSex());
user.setUnitsId(newUnitId);
user.setPosition(1);
user.setOldId(sysUserEntity.getUserId());
user.setOldCode(devManagerEntity.getId());
} else {
user.setName(sysUserEntity.getUserName());
user.setPassword("123456");
user.setNoPassword("123456");
user.setUsername(sysUserEntity.getLoginid());
if (sysUserEntity.getShoworder() != null) {
user.setShowOrder(sysUserEntity.getShoworder().intValue());
}
user.setMobile(sysUserEntity.getMobile());
user.setTelphone(sysUserEntity.getTelphone());
user.setEmail(sysUserEntity.getEmail());
user.setFax(sysUserEntity.getFax());
user.setIsDel(sysUserEntity.getIsdel());
user.setIdCard(sysUserEntity.getIdcardno());
user.setSex(sysUserEntity.getSex());
user.setUnitsId(newUnitId);
user.setPosition(1);
user.setOldId(sysUserEntity.getUserId());
user.setOldCode("0");
}
User user1 = userDao.save(user);
List<DevMgrcertEntity> devMgrcertEntities = new ArrayList<>();
devMgrcertEntities.addAll(devMgrcertDao.findAllByCertMgr(String.valueOf(user1.getOldCode())));
devMgrcertEntities.addAll(devMgrcertDao.findAllByCertMgr(String.valueOf(user1.getOldId())));
if (devMgrcertEntities.size() > 0) {
DevMgrcertEntity devMgrcertEntity = devMgrcertEntities.get(0);
user1.setTrainStatus(0);
userDao.save(user1);
Mgrcert mgrcert = new Mgrcert();
mgrcert.setCertName(devMgrcertEntity.getName());
mgrcert.setUserId(user1.getUserId());
mgrcert.setCertNum(devMgrcertEntity.getCertNum());
mgrcert.setIssueDate(devMgrcertEntity.getIssueDate());
mgrcert.setExpiryDate(devMgrcertEntity.getExpiryDate());
mgrcert.setIsExpiry(devMgrcertEntity.getIsExpiry());
mgrcert.setName(user1.getName());
mgrcert.setOldId(devMgrcertEntity.getId());
mgrcertDao.save(mgrcert);
} else {
user1.setTrainStatus(2);
userDao.save(user1);
}
user.setMobile(sysUserEntity.getMobile());
user.setTelphone(sysUserEntity.getTelphone());
user.setEmail(sysUserEntity.getEmail());
user.setFax(sysUserEntity.getFax());
user.setIsDel(sysUserEntity.getIsdel());
user.setIdCard(sysUserEntity.getIdcardno());
user.setSex(sysUserEntity.getSex());
user.setUnitsId(newUnitId);
user.setPosition(1);
user.setOldId(sysUserEntity.getUserId());
user.setOldCode("0");
}
User user1 = userDao.save(user);
List<DevMgrcertEntity> devMgrcertEntities = new ArrayList<>();
devMgrcertEntities.addAll(devMgrcertDao.findAllByCertMgr(String.valueOf(user1.getOldCode())));
devMgrcertEntities.addAll(devMgrcertDao.findAllByCertMgr(String.valueOf(user1.getOldId())));
if (devMgrcertEntities.size()>0){
DevMgrcertEntity devMgrcertEntity = devMgrcertEntities.get(0);
user1.setTrainStatus(0);
userDao.save(user1);
Mgrcert mgrcert = new Mgrcert();
mgrcert.setCertName(devMgrcertEntity.getName());
mgrcert.setUserId(user1.getUserId());
mgrcert.setCertNum(devMgrcertEntity.getCertNum());
mgrcert.setIssueDate(devMgrcertEntity.getIssueDate());
mgrcert.setExpiryDate(devMgrcertEntity.getExpiryDate());
mgrcert.setIsExpiry(devMgrcertEntity.getIsExpiry());
mgrcert.setName(user1.getName());
mgrcert.setOldId(devMgrcertEntity.getId());
mgrcertDao.save(mgrcert);
}
else {
user1.setTrainStatus(2);
userDao.save(user1);
}
});
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论