diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java index 2984eed..b51f7c6 100644 --- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java +++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java @@ -122,10 +122,6 @@ List> currentRecordByDept = recRecordService.selectRecordByDeptId(dept.getId()+"", beginDate, endDate); for (PersonDto mStaff : currentStaffList) { - if(mStaff.getName().equals("曹磊")){ - String currentDate = beginDateDate.plusDays(2).toString(); - LocalDate currentDateDate = LocalDate.parse(currentDate, fomatter); - } String currentID = mStaff.getId().toString(); String currentName = mStaff.getName(); for (int i = 0; i < days; i++) { diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java index 2984eed..b51f7c6 100644 --- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java +++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java @@ -122,10 +122,6 @@ List> currentRecordByDept = recRecordService.selectRecordByDeptId(dept.getId()+"", beginDate, endDate); for (PersonDto mStaff : currentStaffList) { - if(mStaff.getName().equals("曹磊")){ - String currentDate = beginDateDate.plusDays(2).toString(); - LocalDate currentDateDate = LocalDate.parse(currentDate, fomatter); - } String currentID = mStaff.getId().toString(); String currentName = mStaff.getName(); for (int i = 0; i < days; i++) { diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java index 58155e4..b77b18e 100644 --- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java +++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java @@ -77,9 +77,9 @@ endDate = sdf.format(c.getTime()); endDateDate = LocalDate.parse(endDate, fomatter); -// beginDate = "2020-06-09"; +// beginDate = "2020-07-06"; // beginDateDate = LocalDate.parse(beginDate, fomatter); -// endDate ="2020-06-10"; +// endDate ="2020-07-08"; // endDateDate = LocalDate.parse(endDate, fomatter); //生成报表数据 if (!endDateDate.isBefore(beginDateDate)) { diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java index 2984eed..b51f7c6 100644 --- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java +++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java @@ -122,10 +122,6 @@ List> currentRecordByDept = recRecordService.selectRecordByDeptId(dept.getId()+"", beginDate, endDate); for (PersonDto mStaff : currentStaffList) { - if(mStaff.getName().equals("曹磊")){ - String currentDate = beginDateDate.plusDays(2).toString(); - LocalDate currentDateDate = LocalDate.parse(currentDate, fomatter); - } String currentID = mStaff.getId().toString(); String currentName = mStaff.getName(); for (int i = 0; i < days; i++) { diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java index 58155e4..b77b18e 100644 --- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java +++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java @@ -77,9 +77,9 @@ endDate = sdf.format(c.getTime()); endDateDate = LocalDate.parse(endDate, fomatter); -// beginDate = "2020-06-09"; +// beginDate = "2020-07-06"; // beginDateDate = LocalDate.parse(beginDate, fomatter); -// endDate ="2020-06-10"; +// endDate ="2020-07-08"; // endDateDate = LocalDate.parse(endDate, fomatter); //生成报表数据 if (!endDateDate.isBefore(beginDateDate)) { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 4a169ac..cfb7c39 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -78,8 +78,6 @@ } String result = irisDataService.addIrisData(leftFilePath1,leftFilePath2,rightFilePath1,rightFilePath2,personId,idCardNo); - - return ResponseData.success(result); } diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java index 2984eed..b51f7c6 100644 --- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java +++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java @@ -122,10 +122,6 @@ List> currentRecordByDept = recRecordService.selectRecordByDeptId(dept.getId()+"", beginDate, endDate); for (PersonDto mStaff : currentStaffList) { - if(mStaff.getName().equals("曹磊")){ - String currentDate = beginDateDate.plusDays(2).toString(); - LocalDate currentDateDate = LocalDate.parse(currentDate, fomatter); - } String currentID = mStaff.getId().toString(); String currentName = mStaff.getName(); for (int i = 0; i < days; i++) { diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java index 58155e4..b77b18e 100644 --- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java +++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java @@ -77,9 +77,9 @@ endDate = sdf.format(c.getTime()); endDateDate = LocalDate.parse(endDate, fomatter); -// beginDate = "2020-06-09"; +// beginDate = "2020-07-06"; // beginDateDate = LocalDate.parse(beginDate, fomatter); -// endDate ="2020-06-10"; +// endDate ="2020-07-08"; // endDateDate = LocalDate.parse(endDate, fomatter); //生成报表数据 if (!endDateDate.isBefore(beginDateDate)) { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 4a169ac..cfb7c39 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -78,8 +78,6 @@ } String result = irisDataService.addIrisData(leftFilePath1,leftFilePath2,rightFilePath1,rightFilePath2,personId,idCardNo); - - return ResponseData.success(result); } diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java index 3ef2e8e..de8919d 100644 --- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java +++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java @@ -34,8 +34,8 @@ SpringApplication.run(CasicApplication.class, args); logger.info("GunsApplication is success!"); -// GenerateReportTask task = new GenerateReportTask(); -// task.generateTask(); + GenerateReportTask task = new GenerateReportTask(); + task.generateTask(); } } diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java index 2984eed..b51f7c6 100644 --- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java +++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/service/impl/GenerateReportServiceImpl.java @@ -122,10 +122,6 @@ List> currentRecordByDept = recRecordService.selectRecordByDeptId(dept.getId()+"", beginDate, endDate); for (PersonDto mStaff : currentStaffList) { - if(mStaff.getName().equals("曹磊")){ - String currentDate = beginDateDate.plusDays(2).toString(); - LocalDate currentDateDate = LocalDate.parse(currentDate, fomatter); - } String currentID = mStaff.getId().toString(); String currentName = mStaff.getName(); for (int i = 0; i < days; i++) { diff --git a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java index 58155e4..b77b18e 100644 --- a/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java +++ b/casic-iris-atd/src/main/java/com/casic/missiles/modular/system/task/GenerateReportTask.java @@ -77,9 +77,9 @@ endDate = sdf.format(c.getTime()); endDateDate = LocalDate.parse(endDate, fomatter); -// beginDate = "2020-06-09"; +// beginDate = "2020-07-06"; // beginDateDate = LocalDate.parse(beginDate, fomatter); -// endDate ="2020-06-10"; +// endDate ="2020-07-08"; // endDateDate = LocalDate.parse(endDate, fomatter); //生成报表数据 if (!endDateDate.isBefore(beginDateDate)) { diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 4a169ac..cfb7c39 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -78,8 +78,6 @@ } String result = irisDataService.addIrisData(leftFilePath1,leftFilePath2,rightFilePath1,rightFilePath2,personId,idCardNo); - - return ResponseData.success(result); } diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java index 3ef2e8e..de8919d 100644 --- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java +++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java @@ -34,8 +34,8 @@ SpringApplication.run(CasicApplication.class, args); logger.info("GunsApplication is success!"); -// GenerateReportTask task = new GenerateReportTask(); -// task.generateTask(); + GenerateReportTask task = new GenerateReportTask(); + task.generateTask(); } } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index aa5bf12..997f4c8 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -1,9 +1,9 @@ server: - port: 8093 + port: 8095 ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://111.198.10.15:11102/casic_iris_temperature?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_iris_203?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root password: Casic203! initial-size: 2