1.针对已有人员被停用，人事系统重新启用之后，调度未启用的情况调整逻辑

王通
1 parent 3be16063
Showing 3 changed files with 122 additions and 5 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/handler/PersonnelUpdateHandler.java
src/main/resources/application.properties
@@ -6,12 +6,23 @@ import com.bsth.util.DateUtils;
  
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
  
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.regex.Pattern;
  
 /**
  * 随应用启动运行
@@ -28,6 +39,9 @@ public class StartCommand implements CommandLineRunner{
  
 	@Autowired
 	PersonnelUpdateThread personnelUpdateThread;
+
+	@Autowired
+	private JdbcTemplate jdbcTemplate;
  
 	static {
 		// 中午12:00
@@ -41,8 +55,106 @@ public class StartCommand implements CommandLineRunner{
 			log.info("在："+timeDiff / 1000 / 60 + "分钟后开始同步数据");
 			personnelUpdateThread.run();
 			//mainServices.scheduleAtFixedRate(personnelUpdateThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);//timeDiff / 1000
+			//analyzeInterface();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 	}
+
+	private Pattern pattern = Pattern.compile("");
+
+	private static class InterfaceRequest {
+
+		private String ip;
+
+		private String password;
+
+		private String agent;
+
+		private String uri;
+
+		private int time;
+
+		public InterfaceRequest(String ip, String password, String agent, String uri, int time) {
+			this.ip = ip;
+			this.password = password;
+			this.agent = agent;
+			this.uri = uri;
+			this.time = time;
+		}
+
+		public String getIp() {
+			return ip;
+		}
+
+		public void setIp(String ip) {
+			this.ip = ip;
+		}
+
+		public String getPassword() {
+			return password;
+		}
+
+		public void setPassword(String password) {
+			this.password = password;
+		}
+
+		public String getAgent() {
+			return agent;
+		}
+
+		public void setAgent(String agent) {
+			this.agent = agent;
+		}
+
+		public String getUri() {
+			return uri;
+		}
+
+		public void setUri(String uri) {
+			this.uri = uri;
+		}
+
+		public int getTime() {
+			return time;
+		}
+
+		public void setTime(int time) {
+			this.time = time;
+		}
+	}
+
+	public void analyzeInterface () throws IOException {
+		//String line = "INFO -[][180.167.126.126][Apache-HttpClient/4.5.5 (Java/1.8.0_241)][/webservice/rest/schedule_real/execs][{\"password\":[\"e126853c7f6f43b4857fa8dfe3b28b5d90be9e68\"],\"timestamp\":[\"1686192455081\"],\"nonce\":[\"2mycf6\"],\"sign\":[\"d945f2d522db4d458694a435e46a81c5ff9ee73f\"]}]<time:9462>";
+		final List<InterfaceRequest> requests = new ArrayList<>();
+		String path = "C:\\Users\\Hill\\Downloads\\main1.log";
+		BufferedReader reader = new BufferedReader(new FileReader(new File(path)));
+		String line = null;
+		while ((line = reader.readLine()) != null) {
+			int idx = line.indexOf("<time:"), idxPwdStart = line.indexOf("password\":[\""), idxPwdEnd = line.indexOf("\"]", idxPwdStart);
+			if (idx > 0) {
+				String[] array = line.split("\\]\\[");
+				String ip = array[1], agent = array[2], uri = array[3], time = line.substring(idx + 6, line.length() - 1), password = line.substring(idxPwdStart, idxPwdEnd);
+				InterfaceRequest request = new InterfaceRequest(ip, password, agent, uri, Integer.parseInt(time));
+				requests.add(request);
+			}
+		}
+		jdbcTemplate.batchUpdate("insert into bsth_c_interface_request (ip, password, agent, uri, `time`) values (?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
+			@Override
+			public void setValues(PreparedStatement ps, int i) throws SQLException {
+				InterfaceRequest request = requests.get(i);
+
+				ps.setString(1, request.getIp());
+				ps.setString(2, request.getPassword());
+				ps.setString(3, request.getAgent());
+				ps.setString(4, request.getUri());
+				ps.setInt(5, request.getTime());
+			}
+
+			@Override
+			public int getBatchSize() {
+				return requests.size();
+			}
+		});
+	}
 }
@@ -134,15 +134,21 @@ public class PersonnelUpdateHandler {
 				});
 			}
 			// 根据工号关联更新姓名、公司、工种、身份证号
-			int rows = jdbcTemplate.update("update bsth_c_personnel a inner join bsth_c_employee b on a.job_code = b.job_code1 set a.personnel_name = b.employee_name,a.personnel_type = b.job_type,a.company = b.company_name,a.company_code = b.company_code,a.card = b.id_card,a.branche_company_code = b.branche_company_code,a.branche_company = b.branche_company,a.jd_codeori = b.job_code,a.job_codeori = b.job_code2 where a.destroy = 0 and a.locked = 0");
+			int rows = jdbcTemplate.update("update bsth_c_personnel a inner join bsth_c_employee b on a.job_code = b.job_code1 set a.destroy = 0, a.personnel_name = b.employee_name,a.personnel_type = b.job_type,a.company = b.company_name,a.company_code = b.company_code,a.card = b.id_card,a.branche_company_code = b.branche_company_code,a.branche_company = b.branche_company,a.jd_codeori = b.job_code,a.job_codeori = b.job_code2 where a.locked = 0");
 			logger.info(String.format("根据工号关联更新姓名、公司、工种、身份证号,记录数%d",rows));
 			// 未匹配上工号的数据 用身份证号关联更新工号、姓名、公司、工种
-			rows = jdbcTemplate.update("update bsth_c_personnel a inner join bsth_c_employee b on a.card = b.id_card set a.job_code = b.job_code1,a.personnel_name = b.employee_name,a.personnel_type = b.job_type,a.company = b.company_name,a.company_code = b.company_code,a.branche_company_code = b.branche_company_code,a.branche_company = b.branche_company,a.jd_codeori = b.job_code,a.job_codeori = b.job_code2 where a.destroy = 0 and a.job_code <> b.job_code1 and a.locked = 0");
+			rows = jdbcTemplate.update("update bsth_c_personnel a inner join bsth_c_employee b on a.card = b.id_card set a.destroy = 0, a.job_code = b.job_code1,a.personnel_name = b.employee_name,a.personnel_type = b.job_type,a.company = b.company_name,a.company_code = b.company_code,a.branche_company_code = b.branche_company_code,a.branche_company = b.branche_company,a.jd_codeori = b.job_code,a.job_codeori = b.job_code2 where a.job_code <> b.job_code1 and a.locked = 0");
 			logger.info(String.format("根据身份证号关联更新工号、姓名、公司、工种,记录数%d",rows));
 			// 可能会出现数据异常情况 如一个是最新的工号无身份证号，一个是老的工号有身份证号，最后更新的结果会造成工号和身份证号重复
+			// 将更晚创建的人员信息destroy更新为2
+			rows = jdbcTemplate.update("update bsth_c_personnel x INNER JOIN (select card,max(id) id from bsth_c_personnel a where destroy = 0 and LENGTH(a.card) > 1  and a.locked = 0) y on x.id = y.id set x.destroy = 2");
+			logger.info(String.format("同一个人,临时将更晚创建的人员destroy更新为2,记录数%d",rows));
 			// 将更早创建的人员信息更新为停用
-			rows = jdbcTemplate.update("update bsth_c_personnel x INNER JOIN (select card,min(id) id from bsth_c_personnel a where destroy = 0 and LENGTH(a.card) > 1  and a.locked = 0 GROUP BY card having count(*) > 1) y on x.id = y.id set destroy = 1");
+			rows = jdbcTemplate.update("update bsth_c_personnel set destroy = 1 where destroy = 0");
 			logger.info(String.format("同一个人,将更早创建的人员停用,记录数%d",rows));
+			// 将更晚创建的人员信息更新为启用
+			rows = jdbcTemplate.update("update bsth_c_personnel set destroy = 0 where destroy = 2");
+			logger.info(String.format("同一个人,将更晚创建的人员启用,记录数%d",rows));
 			// 仍未匹配上的调度数据作为停用人员
 			rows = jdbcTemplate.update("update bsth_c_personnel a left join bsth_c_employee b on a.job_code = b.job_code1 set a.destroy = 1 where a.destroy = 0 and b.job_code1 is null and a.locked = 0");
 			logger.info(String.format("调度系统未匹配数据标记为停用,记录数%d",rows));
-spring.profiles: dev,prod
-spring.profiles.active: prod
+spring.profiles.active= prod
  
 spring.view.suffix=.html
 server.session-timeout=-1