|
@@ -200,7 +200,10 @@ public class Task {
|
|
|
public void SyncPolicyTask() throws Exception {
|
|
public void SyncPolicyTask() throws Exception {
|
|
|
|
|
|
|
|
//内网
|
|
//内网
|
|
|
- if (environment.getProperty("spring.profiles").equals(Constant.Environment.PROD_IN)) {
|
|
|
|
|
|
|
+ if (
|
|
|
|
|
+ environment.getProperty("spring.profiles").equals(Constant.Environment.PROD_IN)
|
|
|
|
|
+ || environment.getProperty("spring.profiles").equals(Constant.Environment.ALIYUN)
|
|
|
|
|
+ ) {
|
|
|
String url1 = "http://snd.ideatob.com/mp/api/?apikey=snd_apis&at=2&page=1&pagesize=99999&lb=";
|
|
String url1 = "http://snd.ideatob.com/mp/api/?apikey=snd_apis&at=2&page=1&pagesize=99999&lb=";
|
|
|
String url2 = "http://snd.ideatob.com/mp/api/?apikey=snd_apis&at=6&bno=";
|
|
String url2 = "http://snd.ideatob.com/mp/api/?apikey=snd_apis&at=6&bno=";
|
|
|
String[] typeArr = {"1", "2", "3", "4"};
|
|
String[] typeArr = {"1", "2", "3", "4"};
|
|
@@ -266,33 +269,40 @@ public class Task {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private ProjectService projectService;
|
|
private ProjectService projectService;
|
|
|
|
|
|
|
|
- @Scheduled(cron = "0 0 22 * * ?")
|
|
|
|
|
|
|
+ @Scheduled(cron = "0 30 23 * * ?")
|
|
|
public void CorrectApplicationType() throws Exception {
|
|
public void CorrectApplicationType() throws Exception {
|
|
|
|
|
|
|
|
- String year = DateUtil.getCurrentDateString("yyyy");
|
|
|
|
|
- Example example = new Example(ProjectApplication.class);
|
|
|
|
|
- Example.Criteria criteria = example.createCriteria();
|
|
|
|
|
- criteria.andLike("apply_no", "%GY" + year + "%");
|
|
|
|
|
- List<ProjectApplication> projectApplicationList = projectApplicationService.selectByExample(example);
|
|
|
|
|
-
|
|
|
|
|
- example = new Example(Project.class);
|
|
|
|
|
- criteria = example.createCriteria();
|
|
|
|
|
- criteria.andEqualTo("project_year", year);
|
|
|
|
|
- List<Project> projectList = projectService.selectByExample(example);
|
|
|
|
|
-
|
|
|
|
|
- if (CommonUtils.isNotNull(projectApplicationList) && CommonUtils.isNotNull(projectList)) {
|
|
|
|
|
- for (ProjectApplication projectApplication : projectApplicationList) {
|
|
|
|
|
- for (Project project : projectList) {
|
|
|
|
|
- if (
|
|
|
|
|
- Objects.equals(projectApplication.getProject_name(), project.getProject_name())
|
|
|
|
|
- && projectApplication.getProject_id() != project.getId()
|
|
|
|
|
- ) {
|
|
|
|
|
|
|
+ //内网
|
|
|
|
|
+ if (
|
|
|
|
|
+ environment.getProperty("spring.profiles").equals(Constant.Environment.PROD_IN)
|
|
|
|
|
+ || environment.getProperty("spring.profiles").equals(Constant.Environment.ALIYUN)
|
|
|
|
|
+ || environment.getProperty("spring.profiles").equals(Constant.Environment.DEV)
|
|
|
|
|
+ ) {
|
|
|
|
|
+ String year = DateUtil.getCurrentDateString("yyyy");
|
|
|
|
|
+ Example example = new Example(ProjectApplication.class);
|
|
|
|
|
+ Example.Criteria criteria = example.createCriteria();
|
|
|
|
|
+ criteria.andLike("apply_no", "%GY" + year + "%");
|
|
|
|
|
+ List<ProjectApplication> projectApplicationList = projectApplicationService.selectByExample(example);
|
|
|
|
|
+
|
|
|
|
|
+ example = new Example(Project.class);
|
|
|
|
|
+ criteria = example.createCriteria();
|
|
|
|
|
+ criteria.andEqualTo("project_year", year);
|
|
|
|
|
+ List<Project> projectList = projectService.selectByExample(example);
|
|
|
|
|
+
|
|
|
|
|
+ if (CommonUtils.isNotNull(projectApplicationList) && CommonUtils.isNotNull(projectList)) {
|
|
|
|
|
+ for (ProjectApplication projectApplication : projectApplicationList) {
|
|
|
|
|
+ for (Project project : projectList) {
|
|
|
|
|
+ if (
|
|
|
|
|
+ Objects.equals(projectApplication.getProject_name(), project.getProject_name())
|
|
|
|
|
+ && projectApplication.getProject_id() != project.getId()
|
|
|
|
|
+ ) {
|
|
|
// System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
|
|
// System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
|
|
|
// System.out.println(projectApplication.toString());
|
|
// System.out.println(projectApplication.toString());
|
|
|
// System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
|
|
// System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
|
|
|
- projectApplication.setProject_id(project.getId());
|
|
|
|
|
- projectApplicationService.updateSelective(projectApplication);
|
|
|
|
|
- break;
|
|
|
|
|
|
|
+ projectApplication.setProject_id(project.getId());
|
|
|
|
|
+ projectApplicationService.updateSelective(projectApplication);
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|