bug修改

admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java

@@ -3,8 +3,10 @@ package com.ibeetl.admin.core.dao;
 import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.web.query.CustomFilterByLcUser;
 import org.apache.commons.logging.Log;
+import org.beetl.sql.core.SQLManager;
 import org.beetl.sql.mapper.BaseMapper;
 import org.beetl.sql.mapper.annotation.SqlResource;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 import java.util.Date;
@@ -76,4 +78,10 @@ public interface CoreUserDao extends BaseMapper<CoreUser> {
                                            String keyword,
                                            String keyword2
                                            );
+
+    List<CoreUser> findBySchoolId(Long schoolId);
+
+    List<CoreUser> findAll();
+
+    void deleteById1(Long userId);
 }

admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseService.java

@@ -250,6 +250,7 @@ public class CoreBaseService<T> extends CoreBaseAnnotationParser {
         return ret == 1;
     }
 
+
     /**
      * 根据id删除数据
      *

admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java

@@ -396,7 +396,15 @@ public class CoreUserService extends CoreBaseService<CoreUser> {
                 , customFilter.getKeyword2());
     }
 
+  public List<CoreUser> findBySchoolId(Long schoolId) {
+    return coreUserDao.findBySchoolId(schoolId);
+  }
 
+  public List<CoreUser> findAll() {
+    return coreUserDao.findAll();
+  }
 
-
+  public void deleteById1(Long userId) {
+    sqlManager.deleteById(CoreUser.class, userId);
+  }
 }

admin-core/src/main/resources/sql/core/coreUser.md

@@ -39,7 +39,7 @@ getStudentByNo
 ===
      SELECT
 	core_user.old_id AS userId,
-	core_user.NAME AS NAME,
+	student.student_name AS NAME,
 	core_role.NAME AS roleName,
 	universities_colleges.universities_colleges_id AS schoolId,
 	school_class.class_id AS classId,
@@ -49,7 +49,7 @@ getStudentByNo
 	universities_colleges.universities_colleges_name AS schoolName,
 	university_faculty.university_faculty_id AS collegeId,
 	university_faculty.university_faculty_name AS collegeName,
-    student.student_id AS studentId
+    student.old_id AS studentId
     FROM
     core_user
     JOIN student ON core_user.CODE = student.student_sn
@@ -69,6 +69,9 @@ getStudentByNoOfNet
     core_user.old_id AS userId,
     core_user.NAME AS NAME,
     core_role.NAME AS roleName,
+    core_user.CODE as username,
+    4  as roleId,
+    student.student_sn as studentNo,
     universities_colleges.old_school_id AS schoolId,
     school_class.old_class_id AS classId,
     university_system.university_system_id AS majorId,
@@ -77,7 +80,7 @@ getStudentByNoOfNet
     universities_colleges.universities_colleges_name AS schoolName,
     university_faculty.university_faculty_id AS collegeId,
     university_faculty.university_faculty_name AS collegeName,
-    student.student_id AS studentId
+    student.old_id AS studentId
     FROM
     core_user
     JOIN student ON core_user.CODE = student.student_sn
@@ -95,7 +98,7 @@ getTeacherByNo
 ===
     SELECT
 	core_user.old_id AS userId,
-	core_user.NAME AS NAME,
+	teacher.teacher_name AS NAME,
 	core_role.NAME AS roleName,
 	universities_colleges.universities_colleges_id AS schoolId,
 	university_system.university_system_id AS majorId,
@@ -103,7 +106,7 @@ getTeacherByNo
 	universities_colleges.universities_colleges_name AS schoolName,
 	university_faculty.university_faculty_id AS collegeId,
 	university_faculty.university_faculty_name AS collegeName,
-    teacher.teacher_id AS teacherId
+    teacher.old_id AS teacherId
     FROM
     core_user
     JOIN teacher ON core_user.CODE = teacher.teacher_job_number
@@ -122,6 +125,7 @@ getTeacherByNoOfNet
 	core_user.old_id AS userId,
 	core_user.NAME AS NAME,
 	core_role.NAME AS roleName,
+    3 as roleId,
 	universities_colleges.old_school_id AS schoolId,
 	university_system.university_system_id AS majorId,
 	university_system.university_system_name AS majorName,
@@ -232,3 +236,17 @@ and (cu.name like #"%"+keyword+"%"# or cu.code like #"%"+keyword+"%"#)
 and (cu.code like #"%"+keyword+"%"#)
 @}
 order by cu.CREATE_TIME
+
+
+
+findBySchoolId
+===
+ select * from core_user where org_id = #schoolId#
+
+findAll
+===
+ select * from core_user
+
+deleteById1
+===
+delete from core_user where ID = #userId#

web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java

@@ -133,4 +133,8 @@ public interface StudentDao extends BaseMapper<Student>{
     List<String> findStudentNoByClassId(Long classId);
 
     List<Map<String,Object>> findAllStudent();
+
+    Student getByOldId(Long oldId);
+
+    Student getStudentByStudentNo(String studentNo);
 }

web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java

@@ -60,4 +60,10 @@ public interface TeacherDao extends BaseMapper<Teacher>{
     List<Teacher> getByTeacherJobNameAndOrgId(String teacherJobName, Long orgId);
 
     List<Map<String,Object>> userClassDalGetList();
+
+    Teacher getByOldId(Long oldId);
+
+    Teacher getByTeacherSn(String teacherSn);
+
+    void deleteById1(Long teacherId);
 }

web/src/main/java/com/ibeetl/jlw/dao/UniversityFacultyDao.java

@@ -42,4 +42,6 @@ public interface UniversityFacultyDao extends BaseMapper<UniversityFaculty>{
 
 
     UniversityFaculty findByOldId(Long oldId);
+
+    List<UniversityFaculty> findAll();
 }

web/src/main/java/com/ibeetl/jlw/dao/UniversitySystemDao.java

@@ -46,4 +46,6 @@ public interface UniversitySystemDao extends BaseMapper<UniversitySystem>{
 
 
     UniversitySystem findByOldId(Long oldId);
+
+    List<UniversitySystem> findAll();
 }

web/src/main/java/com/ibeetl/jlw/entity/Student.java

@@ -108,6 +108,7 @@ public class Student extends BaseEntity implements AbstractToken {
 
     private String accountIdByFuture;
 
+    private Long oldId;
     public Student(){
     }
 
@@ -338,4 +339,12 @@ public class Student extends BaseEntity implements AbstractToken {
     public void setAccountIdByFuture(String accountIdByFuture) {
         this.accountIdByFuture = accountIdByFuture;
     }
+
+    public Long getOldId() {
+        return oldId;
+    }
+
+    public void setOldId(Long oldId) {
+        this.oldId = oldId;
+    }
 }

web/src/main/java/com/ibeetl/jlw/service/StudentService.java

@@ -522,6 +522,11 @@ public class StudentService extends CoreBaseService<Student> {
         return null;
     }
 
+    public Student getStudentByStudentNo(String studentNo) {
+        return studentDao.getStudentByStudentNo(studentNo);
+    }
+
+
     public JsonResult add(@NotNull Student student) {
 
         Date date = new Date();
@@ -544,7 +549,7 @@ public class StudentService extends CoreBaseService<Student> {
         s.setStudentId(student.getStudentId());
         s.setUserId(createdUserId);
         s.setOrgId(orgId);
-
+        s.setOldId(student.getStudentId()+80000);
         CoreUser user = coreUserService.getUserById(createdUserId);
         try {
             //新建学生用户资金总表
@@ -597,11 +602,13 @@ public class StudentService extends CoreBaseService<Student> {
         s.setStudentId(student.getStudentId());
         s.setUserId(createdUserId);
         s.setOrgId(orgId);
-
+        if(student.getOldId()==null){
+            s.setOldId(student.getStudentId()+80000);
+        }
         CoreUser user = coreUserService.getUserById(createdUserId);
         try {
             //新建学生用户资金总表
-            studentAccountAssetAllocationService.createFundAccountWithUserCreated(student.getStudentId(), user.getOldId(), orgId);
+//            studentAccountAssetAllocationService.createFundAccountWithUserCreated(student.getStudentId(), user.getOldId(), orgId);
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -846,7 +853,7 @@ public class StudentService extends CoreBaseService<Student> {
                                 s.setStudentSn(studentSn);
                                 s.setUserId(coreUser.getId());
                                 s.setOrgId(schoolClass.get(0).getOrgId());
-
+                                s.setOldId(s.getStudentId()+80000);
                                 this.updateTemplate(s);
 
                                 if (list.size() == 0) {
@@ -1776,4 +1783,13 @@ public class StudentService extends CoreBaseService<Student> {
     public List<Map<String, Object>> findAllStudent() {
         return studentDao.findAllStudent();
     }
+
+    public Student getByOldId(Long oldId) {
+        return studentDao.getByOldId(oldId);
+    }
+
+
+    public void deleteById1(Long studentId) {
+       sqlManager.deleteById(Student.class, studentId);
+    }
 }

web/src/main/java/com/ibeetl/jlw/service/TeacherService.java

@@ -34,6 +34,7 @@ import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.beetl.sql.core.SQLManager;
 import org.beetl.sql.core.SqlId;
 import org.beetl.sql.core.engine.PageQuery;
 import org.beetl.sql.core.query.LambdaQuery;
@@ -74,6 +75,9 @@ import static com.ibeetl.jlw.web.IpAddressController.ipAddressMap;
 @Transactional
 public class TeacherService extends CoreBaseService<Teacher> {
 
+    @Autowired
+    protected SQLManager sqlManager;
+
     @Autowired
     private TeacherDao teacherDao;
 
@@ -300,7 +304,7 @@ public class TeacherService extends CoreBaseService<Teacher> {
         t.setTeacherId(teacher.getTeacherId());
         t.setUserId(createdUserId);
         t.setOrgId(orgId);
-        t.setOldId(5000L + teacher.getTeacherId());
+        t.setOldId(teacher.getOldId()==null?5000L + teacher.getTeacherId():teacher.getOldId());
 
         Integer icibtSchoolId = universitiesColleges.getIcibtSchoolId();
         if (icibtSchoolId != null) {
@@ -916,4 +920,16 @@ public class TeacherService extends CoreBaseService<Teacher> {
         return teacherDao.userClassDalGetList();
     }
 
+
+    public Teacher getByOldId(Long oldId){
+        return teacherDao.getByOldId(oldId);
+    }
+
+    public Teacher getByTeacherSn(String teacherSn){
+        return teacherDao.getByTeacherSn(teacherSn);
+    }
+    //物理删除教师
+    public void deleteById1(Long teacherId){
+        sqlManager.deleteById(Teacher.class, teacherId);
+    }
 }

web/src/main/java/com/ibeetl/jlw/service/UniversityFacultyService.java

@@ -107,6 +107,12 @@ public class UniversityFacultyService extends CoreBaseService<UniversityFaculty>
         universityFaculty.setUniversityFacultyAddTime(new Date());
         universityFaculty.setUniversityFacultyStatus(1);
         universityFacultyDao.insert(universityFaculty);
+        UniversityFaculty faculty = new UniversityFaculty();
+        faculty.setUniversityFacultyId(universityFaculty.getUniversityFacultyId());
+        if(universityFaculty.getOldId()==null){
+            faculty.setOldId(universityFaculty.getUniversityFacultyId()+500);
+            universityFacultyDao.updateTemplateById(faculty);
+        }
         universityFacultyQuery.setUniversityFacultyId(universityFaculty.getUniversityFacultyId());
         JsonResult jsonResult = new JsonResult();
         jsonResult.setData(universityFaculty.getUniversityFacultyId());//自增的ID丢进去
@@ -252,4 +258,8 @@ public class UniversityFacultyService extends CoreBaseService<UniversityFaculty>
         query.setUniversityFacultyId(id);
         return getFirst(getValuesByQueryNotWithPermission(query));
     }
+
+    public List<UniversityFaculty> findAll(){
+        return universityFacultyDao.findAll();
+    }
 }

web/src/main/java/com/ibeetl/jlw/service/UniversitySystemService.java

@@ -104,6 +104,12 @@ public class UniversitySystemService extends CoreBaseService<UniversitySystem>{
         universitySystem.setUniversitySystemAddTime(new Date());
         universitySystem.setUniversitySystemStatus(1);
         universitySystemDao.insert(universitySystem);
+        UniversitySystem u = new UniversitySystem();
+        u.setUniversitySystemId(universitySystem.getUniversitySystemId());
+        if(universitySystem.getOldId()==null){
+            u.setOldId(universitySystem.getUniversitySystemId()+500);
+            universitySystemDao.updateTemplateById(u);
+        }
         universitySystemQuery.setUniversitySystemId(universitySystem.getUniversitySystemId());
         JsonResult jsonResult = new JsonResult();
         jsonResult.setData(universitySystem.getUniversitySystemId());//自增的ID丢进去
@@ -269,4 +275,8 @@ public class UniversitySystemService extends CoreBaseService<UniversitySystem>{
         query.setUniversitySystemId(id);
         return getFirst(universitySystemDao.getValuesByQueryNotWithPermission(query));
     }
+
+    public List<UniversitySystem> findAll(){
+        return universitySystemDao.findAll();
+    }
 }

web/src/main/java/com/ibeetl/jlw/web/AccountController.java

@@ -180,7 +180,7 @@ public class AccountController {
                         "    CAST(EduAssetAllocation.Return_on_equity AS DECIMAL(18, 2)) AS Return_on_equity\n" +
                         "FROM EduUsers\n" +
                         "JOIN EduAssetAllocation ON EduUsers.Id = EduAssetAllocation.UserId\n" +
-                        "WHERE EduUsers.UserName = '" + username + "'";
+                        "WHERE EduUsers.Id = '" + username + "'";
                 PreparedStatement preparedStatement = connection.prepareStatement(sql);
                 ResultSet resultSet = preparedStatement.executeQuery();
                 while (resultSet.next()) {
@@ -1280,4 +1280,70 @@ public class AccountController {
         return JsonResult.success(schoolClassService.userClassDalGetClassListById());
     }
 
+    @ApiOperation("修改学生oldId")
+    @PostMapping("updateStudentOldId.json")
+    public void updateStudentOldId() throws SQLException {
+        List<Student> students = studentService.getAll();
+        if (students != null && students.size() > 0) {
+            int i = 0;
+            for (Student student : students) {
+                if (student.getOldId() != null) continue;
+                System.out.println(i++);
+                Connection connection = openConn();
+                String studentSn = student.getStudentSn();
+                String sql = "select * from EduStudents where StudentNo = '" + studentSn + "'";
+                PreparedStatement ps = connection.prepareStatement(sql);
+                ResultSet rs = ps.executeQuery();
+                while (rs.next()) {
+
+                    Long oldId = rs.getLong("Id");
+                    if (oldId > 0) {
+                        student.setOldId(oldId);
+
+                    }
+
+
+                }
+                if (student.getOldId() == null) {
+                    student.setOldId(80000 + student.getStudentId());
+                }
+                studentService.updateTemplate(student);
+                connection.close();
+                ps.close();
+                rs.close();
+            }
+        }
+    }
+
+
+    @ApiOperation("修改班级oldid")
+    @PostMapping("updateClassOldId.json")
+    public JsonResult updateClassOldId() throws SQLException {
+        List<SchoolClass> schoolClasses = schoolClassService.getAll();
+        if (schoolClasses != null && schoolClasses.size() > 0) {
+            for (SchoolClass schoolClass : schoolClasses) {
+                Connection connection = openConn();
+                String sql = "select * from EduClasses where Name = '" + schoolClass.getClassName() + "'";
+                PreparedStatement ps = connection.prepareStatement(sql);
+                ResultSet rs = ps.executeQuery();
+                Long oldId = 0L;
+                while (rs.next()) {
+                    oldId = rs.getLong("Id");
+                    if (oldId > 0) {
+                        schoolClass.setOldClassId(oldId);
+                    }
+                }
+                if (oldId == 0) {
+                    oldId = schoolClass.getClassId() + 1500;
+                    schoolClass.setOldClassId(oldId);
+                }
+                schoolClassService.updateTemplate(schoolClass);
+                connection.close();
+                ps.close();
+                rs.close();
+            }
+        }
+        return JsonResult.success();
+    }
+
 }

web/src/main/resources/application-dev.properties

@@ -6,7 +6,7 @@ springext.cache.enabled=true
 # \u6307\u5B9A\u4E3B\u7F13\u5B58\u5230\u671F\u65F6\u95F4\uFF0C\u5355\u4F4D\uFF08\u79D2\uFF09
 springext.cache.redis.ttl=300
 
-spring.redis.host=localhost
+spring.redis.host=118.31.7.2
 spring.redis.port=6379
 
 logging.level.root=INFO
@@ -25,9 +25,9 @@ spring.datasource.dynamic.hikari.connection-test-query=SELECT 1
 
 # master
 spring.datasource.dynamic.datasource.master.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource.dynamic.datasource.master.url=jdbc:mysql://124.223.219.235:3306/tzcj?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
-spring.datasource.dynamic.datasource.master.username=root
-spring.datasource.dynamic.datasource.master.password=shuchuang123@.
+spring.datasource.dynamic.datasource.master.url=jdbc:mysql://121.40.130.32:3306/tianze-pro?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+spring.datasource.dynamic.datasource.master.username=tianze-pro
+spring.datasource.dynamic.datasource.master.password=xYR3A4EXCWxkHmNX
 spring.datasource.dynamic.datasource.master.hikari.max-lifetime=60000
 
 # ds2

web/src/main/resources/sql/jlw/schoolClass.md

@@ -253,7 +253,7 @@ SELECT class_name as name FROM school_class WHERE old_class_id = #classId#
 
 findClassesByTeacherId
 ===
-select school_class.class_id as classId,school_class.class_name as className
+select school_class.old_class_id as classId,school_class.class_name as className
 from school_class
 join universities_colleges uc on school_class.universities_colleges_id = uc.universities_colleges_id
 join teacher t on uc.universities_colleges_id = t.universities_colleges_id

web/src/main/resources/sql/jlw/student.md

@@ -2243,3 +2243,11 @@ select student_sn as studentNo from student where class_id =#classId#
 findAllStudent
 ===
 select student_id as id,student_name as name,student_sn as schoolNumber,4 as roleId, old_class_id as classId from student join school_class on student.class_id = school_class.class_id
+
+getByOldId
+===
+select * from student where old_id = #oldId#
+
+getStudentByStudentNo
+===
+select * from student where student_sn =#studentNo#

web/src/main/resources/sql/jlw/teacher.md

@@ -583,3 +583,15 @@ WHERE sc.universities_colleges_id = t.universities_colleges_id
 ) AS classIds
 FROM
 teacher t
+
+getByOldId
+===
+select * from teacher where old_id=#oldId#
+
+getByTeacherSn
+===
+select * from teacher where teacher_job_number =#teacherSn# 
+
+deleteById1
+===
+delete from teacher where teacher_id = #teacherId#

web/src/main/resources/sql/jlw/universityFaculty.md

@@ -378,3 +378,7 @@ getAllUniversityFacultyWithColleges
 findByOldId
 ===
 select * from university_faculty where old_id =#oldId#
+
+findAll
+===
+ select * from university_faculty

web/src/main/resources/sql/jlw/universitySystem.md

@@ -378,3 +378,7 @@ university_system join university_faculty on  university_system.university_facul
 findByOldId
 ===
 select * from university_system where old_id =#oldId#
+
+findAll
+===
+ select * from university_system