Skip to content

D
device-back
提交 e88e1b69 authored 作者: 133's avatar 133
浏览文件
操作

[zjm] 代码提交

上级 b0ff8938
隐藏空白字符变更
内嵌 并排
正在显示 包含 54 行增加 和 32 行删除
dev-config/src/main/java/com/tykj/dev/config/LogType.java
浏览文件 @ e88e1b69
......@@ -200,6 +200,7 @@ public enum LogType {
SEND_BACK_39(100029,SEND_BACK.id, SEND_BACK_1206.id,END.id , "本次提交任务无装备,任务结束"),
SEND_BACK_40(100030,SEND_BACK.id, SEND_BACK_1208.id,END.id , "本次提交任务无装备,任务结束"),
SEND_BACK_41(100031,SEND_BACK.id, SEND_BACK_1215.id,END.id , "清退装备任务,上传了签收单据,任务结束"),
SEND_BACK_42(100032,SEND_BACK.id, SEND_BACK_1218.id,END.id , "签章入库成功,清退装备任务结束"),
......
dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java
浏览文件 @ e88e1b69
......@@ -114,7 +114,7 @@ public class DeviceCheckController {
@ApiOperation(value = "查询默认的可以被核查单位的清单(省本直,省直属,市局)")
public ResponseEntity findDefaultUnits() {
return ResponseEntity.ok(new ResultObj<>(unitsRepo.findAllByTypeNotIn(Lists.newArrayList(3))));
return ResponseEntity.ok(new ResultObj<>(unitsRepo.findAllByTypeNotInAndLevelIn(Lists.newArrayList(3),Lists.newArrayList(0,1,2))));
}
@ApiOperation(value = "根据id查询核查统计数据", notes = "可以通过这个接口查询核查统计数据")
......
dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/impl/DeviceDecommissioningBusinessServiceImpl.java
浏览文件 @ e88e1b69
......@@ -236,6 +236,7 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
deviceDecommissioningDetail.setSenderUserB(storageDeviceDevommissiong.getSenderName());
}
taskBto=taskService.moveToEnd(taskBto);
deviceDecommissioningDetail.setReceiveTime(new Date());
deviceDecommissioningDetail.setDecommissioningStatus(taskBto.getBillStatus());
deviceLibraryDao.upDateSeqNumbersLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.RETIRE.id,deviceDecommissioningDetail.getReceiveUnit(),0,seqNumbers);
deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail);
......
dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/Impl/DeviceDestroyBusinessServiceImpl.java
浏览文件 @ e88e1b69
......@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
......@@ -117,7 +118,7 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
}else {
TaskBto taskBto = taskService.get(deviceDestroyBillVo.getTaskId());
deviceDestroyBill=deviceDestroyBillService.findDeviceDestroyBill(taskBto.getBillId());
taskBto= taskService.moveToSpecial(taskBto,StatusEnum.DESTROY_2,0,"country");
taskBto= taskService.moveToSpecial(taskBto,StatusEnum.DESTROY_2,0);
deviceDestroyBill.setDestroyStatus(taskBto.getBillStatus());
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"销毁任务等待补充手续",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId())));
......@@ -161,6 +162,7 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
}
deviceDestroyBill.setDestructionFiles(FilesUtil.stringFileToList(deviceDestroyBillVo.getDestructionFileList()));
taskBto= taskService.moveToEnd(taskBto);
deviceDestroyBill.setDestroyTime(new Date());
deviceDestroyBill.setDestroyStatus(taskBto.getBillStatus());
deviceDestroyBillService.saveDeviceDestroyBill(deviceDestroyBill);
deviceLibraryDao.upDateSeqNumbersLeftStatus(DeviceLifeStatus.DESTROYED.id,seqNumbers);
......
dev-file/src/main/java/com/tykj/dev/device/file/Controller/FileController.java
浏览文件 @ e88e1b69
......@@ -182,15 +182,9 @@ public class FileController {
*/
@PostMapping("/download/preview")
public void downloadPreview(@RequestBody FileRet fileRet, HttpServletResponse response, HttpServletRequest httpServletRequest){
String path=fileRet.getFilePath();
String regEx=".*/(.*)";
Pattern p = Pattern.compile(regEx);
Matcher m = p.matcher(path);
m.find();
String urls = url + m.group(1);
useReportFIleService.download(urls,fileRet.getName(),response,httpServletRequest);
useReportFIleService.download(fileRet.getFilePath(),fileRet.getName(),response,httpServletRequest);
}
@ApiOperation(value = "多文件上传")
@PostMapping(value = "/many/upload")
public ResponseEntity<List<FileRet>> manyFileUpload(HttpServletRequest request) {
......
dev-file/src/main/java/com/tykj/dev/device/file/service/Impl/UseReportFIleServiceImpl.java
浏览文件 @ e88e1b69
......@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
......@@ -205,17 +206,27 @@ public class UseReportFIleServiceImpl implements UseReportFIleService {
/**
* 解决中文名称
*/
private void setFileDownloadHeader(HttpServletRequest request, HttpServletResponse response, String fileName) {
private void setFileDownloadHeader(HttpServletRequest request, HttpServletResponse response, String fileName) {
try {
//中文文件名支持
String encodedfileName;
String agent = request.getHeader("USER-AGENT");
log.info("浏览器名称:{}",agent);
if (null != agent && agent.contains("MSIE")) {//IE
encodedfileName = java.net.URLEncoder.encode(fileName, "UTF-8");
} else if (null != agent && agent.contains("Mozilla")) {
encodedfileName = new String(fileName.getBytes("UTF-8"), "iso-8859-1");
// encodedfileName = new String(fileName.getBytes("UTF-8"), "ISO8859-1");
encodedfileName= new String(fileName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1);
log.info("进入-Mozilla");
} else if (request.getHeader("User-Agent").toLowerCase().indexOf("firefox") > 0) {
encodedfileName = new String(fileName.getBytes("UTF-8"), "ISO8859-1"); // firefox浏览器
} else if (request.getHeader("User-Agent").toUpperCase().indexOf("MSIE") > 0) {
encodedfileName = URLEncoder.encode(fileName, "UTF-8");// IE浏览器
} else if (request.getHeader("User-Agent").toUpperCase().indexOf("CHROME") > 0) {
encodedfileName = new String(fileName.getBytes("UTF-8"), "ISO8859-1");// 谷歌
} else {
encodedfileName = java.net.URLEncoder.encode(fileName, "UTF-8");
log.info("[file_name] 未匹配到浏览器，使用默认方法命名文件名");
}
response.setHeader("Content-Disposition", "attachment; filename=\"" + encodedfileName + "\"");
} catch (UnsupportedEncodingException e) {
......@@ -223,4 +234,7 @@ public class UseReportFIleServiceImpl implements UseReportFIleService {
}
}
}
}
dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java
浏览文件 @ e88e1b69
......@@ -322,7 +322,7 @@ public class JavaToPdfHtmlFreeMarker {
boolean falg=true;
Integer page=0;
int pageNum = page + 1;
int pageSize = 19;
int pageSize = 34;
Integer totalNum = list.size();
//默认从零分页，这里要考虑这种情况，下面要计算。
......@@ -672,6 +672,11 @@ public class JavaToPdfHtmlFreeMarker {
count.set(totle);
}
}
if (list.size()==19){
lists.add(list);
list = new ArrayList<>();
count.set(0);
}
if (i==documentDevices.size()-1){
lists.add(list);
}
......@@ -727,7 +732,7 @@ public class JavaToPdfHtmlFreeMarker {
list=new ArrayList<>();
}else {
int totle=count.get()+29+len;
if (totle>1568){
if (totle>1568){
if (1568-count.get()>56) {
WorkHandoverDevice workHandoverDevice1 = new WorkHandoverDevice();
workHandoverDevice1.setSeqs(toString(workHandoverDevice1.getSeqs().substring(3510 - count.get(), len)));
......@@ -753,6 +758,11 @@ public class JavaToPdfHtmlFreeMarker {
count.set(totle);
}
}
if (list.size()==19){
lists.add(list);
list = new ArrayList<>();
count.set(0);
}
if (i==workHandoverDevices.size()-1){
workHandoverDevice.setSeqs(toString(workHandoverDevice.getSeqs()));
lists.add(list);
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/DeviceRepel.java
浏览文件 @ e88e1b69
......@@ -114,11 +114,6 @@ public class DeviceRepel extends BaseEntity {
@Column(name = "equipment_involving_unit",columnDefinition = "TEXT")
private String equipmentInvolvingUnit;
/**
* 市下面区县单位装备id集合
*/
@Column(name = "equipment_involving_unit_dev_ids",columnDefinition = "TEXT")
private String equipmentInvolvingUnitDevIds;
/**
* 清退任务是否办结
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java
浏览文件 @ e88e1b69
......@@ -45,6 +45,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.*;
......@@ -139,7 +140,6 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
deviceRepel.setFiles(FilesUtil.stringFileToList(deviceRepel.getFileRets()));
Map<String,List<Integer>> unitNameMap=new HashMap<>();
List<String> seqNumbers=DeviceSeqUtil.selectDeviceSeqs(deviceRepel.getSeqNumbers());
if (seqNumbers.size()!=0){
log.info("申请任务触发清退任务");
deviceLibraryService.findAllBySeqNumber(seqNumbers).forEach(
......@@ -190,7 +190,6 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
List<Integer> unitList=new ArrayList<>();
unitList.addAll(supervisorMap.keySet());
deviceRepel.setTaskScopes(unitList);
// deviceRepel.setEquipmentInvolvingUnitDevIds(JacksonUtil.toJSon(unitNameMap));
deviceRepel.setEquipmentInvolvingUnit(JacksonUtil.toJSon(supervisorMap));
}
DeviceRepel deviceRepel1= deviceRepelService.saveDeviceRepel(deviceRepel);
......@@ -217,7 +216,6 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
long time=System.currentTimeMillis();
Integer count=deviceLibraryService.countAllRepel(deviceRepel.getFieldingIds(),unitsService.findBySubordinateUnitName(units1.getUnitId()), seqNumbers,lifeStatus);
if (count!=0) {
// deviceRepelDetail.setDeviceIds(StringUtils.ListToString(unitNameMap.get(units1.getName())));
TaskBto taskBto1 = cityRepelTask(unisId, deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), deviceRepel.getTitle(), taskBto.getId(), userId);
list.add(new RepelTaskStatistical(deviceRepel1.getId(), taskBto.getId(), taskBto1.getId(), 0, area1.getName(), repelStatusJudgeCount(deviceRepel.getRepelStatus(),count), ""));
}
......@@ -312,7 +310,6 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
deviceRepelDetail.setId(null);
deviceRepelDetail.setSendUnit(units1.getName());
deviceRepelDetail.setSendUnitId(units1.getUnitId());
List<String> unitNames= unitsService.findBySubordinateUnitName(units1.getUnitId());
Integer count=deviceLibraryService.countAllRepel(deviceRepel.getFieldingIds(),unitsService.findBySubordinateUnitName(units1.getUnitId()), DeviceSeqUtil.selectDeviceSeqs(deviceRepel.getSeqNumbers()),lifeStatus);
if (count!=0) {
TaskBto taskBto1 = countyRepelTask(unisId, deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), deviceRepel.getTitle(), taskBto.getId(),userId);
......@@ -358,7 +355,6 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
lifeStatus.add(DeviceLifeStatus.IN_TRANSIT.id);
lifeStatus.add(DeviceLifeStatus.USE.id);
lifeStatus.add(DeviceLifeStatus.SEND_BACK.id);
if (repelAuditResult.getType()==1) {
DeviceRepelDetail deviceRepelDetail = deviceRepelDetailService.findDeviceRepelDetailNoDev(taskBto.getBillId());
DeviceRepel deviceRepel = deviceRepelService.findDeviceRepel(deviceRepelDetail.getRepelId());
......@@ -696,6 +692,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
repelDeviceUnitService.saveAllRepelDeviceUnit(list);
taskService.moveToEnd(taskBto);
taskService.moveToEnd(taskService.findBillTypeAndFatherId(BusinessEnum.SEND_BACK.id,taskId));
taskService.moveToArchive(taskService.findBillTypeAndFatherId(BusinessEnum.SEND_BACK.id,taskId));
} else {
if (storageDeviceRepel.getIsIgnore()==null) {
List<StatusEnum> enumList=new ArrayList<>();
......@@ -715,6 +712,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
}
taskService.moveToEnd(taskBto);
taskService.moveToEnd(taskService.findBillTypeAndFatherId(BusinessEnum.SEND_BACK.id,taskId));
taskService.moveToArchive(taskService.findBillTypeAndFatherId(BusinessEnum.SEND_BACK.id,taskId));
Documents documents= deviceRepelDetail.toDoc();
documents.setSrcA(storageDeviceRepel.getSrcA());
documents.setSrcB(storageDeviceRepel.getSrcB());
......@@ -733,6 +731,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
deviceRepelDetail.setSendFiles(JacksonUtil.toJSon(fileRet));
}
}
deviceRepelDetail.setReceiveTime(new Date());
repelTaskStatisticalService.saveRepelTaskStatistical(repelTaskStatistical);
deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail);
isEnd(taskBto,deviceRepelDetail.getRepelId());
......@@ -847,6 +846,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
TaskBto taskBto = taskService.get(storageDeviceRepel.getTaskId());
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SEND_BACK_1214);
taskService.moveToEnd(taskBto);
taskService.moveToArchive(taskBto);
DeviceRepelDetail deviceRepelDetail=deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
DeviceRepel deviceRepel=deviceRepelService.findDeviceRepel(deviceRepelDetail.getRepelId());
if (storageDeviceRepel.getSenderName()!=null) {
......@@ -879,6 +879,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
TaskBto fatherTask=taskService.get(taskBto.getParentTaskId());
taskService.moveToEnd(fatherTask);
DeviceRepelDetail deviceRepelDetailFather= deviceRepelDetailService.findDeviceRepelDetail(fatherTask.getBillId());
deviceRepelDetailFather.setReceiveTime(new Date());
deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetailFather);
RepelTaskStatistical repelTaskStatistical = repelTaskStatisticalService.findRepelTaskStatistical(fatherTask.getId(),deviceRepelDetailFather.getRepelId());
repelTaskStatistical.setTaskStatus(1);
repelTaskStatisticalService.saveRepelTaskStatistical(repelTaskStatistical);
......
dev-union/src/main/resources/bill.html
浏览文件 @ e88e1b69
......@@ -456,11 +456,11 @@
<span><span style="color: #fff;">1234</span>年<span
style="color: #fff;">0121</span>月<span
style="color: #fff;">0232</span>日</span>
<div class="rightImg">
<div id="pos1">
<img style="width:80px;height:80px" src=${srcB} />
</div>
</div>
<!--<div class="rightImg">-->
<!--<div id="pos1">-->
<img style="position: absolute;bottom: 0px;right: 150px;width:80px;height:80px" src=${srcB} />
<!--</div>-->
<!--</div>-->
</span>
</i>
</div>
......
dev-union/src/main/resources/bill2.html
浏览文件 @ e88e1b69
......@@ -213,7 +213,7 @@
</div>
</div>
</div>
<p class="bottomTxt">第${page}页/共${count}页</p>
<p class="bottomTxt" style="margin-top: 20px;">第${page}页/共${count}页</p>
</div>
<!--<script type="text/javascript">-->
<!--function altRows(id){-->
......
dev-user/src/main/java/com/tykj/dev/device/user/subject/dao/UnitsDao.java
浏览文件 @ e88e1b69
......@@ -20,6 +20,8 @@ public interface UnitsDao extends JpaRepository<Units, Integer>, JpaSpecificatio
List<Units> findAllByTypeNotIn(List<Integer> ids);
List<Units> findAllByTypeNotInAndLevelIn(List<Integer> ids,List<Integer> levels);
List<Units> findByAreaIdIn(List<Integer> areaIds);
List<Units> findAllByAreaIdIn(List<Integer> ids);
......
dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UnitsServiceImpl.java
浏览文件 @ e88e1b69
......@@ -196,7 +196,7 @@ public class UnitsServiceImpl implements UnitsService {
@Override
public List<String> findBySubordinateUnitName(Integer unitsId) {
Units units = unitsDao.findById(unitsId).get();
List<Integer> areaIds= areaDao.findAllByFatherId(units.getAreaId()).stream().map(Area::getId).collect(Collectors.toList());
List<Integer> areaIds = areaDao.findAllByFatherId(units.getAreaId()).stream().map(Area::getId).collect(Collectors.toList());
List<String> list=new ArrayList<>();
list.add(units.getName());
unitsDao.findAllByAreaIdIn(areaIds).forEach(
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论