From 4327dc71864c78ab6ce2adf9e2c044b029b5eddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com> Date: Thu, 4 Jan 2024 18:47:58 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81swagger=E6=8E=A5=E5=8F=A3=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ibeetl/jlw/entity/SchoolClass.java | 9 ++ .../jlw/entity/UniversitiesColleges.java | 12 ++ .../ibeetl/jlw/service/StudentService.java | 80 ++++++++--- .../ibeetl/jlw/service/TeacherService.java | 35 +++++ .../service/UniversitiesCollegesService.java | 126 +++++++++++------ .../java/com/ibeetl/jlw/util/BxJDBCUtil.java | 40 ++++++ .../com/ibeetl/jlw/util/HttpJsonRequest.java | 41 ++++++ .../com/ibeetl/jlw/util/ZhiYunJDBCUtil.java | 39 ++++++ .../com/ibeetl/jlw/web/AccountController.java | 9 +- .../ibeetl/jlw/web/SchoolClassController.java | 131 ++++++++++-------- .../web/query/UniversitiesCollegesQuery.java | 11 ++ 11 files changed, 412 insertions(+), 121 deletions(-) create mode 100644 web/src/main/java/com/ibeetl/jlw/util/BxJDBCUtil.java create mode 100644 web/src/main/java/com/ibeetl/jlw/util/ZhiYunJDBCUtil.java diff --git a/web/src/main/java/com/ibeetl/jlw/entity/SchoolClass.java b/web/src/main/java/com/ibeetl/jlw/entity/SchoolClass.java index 257d7c14..eefb07ba 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/SchoolClass.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/SchoolClass.java @@ -76,7 +76,16 @@ public class SchoolClass extends BaseEntity { @ApiModelProperty("智云2.0ID") private Long oldClassId; + @ApiModelProperty("保险系统班级id") + private Integer icibtClassId; + public Integer getIcibtClassId() { + return icibtClassId; + } + + public void setIcibtClassId(Integer icibtClassId) { + this.icibtClassId = icibtClassId; + } public Long getOldClassId() { return oldClassId; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java index cfa393d8..7850f98f 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java @@ -104,6 +104,16 @@ public class UniversitiesColleges extends BaseEntity { return oldSchoolId; } + private Integer icibtSchoolId; + + public Integer getIcibtSchoolId() { + return icibtSchoolId; + } + + public void setIcibtSchoolId(Integer icibtSchoolId) { + this.icibtSchoolId = icibtSchoolId; + } + public void setOldSchoolId(Long oldSchoolId) { this.oldSchoolId = oldSchoolId; } @@ -280,6 +290,8 @@ public class UniversitiesColleges extends BaseEntity { this.userId = userId; } + + public String getUniversitiesCollegesAuthCode() { return universitiesCollegesAuthCode; } diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java index de6971e9..5a93d159 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java @@ -27,6 +27,7 @@ import com.ibeetl.jlw.entity.vo.StudentLogAnalysisVO; import com.ibeetl.jlw.entity.vo.StudentLoginLogVO; import com.ibeetl.jlw.entity.vo.StudentUseLogVO; import com.ibeetl.jlw.job.CacheLogJob; +import com.ibeetl.jlw.util.HttpJsonRequest; import com.ibeetl.jlw.web.query.*; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -48,6 +49,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.*; import java.math.BigDecimal; +import java.security.MessageDigest; import java.sql.SQLException; import java.text.DateFormat; import java.text.DecimalFormat; @@ -148,6 +150,8 @@ public class StudentService extends CoreBaseService { private final ExecutorService pool = Executors.newCachedThreadPool(); @Autowired private WebPlatformService webPlatformService; + @Autowired + private UniversitiesCollegesService universitiesCollegesService; public PageQuery queryByCondition(PageQuery query) { PageQuery ret = studentDao.queryByCondition(query); @@ -489,14 +493,36 @@ public class StudentService extends CoreBaseService { } } + public static String encryptToMD5(String input) { + try { + MessageDigest md = MessageDigest.getInstance("MD5"); + byte[] messageDigest = md.digest(input.getBytes()); + + StringBuilder hexString = new StringBuilder(); + for (byte b : messageDigest) { + String hex = Integer.toHexString(0xff & b); + if (hex.length() == 1) { + hexString.append('0'); + } + hexString.append(hex).append('-'); + } + hexString.deleteCharAt(hexString.length() - 1); // 移除末尾多余的连字符 + return hexString.toString().toUpperCase(); // 转换为大写形式 + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + public Student getStudentByStudentNoAndOrgId(String studentNo, Long orgId) { List students = studentDao.getStudentByStudentNoAndOrgId(studentNo, orgId); - if(students!=null&&students.size()>0){ + if (students != null && students.size() > 0) { return students.get(0); } return null; } - public JsonResult add(@NotNull Student student) { + + public JsonResult add(@NotNull Student student) { Date date = new Date(); @@ -518,17 +544,25 @@ public class StudentService extends CoreBaseService { s.setStudentId(student.getStudentId()); s.setUserId(createdUserId); s.setOrgId(orgId); + CoreUser user = coreUserService.getUserById(createdUserId); - try{ + try { //新建学生用户资金总表 - studentAccountAssetAllocationService.createFundAccountWithUserCreated(student.getStudentId(), user.getOldId(),orgId); + studentAccountAssetAllocationService.createFundAccountWithUserCreated(student.getStudentId(), user.getOldId(), orgId); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } this.updateTemplate(s); + UniversitiesColleges universitiesColleges = universitiesCollegesService.getById(schoolClass.getUniversitiesCollegesId()); + Integer icibtSchoolId = universitiesColleges.getIcibtSchoolId(); + Integer icibtClassId = schoolClass.getIcibtClassId(); + if(icibtSchoolId!=null&&icibtClassId!=null){ + createBxStudent(icibtSchoolId, icibtClassId, user.getCode(), student.getStudentName(), 1); + } + JsonResult jsonResult = new JsonResult(); jsonResult.setCode(JsonReturnCode.SUCCESS.getCode()); jsonResult.setData(student.getStudentId()); @@ -540,6 +574,14 @@ public class StudentService extends CoreBaseService { return jsonResult; } + public void createBxStudent(Integer icibtSchoolId, Integer icibtClassId, String studentNo, String name, Integer sex) { + String PostData = "{'LoginName':'" + studentNo + "','Password':'" + + encryptToMD5("123qwe") + "','Name':'" + name + "','Sex':'" + + sex + "','SchoolNumber':'" + studentNo + "','RoleId':'" + 4 + "','SchoolId':'" + + icibtSchoolId + "','SchoolClassId':[" + icibtClassId + "]}"; + String request = HttpJsonRequest.sendPostRequest("http://120.79.161.177:8183/SignIn/AddUser", null, PostData, "application/json"); + } + public Boolean edit(Student student) { SchoolClass schoolClass = schoolClassService.queryById(student.getClassId()); student.setOrgId(schoolClass.getOrgId()); @@ -1641,25 +1683,25 @@ public class StudentService extends CoreBaseService { return studentDao.getStudentInfoByKeyword(keyword, schoolId); } - public PageQuery> pagedListStudentInfoByClassId(String classIds,Integer pageNo, Integer pageSize) { + public PageQuery> pagedListStudentInfoByClassId(String classIds, Integer pageNo, Integer pageSize) { PageQuery pageQuery = new PageQuery(); pageQuery.setPageSize(pageSize); pageQuery.setPageNumber(pageNo); - Map map = new HashMap<>(); - map.put("classIds",classIds); + Map map = new HashMap<>(); + map.put("classIds", classIds); pageQuery.setParas(map); return studentDao.pagedListStudentInfoByClassId(pageQuery); } - public List> findAllBySchoolId(Long schoolId) { + public List> findAllBySchoolId(Long schoolId) { List> mapList = studentDao.findAllBySchoolId(schoolId); - List> dataList = new ArrayList<>(); + List> dataList = new ArrayList<>(); //将内部元素弄成驼峰 for (Map map : mapList) { - Map data= new HashMap<>(); - data.put("studentNo",map.get("studentno")); - data.put("name",map.get("name")); - data.put("classId",map.get("classid")); + Map data = new HashMap<>(); + data.put("studentNo", map.get("studentno")); + data.put("name", map.get("name")); + data.put("classId", map.get("classid")); dataList.add(data); } return dataList; @@ -1669,16 +1711,16 @@ public class StudentService extends CoreBaseService { return studentDao.findStudentNoByClassId(classId); } - public List getAll(){ + public List getAll() { return studentDao.all(); } //查询没有基础资金的学生账号 - public List getNoBaseStudent(){ - return studentDao.getNoBaseStudent(); + public List getNoBaseStudent() { + return studentDao.getNoBaseStudent(); } - public List> findAllStudent(){ - return studentDao.findAllStudent(); + public List> findAllStudent() { + return studentDao.findAllStudent(); } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java index d476f1ba..5dadcf40 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java @@ -24,6 +24,7 @@ import com.ibeetl.jlw.dao.UniversitiesCollegesDao; import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.entity.dto.TeacherBatchImportAdminDTO; import com.ibeetl.jlw.job.CacheLogJob; +import com.ibeetl.jlw.util.HttpJsonRequest; import com.ibeetl.jlw.web.query.*; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -50,6 +51,7 @@ import javax.validation.constraints.NotBlank; import java.io.*; import java.math.BigDecimal; import java.math.RoundingMode; +import java.security.MessageDigest; import java.text.DateFormat; import java.text.DecimalFormat; import java.text.SimpleDateFormat; @@ -251,6 +253,27 @@ public class TeacherService extends CoreBaseService { return null; } + public static String encryptToMD5(String input) { + try { + MessageDigest md = MessageDigest.getInstance("MD5"); + byte[] messageDigest = md.digest(input.getBytes()); + + StringBuilder hexString = new StringBuilder(); + for (byte b : messageDigest) { + String hex = Integer.toHexString(0xff & b); + if (hex.length() == 1) { + hexString.append('0'); + } + hexString.append(hex).append('-'); + } + hexString.deleteCharAt(hexString.length() - 1); // 移除末尾多余的连字符 + return hexString.toString().toUpperCase(); // 转换为大写形式 + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + public JsonResult add(Teacher teacher) { Date date = new Date(); @@ -274,6 +297,11 @@ public class TeacherService extends CoreBaseService { t.setUserId(createdUserId); t.setOrgId(orgId); + + Integer icibtSchoolId = universitiesColleges.getIcibtSchoolId(); + if(icibtSchoolId!=null){ + createBxStudent(icibtSchoolId, teacher.getTeacherSn(), teacher.getTeacherName(), 1); + } this.updateTemplate(t); JsonResult jsonResult = new JsonResult(); @@ -288,6 +316,13 @@ public class TeacherService extends CoreBaseService { } + public void createBxStudent(Integer icibtSchoolId,String studentNo, String name, Integer sex) { + String PostData = "{'LoginName':'" + studentNo + "','Password':'" + + encryptToMD5("123qwe") + "','Name':'" + name + "','Sex':'" + + sex + "','SchoolNumber':'" + studentNo + "','RoleId':'" + 3 + "','SchoolId':'" + + icibtSchoolId + "'}"; + String request = HttpJsonRequest.sendPostRequest("http://120.79.161.177:8183/SignIn/AddUser", null, PostData, "application/json"); + } public Boolean edit(Teacher teacher) { this.updateTemplate(teacher); diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java index bb52769f..c9ee8d67 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java @@ -7,6 +7,7 @@ import cn.hutool.core.util.RandomUtil; import cn.hutool.extra.spring.SpringUtil; import cn.hutool.extra.validation.BeanValidationResult; import cn.hutool.extra.validation.ValidationUtil; +import com.alibaba.fastjson.JSONObject; import com.ibeetl.admin.console.service.OrgConsoleService; import com.ibeetl.admin.core.entity.CoreOrg; import com.ibeetl.admin.core.entity.CoreUser; @@ -16,8 +17,11 @@ import com.ibeetl.admin.core.service.CoreUserService; import com.ibeetl.jlw.dao.UniversitiesCollegesDao; import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.entity.dto.CreateUserDTO; +import com.ibeetl.jlw.util.BxJDBCUtil; +import com.ibeetl.jlw.util.HttpJsonRequest; import com.ibeetl.jlw.web.query.SchoolClassQuery; import com.ibeetl.jlw.web.query.UniversitiesCollegesQuery; +import jodd.http.HttpUtil; import org.beetl.sql.core.SqlId; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.core.query.LambdaQuery; @@ -28,12 +32,15 @@ import org.springframework.validation.annotation.Validated; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.sql.*; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; import static cn.hutool.core.collection.CollUtil.getFirst; +import static com.aspose.pdf.printing.PrinterPaperKind.Statement; import static com.ibeetl.admin.core.enums.MenuEnums.JT_01; import static com.ibeetl.admin.core.enums.MenuEnums.JT_S_04; import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser; @@ -45,28 +52,34 @@ import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser; @Service @Transactional @Validated -public class UniversitiesCollegesService extends CoreBaseService{ +public class UniversitiesCollegesService extends CoreBaseService { - @Autowired private UniversitiesCollegesDao universitiesCollegesDao; + @Autowired + private UniversitiesCollegesDao universitiesCollegesDao; - @Autowired private SchoolClassService schoolClassService; - @Autowired private OrgConsoleService orgConsoleService; - @Autowired private CoreUserService coreUserService; - @Autowired private WebPlatformService webPlatformService; - @Autowired private CorePlatformService corePlatformService; + @Autowired + private SchoolClassService schoolClassService; + @Autowired + private OrgConsoleService orgConsoleService; + @Autowired + private CoreUserService coreUserService; + @Autowired + private WebPlatformService webPlatformService; + @Autowired + private CorePlatformService corePlatformService; @Autowired private SysLogService sysLogService; - public PageQueryqueryByCondition(PageQuery query){ - PageQuery ret = universitiesCollegesDao.queryByCondition(query); + public PageQuery queryByCondition(PageQuery query) { + PageQuery ret = universitiesCollegesDao.queryByCondition(query); queryListAfter(ret.getList()); return ret; } - public void deleteUniversitiesColleges(String ids){ + public void deleteUniversitiesColleges(String ids) { universitiesCollegesDao.deleteUniversitiesCollegesByIds(ids); - for(int i=0;i getValues (Object paras){ - return sqlManager.select(SqlId.of("jlw.universitiesColleges.getUniversitiesCollegesValues"),UniversitiesColleges.class,paras); + public List getValues(Object paras) { + return sqlManager.select(SqlId.of("jlw.universitiesColleges.getUniversitiesCollegesValues"), UniversitiesColleges.class, paras); } - public List getValuesByQuery(UniversitiesCollegesQuery universitiesCollegesQuery){ + public List getValuesByQuery(UniversitiesCollegesQuery universitiesCollegesQuery) { List universitiesCollegesList = universitiesCollegesDao.getValuesByQuery(universitiesCollegesQuery); @@ -193,16 +222,17 @@ public class UniversitiesCollegesService extends CoreBaseService schoolClassList = schoolClassService.getValuesByQuery(schoolClassQuery); Map> groupByUniversitiesCollegesId = null; - try{ + try { groupByUniversitiesCollegesId = schoolClassList.stream().collect(Collectors.groupingBy(e -> e.getUniversitiesCollegesId())); - }catch (Exception e){} + } catch (Exception e) { + } - for(int i=0;i 0; } - public void verifyUniAuthCodeThrows(@NotNull(message="院校ID不能为空！") Long universitiesCollegesId, - @NotEmpty(message="院校授权码不能为空！") String universitiesCollegesAuthCode) { + public void verifyUniAuthCodeThrows(@NotNull(message = "院校ID不能为空！") Long universitiesCollegesId, + @NotEmpty(message = "院校授权码不能为空！") String universitiesCollegesAuthCode) { boolean verifyUniAuthCode = verifyUniAuthCode(universitiesCollegesId, universitiesCollegesAuthCode); Assert.isTrue(verifyUniAuthCode, "院校授权码，验证失败！"); } @@ -302,6 +334,7 @@ public class UniversitiesCollegesService extends CoreBaseService> findAll(){ - return universitiesCollegesDao.findAllUniversitiesColleges(); + public List> findAll() { + return universitiesCollegesDao.findAllUniversitiesColleges(); } - public List getAll(){ - return universitiesCollegesDao.getAll(); + public List getAll() { + return universitiesCollegesDao.getAll(); } } diff --git a/web/src/main/java/com/ibeetl/jlw/util/BxJDBCUtil.java b/web/src/main/java/com/ibeetl/jlw/util/BxJDBCUtil.java new file mode 100644 index 00000000..206302d1 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/util/BxJDBCUtil.java @@ -0,0 +1,40 @@ +package com.ibeetl.jlw.util; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; + +public class BxJDBCUtil { + + private final static String URL = "jdbc:sqlserver://120.79.161.177:1433;databaseName=ICIBT1.1.1;trustServerCertificate=true;encrypt=true"; + private static final String USER = "sa"; + private static final String PASSWORD = "sztzjy@2017"; + + + // 打开数据库连接 + public static Connection openConn() throws SQLException { + try { + Connection connection = DriverManager.getConnection(URL, USER, PASSWORD); + if (connection != null) { + System.out.println("成功建立数据库连接"); + return connection; + } else { + throw new SQLException("无法建立数据库连接"); + } + } catch (SQLException e) { + throw new SQLException("无法建立数据库连接: " + e.getMessage(), e); + } + } + + // 关闭数据库连接 + public static void closeConn(Connection connection) { + if (connection != null) { + try { + connection.close(); + System.out.println("数据库连接已关闭"); + } catch (SQLException e) { + System.err.println("无法关闭数据库连接: " + e.getMessage()); + } + } + } +} diff --git a/web/src/main/java/com/ibeetl/jlw/util/HttpJsonRequest.java b/web/src/main/java/com/ibeetl/jlw/util/HttpJsonRequest.java index 97f16edb..0ceb7fff 100644 --- a/web/src/main/java/com/ibeetl/jlw/util/HttpJsonRequest.java +++ b/web/src/main/java/com/ibeetl/jlw/util/HttpJsonRequest.java @@ -7,8 +7,10 @@ import org.json.JSONObject; import java.io.BufferedReader; import java.io.InputStreamReader; +import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.URL; +import java.nio.charset.StandardCharsets; @Slf4j public class HttpJsonRequest { @@ -45,4 +47,43 @@ public class HttpJsonRequest { JSONObject jsonObject = new JSONObject(jsonResponse); return jsonObject.getJSONArray("data"); } + + + public static String sendPostRequest(String urlString, String authorizationHeader, String postData,String contentType) { + StringBuilder response = new StringBuilder(); + try { + URL url = new URL(urlString); + HttpURLConnection con = (HttpURLConnection) url.openConnection(); + + // Set up the connection for POST + con.setRequestMethod("POST"); +// con.setRequestProperty("Authorization", authorizationHeader); + con.setRequestProperty("Content-Type", contentType); + con.setDoOutput(true); + + // Write the data to the connection + try (OutputStream os = con.getOutputStream()) { + byte[] postDataBytes = postData.getBytes(StandardCharsets.UTF_8); + os.write(postDataBytes); + os.flush(); + } + + int responseCode = con.getResponseCode(); + if (responseCode == HttpURLConnection.HTTP_OK) { + BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream())); + String inputLine; + + while ((inputLine = in.readLine()) != null) { + response.append(inputLine); + } + in.close(); + } else { + log.info("-----------------send接口请求失败：-------" + responseCode); + throw new IllegalArgumentException("HTTP POST request failed with response code: " + responseCode); + } + } catch (Exception e) { + e.printStackTrace(); + } + return response.toString(); + } } diff --git a/web/src/main/java/com/ibeetl/jlw/util/ZhiYunJDBCUtil.java b/web/src/main/java/com/ibeetl/jlw/util/ZhiYunJDBCUtil.java new file mode 100644 index 00000000..5fe0db38 --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/util/ZhiYunJDBCUtil.java @@ -0,0 +1,39 @@ +package com.ibeetl.jlw.util; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; + +public class ZhiYunJDBCUtil { + + private final static String URL = "jdbc:sqlserver://120.79.161.177:1433;databaseName=Test.Zhiyun_v2.0;trustServerCertificate=true;encrypt=true"; + private static final String USER = "sa"; + private static final String PASSWORD = "sztzjy@2017"; + + // 打开数据库连接 + public static Connection openConn() throws SQLException { + try { + Connection connection = DriverManager.getConnection(URL, USER, PASSWORD); + if (connection != null) { + System.out.println("成功建立数据库连接"); + return connection; + } else { + throw new SQLException("无法建立数据库连接"); + } + } catch (SQLException e) { + throw new SQLException("无法建立数据库连接: " + e.getMessage(), e); + } + } + + // 关闭数据库连接 + public static void closeConn(Connection connection) { + if (connection != null) { + try { + connection.close(); + System.out.println("数据库连接已关闭"); + } catch (SQLException e) { + System.err.println("无法关闭数据库连接: " + e.getMessage()); + } + } + } +} diff --git a/web/src/main/java/com/ibeetl/jlw/web/AccountController.java b/web/src/main/java/com/ibeetl/jlw/web/AccountController.java index c4fe8bde..f4dae970 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/AccountController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/AccountController.java @@ -921,13 +921,14 @@ public class AccountController { @PostMapping("updateUserId.json") public JsonResult updateUserId() throws SQLException { CoreUser coreUser = new CoreUser(); + coreUser.setOrgId(248L); List coreUsers = userService.getCoreUserList(coreUser); int i = 0; for (CoreUser user : coreUsers) { System.out.println("已完成：" + i++); - if (user.getOldId() != null) { - continue; - } +// if (user.getOldId() != null) { +// continue; +// } Connection conn = openConn(); PreparedStatement ps = conn.prepareStatement("select * from EduUsers where username = '" + user.getCode() + "' and IsDeleted = 0"); @@ -946,7 +947,7 @@ public class AccountController { @ApiOperation("修改用户表userid") @PostMapping("updateUserIdAndOldIdIsNull.json") - public JsonResult updateUserIdAndOldIdIsNull() throws SQLException { + public JsonResult updateUserIdAndOldIdIsNull() { CoreUser coreUser = new CoreUser(); List coreUsers = userService.getCoreUserListAndOldIdIsNull(); int i = 0; diff --git a/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java b/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java index 7c3c8373..420a0091 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java @@ -8,6 +8,7 @@ import cn.jlw.Interceptor.SCoreUser; import cn.jlw.util.excel.ExcelUtil; import cn.jlw.util.excel.listener.MyValidateExcelCellDataListener; import cn.jlw.validate.ValidateConfig; +import com.alibaba.fastjson.JSONObject; import com.ibeetl.admin.core.annotation.Function; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.file.FileService; @@ -22,6 +23,7 @@ import com.ibeetl.jlw.entity.dto.SchoolClassBatchImportDTO; import com.ibeetl.jlw.service.SchoolClassService; import com.ibeetl.jlw.service.UniversitiesCollegesService; import com.ibeetl.jlw.service.UniversitySystemService; +import com.ibeetl.jlw.util.HttpJsonRequest; import com.ibeetl.jlw.web.query.SchoolClassQuery; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -64,14 +66,20 @@ public class SchoolClassController extends BaseController { private static final String API = "/api/schoolClass"; - @Autowired private SchoolClassService schoolClassService; + @Autowired + private SchoolClassService schoolClassService; - @Autowired private UniversitiesCollegesService universitiesCollegesService; - @Autowired private UniversitiesCollegesDao universitiesCollegesDao; + @Autowired + private UniversitiesCollegesService universitiesCollegesService; + @Autowired + private UniversitiesCollegesDao universitiesCollegesDao; - @Autowired private UniversitySystemService systemService; - @Autowired private CorePlatformService corePlatformService; - @Autowired private CoreUserService coreUserService; + @Autowired + private UniversitySystemService systemService; + @Autowired + private CorePlatformService corePlatformService; + @Autowired + private CoreUserService coreUserService; @Autowired FileService fileService; @@ -85,17 +93,17 @@ public class SchoolClassController extends BaseController { if (null != coreUser && !coreUser.isAdmin()) { condition.setOrgId(coreUser.getOrgId()); } - Listlist = schoolClassService.getValuesByQueryNotWithPermission(condition); - return JsonResult.success(list); + List list = schoolClassService.getValuesByQueryNotWithPermission(condition); + return JsonResult.success(list); } @GetMapping(API + "/getListWithLogin.do") @ResponseBody @ApiOperation("列表") public JsonResult> getListWithLogin(SchoolClassQuery param, @SCoreUser CoreUser coreUser) { - - Listlist = schoolClassService.getValues(param); - return JsonResult.success(list); + + List list = schoolClassService.getValues(param); + return JsonResult.success(list); } @@ -106,9 +114,9 @@ public class SchoolClassController extends BaseController { @ResponseBody @ApiOperation("后台系统管理界面") public ModelAndView index(@SCoreUser CoreUser coreUser) { - ModelAndView view = new ModelAndView("/jlw/schoolClass/index.html") ; + ModelAndView view = new ModelAndView("/jlw/schoolClass/index.html"); view.addObject("search", SchoolClassQuery.class.getName()); - view.addObject("beTeacher",null != coreUser && "JT_S_02".equals(coreUser.getJobType1())?1:2);//是否是教师 1是 2否 + view.addObject("beTeacher", null != coreUser && "JT_S_02".equals(coreUser.getJobType1()) ? 1 : 2);//是否是教师 1是 2否 return view; } @@ -129,7 +137,7 @@ public class SchoolClassController extends BaseController { @ApiOperation("后台系统管理界面-添加") public ModelAndView add(Long classId, @SCoreUser CoreUser coreUser) { ModelAndView view = new ModelAndView("/jlw/schoolClass/add.html"); - if(classId != null) { + if (classId != null) { SchoolClass schoolClass = schoolClassService.queryById(classId); view.addObject("schoolClass", defaultIfNull(schoolClass, new SchoolClass())); @@ -138,9 +146,9 @@ public class SchoolClassController extends BaseController { info = systemService.getInfo(schoolClass.getUniversitySystemId()); } view.addObject("universityFacultyId", defaultIfNull(info, new UniversitySystem()).getUniversityFacultyId()); - }else { - view.addObject("schoolClass",new SchoolClass()); - view.addObject("universityFacultyId",""); + } else { + view.addObject("schoolClass", new SchoolClass()); + view.addObject("universityFacultyId", ""); } // 如果是学校管理员则查询所在院校的信息 @@ -149,7 +157,7 @@ public class SchoolClassController extends BaseController { view.addObject("universitiesCollegesInfo", universitiesColleges); } - view.addObject("beTeacher",null != coreUser && "JT_S_02".equals(coreUser.getJobType1())?1:2);//是否是教师 1是 2否 + view.addObject("beTeacher", null != coreUser && "JT_S_02".equals(coreUser.getJobType1()) ? 1 : 2);//是否是教师 1是 2否 return view; } @@ -169,17 +177,17 @@ public class SchoolClassController extends BaseController { @Function("schoolClass.query") @ResponseBody @ApiOperation("分页列表") - public JsonResult list(SchoolClassQuery condition,@SCoreUser CoreUser coreUser){ + public JsonResult list(SchoolClassQuery condition, @SCoreUser CoreUser coreUser) { PageQuery page = condition.getPageQuery(); schoolClassService.queryByCondition(page); if (!coreUser.isAdmin()) { condition.setOrgId(coreUser.getOrgId()); } - Mapmap = new HashMap<>(); - map.put("count",page.getTotalRow()); - map.put("data",page.getList()); - map.put("beTeacher",null != coreUser && "JT_S_02".equals(coreUser.getJobType1())?1:2);//是否是教师 1是 2否 + Map map = new HashMap<>(); + map.put("count", page.getTotalRow()); + map.put("data", page.getList()); + map.put("beTeacher", null != coreUser && "JT_S_02".equals(coreUser.getJobType1()) ? 1 : 2);//是否是教师 1是 2否 return JsonResult.successMap(map); } @@ -188,15 +196,15 @@ public class SchoolClassController extends BaseController { @Function("schoolClass.add") @ResponseBody @ApiOperation("添加") - public JsonResult add(@Validated(ValidateConfig.ADD.class)SchoolClass schoolClass, BindingResult result, @SCoreUser CoreUser coreUser){ - if(result.hasErrors()){ + public JsonResult add(@Validated(ValidateConfig.ADD.class) SchoolClass schoolClass, BindingResult result, @SCoreUser CoreUser coreUser) { + if (result.hasErrors()) { return JsonResult.failMessage(result); - }else{ + } else { schoolClass.setAddTime(new Date()); schoolClass.setClassStatus(1); schoolClass.setUserId(coreUser.getId()); - - if(null != schoolClass.getUniversitiesCollegesId()){ + Integer icibtClassId = 0; + if (null != schoolClass.getUniversitiesCollegesId()) { UniversitiesColleges universitiesColleges = universitiesCollegesService.queryById(schoolClass.getUniversitiesCollegesId()); String uniqueClassSn = schoolClassService.buildClassSnEnsureUnique(universitiesColleges, schoolClass.getClassName()); schoolClass.setClassSn(uniqueClassSn); @@ -204,42 +212,56 @@ public class SchoolClassController extends BaseController { // 判断班级编号是否已经存在,并抛出异常 // 如果院校ID不为空，则验证方法的区域缩减到院校级别的。不使用全表验证了 - if(StrUtil.isNotBlank(schoolClass.getClassSn())) { + if (StrUtil.isNotBlank(schoolClass.getClassSn())) { schoolClassService.validateClassSnListIsExistsThrow(Collections.singletonList(schoolClass), universitiesColleges.getOrgId().toString()); } - } - - else { + icibtClassId = createBxClass(schoolClass.getClassName(), universitiesColleges.getIcibtSchoolId()); + } else { UniversitiesColleges universitiesColleges = new UniversitiesColleges(); universitiesColleges.setOrgId(coreUser.getOrgId()); List universitiesCollegesList = universitiesCollegesService.getValues(universitiesColleges); - if(universitiesCollegesList.size() > 0){ + if (universitiesCollegesList.size() > 0) { universitiesColleges = universitiesCollegesList.get(0); String uniqueClassSn = schoolClassService.buildClassSnEnsureUnique(universitiesColleges, schoolClass.getClassName()); schoolClass.setClassSn(uniqueClassSn); schoolClass.setUniversitiesCollegesId(universitiesColleges.getUniversitiesCollegesId()); schoolClass.setOrgId(universitiesColleges.getOrgId()); + icibtClassId = createBxClass(schoolClass.getClassName(), universitiesColleges.getIcibtSchoolId()); } } schoolClassService.save(schoolClass); + + SchoolClass newClass = new SchoolClass(); + newClass.setIcibtClassId(icibtClassId); newClass.setClassId(schoolClass.getClassId()); - newClass.setOldClassId(1500+newClass.getClassId()); + newClass.setOldClassId(1500 + newClass.getClassId()); schoolClassService.updateTemplate(newClass); corePlatformService.clearDictCache(); return JsonResult.success(); } } + + private int createBxClass(String className, Integer icibtSchoolId) { + String request = HttpJsonRequest.sendPostRequest("http://120.79.161.177:8183/SignIn/AddClass", null, "{'ClassName':'" + className + "','SchoolId': " + icibtSchoolId + "}", "application/json"); + JSONObject jsonObject = JSONObject.parseObject(request); + String schoolId = jsonObject.getString("schoolClassId"); + if (schoolId != null) { + return Integer.parseInt(schoolId); + } else { + return 0; + } + } @PostMapping(MODEL + "/edit.json") @Function("schoolClass.edit") @ResponseBody @ApiOperation("编辑") - public JsonResult update(@Validated(ValidateConfig.UPDATE.class) SchoolClass schoolClass, BindingResult result) { - if(result.hasErrors()){ + public JsonResult update(@Validated(ValidateConfig.UPDATE.class) SchoolClass schoolClass, BindingResult result) { + if (result.hasErrors()) { return JsonResult.failMessage(result); - }else { + } else { schoolClass.setUserId(null); schoolClass.setOrgId(null); schoolClass.setAddTime(null); @@ -253,25 +275,25 @@ public class SchoolClassController extends BaseController { } } - + @GetMapping(MODEL + "/view.json") @Function("schoolClass.query") @ResponseBody @ApiOperation("根据ID获取数据") - public JsonResultqueryInfo(Long classId) { - SchoolClass schoolClass = schoolClassService.queryById( classId); - return JsonResult.success(schoolClass); + public JsonResult queryInfo(Long classId) { + SchoolClass schoolClass = schoolClassService.queryById(classId); + return JsonResult.success(schoolClass); } @GetMapping(MODEL + "/getValues.json") @ResponseBody @ApiOperation("列表") - public JsonResult>getValues(SchoolClassQuery condition, @SCoreUser CoreUser coreUser) { + public JsonResult> getValues(SchoolClassQuery condition, @SCoreUser CoreUser coreUser) { if (!coreUser.isAdmin()) { condition.setOrgId(coreUser.getOrgId()); } - Listlist = schoolClassService.getValues(condition); - return JsonResult.success(list); + List list = schoolClassService.getValues(condition); + return JsonResult.success(list); } @@ -287,7 +309,8 @@ public class SchoolClassController extends BaseController { /** * 获取不重复的班级编号 - * @param prefix 自定义前缀 （非必传） + * + * @param prefix 自定义前缀 （非必传） * @return */ @GetMapping(MODEL + "/randomClassSn.json") @@ -299,6 +322,7 @@ public class SchoolClassController extends BaseController { /** * 导出批量模板 + * * @return */ @SneakyThrows @@ -320,7 +344,8 @@ public class SchoolClassController extends BaseController { /** * 功能描述:
* 〈导入批量模板数据〉 - * 批量导入题目 excel版本，只支持单选多选，对错吧 + * 批量导入题目 excel版本，只支持单选多选，对错吧 + * * @param file * @return {@link JsonResult} * @Author: 87966 @@ -364,8 +389,7 @@ public class SchoolClassController extends BaseController { listener.putFailMessage(StrUtil.format("异常的院校ID：{}，该院校已删除状态", e.getUniversitiesCollegesId())); } return sc.getOrgId(); - } - else { + } else { listener.putFailMessage(StrUtil.format("异常的院校ID：{}，未查询到院校信息，请联系管理员", e.getUniversitiesCollegesId())); } return null; @@ -373,19 +397,16 @@ public class SchoolClassController extends BaseController { try { schoolClassService.validateClassSnListIsExistsThrow(list, list.get(0).getOrgId().toString()); - } - catch (IllegalArgumentException e) { + } catch (IllegalArgumentException e) { listener.putFailMessage(e.getMessage()); - } - catch (Exception e) { } - finally { + } catch (Exception e) { + } finally { // 再次判断错误的结果集 Assert.isTrue(CollectionUtil.isEmpty(listener.getFailMessage()), JSONUtil.toJsonStr(listener.getFailMessage())); } schoolClassService.insertBatch(list); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { return JsonResult.failMessage(exception.getMessage()).setCode(DIY_ERROR.getCode()); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/UniversitiesCollegesQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/UniversitiesCollegesQuery.java index 39d81928..d8e31146 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/UniversitiesCollegesQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/UniversitiesCollegesQuery.java @@ -68,6 +68,16 @@ public class UniversitiesCollegesQuery extends PageParam { @ApiModelProperty("结束时间") private Date endTime; + @ApiModelProperty("保险院校id") + private Integer icibtSchoolId; + + public Integer getIcibtSchoolId() { + return icibtSchoolId; + } + + public void setIcibtSchoolId(Integer icibtSchoolId) { + this.icibtSchoolId = icibtSchoolId; + } public Long getUniversitiesCollegesId(){ return universitiesCollegesId; @@ -163,6 +173,7 @@ public class UniversitiesCollegesQuery extends PageParam { pojo.setAddTime(this.getAddTime()); pojo.setOrgId(this.getOrgId()); pojo.setUserId(this.getUserId()); + pojo.setIcibtSchoolId(this.icibtSchoolId); return pojo; }