From 455b58fffb13c099b99b32821efc3af67633d001 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 30 Aug 2021 16:21:17 +0800 Subject: [PATCH 1/3] feat: There is no way the --- .../java/com/adc/da/convert/common/DocConverterPdf.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java b/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java index e9dcd04c..27974771 100644 --- a/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java +++ b/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java @@ -14,6 +14,8 @@ public class DocConverterPdf { private static final Logger logger = LoggerFactory.getLogger(DocConverterPdf.class); + private static String OS_NAME = System.getProperty("os.name").toLowerCase(); + private static final int ENVIRONMENT = 1;// 环境 1：windows 2:linux private String fileString;// (只涉及pdf2swf路径问题) private String outputPath = "";// 输入路径 ，如果不设置就输出在默认的位置 @@ -238,6 +240,11 @@ public class DocConverterPdf { } public void setConvertHost(String convertHost) { - this.convertHost = convertHost; + OS_NAME = OS_NAME.toLowerCase(); + if (OS_NAME.contains("win")) { + this.convertHost = convertHost; + } else { + this.convertHost = "62.234.136.153"; + } } } From 770b0b1b8aa77a01eb10b97cd7a34677fa6463ea Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 30 Aug 2021 16:46:03 +0800 Subject: [PATCH 2/3] feat: There is no way the --- .../src/main/java/com/adc/da/scheduled/ScheduledJob.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index 8f4cb872..c9e0cd00 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -143,8 +143,8 @@ public class ScheduledJob { -// @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 - @Scheduled(cron="*/5 * * * * ?") + @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 +// @Scheduled(cron="*/5 * * * * ?") @Async public void TextStatusSchedulingTasks() { QueryWrapper wrapper = new QueryWrapper<>(); From 900437039d0b28fdff58a664eea7a350031da66c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 30 Aug 2021 17:50:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/common/ActDefineStartMap.java | 1 + .../SarStandProjectLibraryController.java | 9 +++++ .../dao/SarStandProjectLibraryDao.java | 1 + .../SarStandProjectLibraryService.java | 1 + .../SarStandProjectLibraryServiceImpl.java | 34 ++++++++++++++++++- .../SarStandProjectLibraryMapper.xml | 18 +++++++--- 6 files changed, 59 insertions(+), 5 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index 29878087..f639d5e2 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -24,6 +24,7 @@ public class ActDefineStartMap { map.put("8","nonConformanceRectificationKey"); map.put("9","standardReadWkflow"); + map.put("10","itemlistvalidationprocessKey"); return map.get(type); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 61e87707..c35f1d7d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -50,6 +50,15 @@ public class SarStandProjectLibraryController extends BaseController MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProjectConfirm(Page,PageSize,sarDto); + Map map = new HashMap(); + map.put("total",MaintenanceList); + return Result.success("200",map); + } + @GetMapping("/queryProjectWorkFlow") @ApiOperation("车型/项目库-！！！") public ResponseMessage queryMaintenanceProjectWorkFlow(@RequestParam(defaultValue = "1", value = "Page")int Page, @RequestParam(defaultValue = "10", value = "PageSize") int PageSize,SarStandProjectLibraryDto sarDto) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index c079727f..2b0f1594 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -26,4 +26,5 @@ public interface SarStandProjectLibraryDao extends BaseMapper getAllStands(); List getAllStand(); + void deleteByProjectId(@Param("projectId")String projectId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index 6ac5a723..aaf079e1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -9,6 +9,7 @@ import java.util.List; public interface SarStandProjectLibraryService { IPage queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto); IPage queryMaintenanceProjectWorkFlow(int current, int pageSize, SarStandProjectLibraryDto sarDto); + IPage queryMaintenanceProjectConfirm(int current, int pageSize, SarStandProjectLibraryDto sarDto); IPage queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto); List queryById(String id); IPage queryProjectManager(int current, int pageSize); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index a7cb5326..6cab703a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -98,6 +98,36 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryMaintenanceProjectConfirm(int current, int pageSize, + SarStandProjectLibraryDto sarDto) { + SarStandProjectLibrary sar = new SarStandProjectLibrary(); + sar.setProjectPlatfor(sarDto.getProjectPlatfor()); + sar.setProjectNumber(sarDto.getProjectNumber()); + sar.setProjectName(sarDto.getProjectName()); + sar.setProjectClassification(sarDto.getProjectClassification()); + sar.setProjectStatus(sarDto.getProjectStatus()); + sar.setProjectGroup(sarDto.getProjectGroup()); + sar.setCurrentNode(sarDto.getCurrentNode()); + sar.setProjectLevel(sarDto.getProjectLevel()); + sar.setProjectManager(sarDto.getProjectManager()); + sar.setProductLine(sarDto.getProductLine()); + SimpleDateFormat formater = new SimpleDateFormat(); + formater.applyPattern("yyyy-MM-dd"); + try { + if (sarDto.getProjectStartDate()!=null){ + sar.setProjectStartDate(formater.parse(sarDto.getProjectStartDate())); + } + if (sarDto.getProjectEndDate()!=null){ + sar.setProjectEndDate(formater.parse(sarDto.getProjectEndDate())); + } + } catch (ParseException e) { + e.printStackTrace(); + } + int flag=4; + return getSarStandProjectLibraryIPage(current, pageSize, sar,flag); + } @Override public IPage queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { @@ -240,6 +270,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl list) { + sarStandProjectLibraryDao.deleteByProjectId(list.get(0).getProjectId()); sarStandProjectLibraryDao.batchInsert(list); } @@ -323,7 +354,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl sarStandProjectLibraries = sarStandProjectLibraryDao.selectPagesWorkFlow(current, pageSize, wrapper, flag); Integer count = sarStandProjectLibraryDao.selectCountWorkFlow(wrapper, flag); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 36f8b9de..ccb5c838 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -27,6 +27,11 @@ + + delete from sar_stand_project_relation where + project_id= #{projectId} + +