diff --git a/src/main/java/com/syq/controller/ComputersController.java b/src/main/java/com/syq/controller/ComputersController.java index 39fe12bcddc4abdfc67deeecf6898b591a2858ad..8b454a384dba1c2e7aa72b6d3642ae8c59f4a21f 100644 --- a/src/main/java/com/syq/controller/ComputersController.java +++ b/src/main/java/com/syq/controller/ComputersController.java @@ -3,7 +3,11 @@ package com.syq.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -31,4 +35,40 @@ public class ComputersController { Pageable pageable = PageRequest.of(page-1, limit); return computersService.listComputersByPage(com, pageable); } + + /** + * 添加电脑 + * 创建人：孙玉全 + * @param com 添加的参数 + * @return 添加后的实体信息 + */ + @PostMapping + public Computers insertComputer(Computers com) { + return computersService.addOrUpdateComputer(com); + } + + /** + * 修改电脑 + * 创建人：孙玉全 + * @param com 要修改的参数 + * @return 修改后的实体信息 + */ + @PutMapping + public Computers updateComputer(Computers com) { + return computersService.addOrUpdateComputer(com); + } + + /** + * 删除电脑西信息 + * @param com 删除的参数 返回数值：1代表成功否则失败 + */ + @DeleteMapping + public Integer deleteComputer(Computers com) { + try { + computersService.deleteComputer(com); + return 1; + } catch (Exception e) { + return 0; + } + } } diff --git a/src/main/java/com/syq/controller/ResourcesRoomController.java b/src/main/java/com/syq/controller/ResourcesRoomController.java index 74bf6035cd96486de5a90617115072a5be285353..c9bfc716b3e27b60f8637a0e0a07a077464d6749 100644 --- a/src/main/java/com/syq/controller/ResourcesRoomController.java +++ b/src/main/java/com/syq/controller/ResourcesRoomController.java @@ -1,10 +1,14 @@ package com.syq.controller; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.syq.entity.ResourcesRoom; import com.syq.service.ResourcesRoomService; @RestController @@ -14,8 +18,53 @@ public class ResourcesRoomController { @Autowired private ResourcesRoomService resourcesRoomService; + + /** + * 查询所有资源室 + * 创建人：孙玉全 + * @return 所有资源室集合 + */ @GetMapping public Object getAllResourcesRoom() { return resourcesRoomService.getAllResourcesRoom(); } + + /** + * 添加资源室 + * 创建人：孙玉全 + * @param res 添加的参数 + * @return 添加后的实体信息 + */ + @PostMapping + public ResourcesRoom insertRoom(ResourcesRoom res) { + return resourcesRoomService.addOrUpdateRoom(res); + } + + /** + * 修改资源室 + * 创建人：孙玉全 + * @param res 修改的参数 + * @return 修改后的实体信息 + */ + @PutMapping + public ResourcesRoom updateRoom(ResourcesRoom res) { + return resourcesRoomService.addOrUpdateRoom(res); + } + + /** + * 删除资源室 + * 创建人：孙玉全 + * @param res 删除的参数 返回数值类型 1代表成功否则失败 + */ + @DeleteMapping + public Integer deleteRoom(ResourcesRoom res) { + try { + resourcesRoomService.deleteRoom(res); + return 1; + } catch (Exception e) { + return 0; + } + + } + } diff --git a/src/main/java/com/syq/controller/StudentsController.java b/src/main/java/com/syq/controller/StudentsController.java index fb27143fdcfebbc4ea06f96e3b2a1364906e4e01..1fac17697cc02b4a23499064372bc979d71fa6a2 100644 --- a/src/main/java/com/syq/controller/StudentsController.java +++ b/src/main/java/com/syq/controller/StudentsController.java @@ -3,7 +3,11 @@ package com.syq.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.Mapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -32,4 +36,40 @@ public class StudentsController { return studentsService.listStudentsByPage(stu, pageable); } + /** + * 添加学生信息 + * 创建人：孙玉全 + * @param s 添加或修改的参数 + * @return 学生实体 + */ + @PostMapping + public Object insertStudents(Students s) { + return studentsService.addAndUpdate(s); + } + + /** + * 修改学生信息 + * 创建人：孙玉全 + * @param s 添加或修改的参数 + * @return 学生实体 + */ + @PutMapping + public Object updateStudents(Students s) { + return studentsService.addAndUpdate(s); + } + + /** + * 删除学生信息 + * 创建人：孙玉全 + * @param s 删除条件 返回数值 1：成功 0：失败 + */ + @DeleteMapping + public Integer deleteStudents(Students s) { + try { + studentsService.deleteStudents(s); + return 1; + } catch (Exception e) { + return 0; + } + } } diff --git a/src/main/java/com/syq/controller/SystemController.java b/src/main/java/com/syq/controller/SystemController.java index 667eccb9cde77e10c077acf41c59f2954b2bea87..243d0dd91e9ca68a3c5ddc009a25d583a66d544c 100644 --- a/src/main/java/com/syq/controller/SystemController.java +++ b/src/main/java/com/syq/controller/SystemController.java @@ -3,11 +3,14 @@ package com.syq.controller; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.syq.entity.System; +import com.syq.entity.Systeminfo; import com.syq.service.SystemService; @RequestMapping("system") @@ -23,8 +26,46 @@ public class SystemController { * @return 所有系别信息 */ @GetMapping - public List getAllSysTem() { + public List getAllSysTem() { return systemService.getAllSystem(); } + + /** + * 添加学生系别信息 + * 创建人：孙玉全 + * @param sys 添加的参数 + * @return 系别实体 + */ + @PostMapping + public Systeminfo insertSystem(Systeminfo sys) { + System.out.println(sys.toString()); + return systemService.addAndUpdateSystem(sys); + } + + /** + * 修改学生系别信息 + * 创建人：孙玉全 + * @param sys 修改的参数 + * @return 系别实体 + */ + @PutMapping + public Systeminfo updateSystem(Systeminfo sys) { + return systemService.addAndUpdateSystem(sys); + } + + /** + * 删除学生系别信息 + * 创建人：孙玉全 + * @param sys 删除的参数 返回数值 1：成功 0：失败 + */ + @DeleteMapping + public Integer deleteSystem(Systeminfo sys) { + try { + systemService.deleteSystem(sys); + return 1; + } catch (Exception e) { + return 0; + } + } } diff --git a/src/main/java/com/syq/entity/Computers.java b/src/main/java/com/syq/entity/Computers.java index b80cad0b07fe6e5ff8f25d52200ed3ccf9120760..297c20c9e707d9380d859728149024411bac9c0a 100644 --- a/src/main/java/com/syq/entity/Computers.java +++ b/src/main/java/com/syq/entity/Computers.java @@ -30,7 +30,7 @@ public class Computers { private String remark;//备注 @JoinColumn(name = "rid") - @ManyToOne(cascade = CascadeType.ALL,fetch = FetchType.EAGER) + @ManyToOne(fetch = FetchType.EAGER) private ResourcesRoom resourcesRoom; } diff --git a/src/main/java/com/syq/entity/Consumelogs.java b/src/main/java/com/syq/entity/Consumelogs.java new file mode 100644 index 0000000000000000000000000000000000000000..5667b942ebbb5568d653d52631f68226fe7b433d --- /dev/null +++ b/src/main/java/com/syq/entity/Consumelogs.java @@ -0,0 +1,58 @@ +package com.syq.entity; + +import java.util.Date; + +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.Table; + +import org.springframework.format.annotation.DateTimeFormat; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "consumelogs") +public class Consumelogs { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer conid;//消费编号 + private String cardNo;//卡号 + + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date inTime;//进入时间 + + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date outTime;//离开时间 + private Integer status;//用于统计 + + + @JoinColumn(name = "bid") + @OneToOne(cascade = CascadeType.ALL,fetch = FetchType.EAGER) + private Books books;//图书 + + @JoinColumn(name = "btid") + @OneToOne(cascade = CascadeType.ALL,fetch = FetchType.EAGER) + private BookType bookType; + + @JoinColumn(name = "comid") + @OneToOne(cascade = CascadeType.ALL,fetch = FetchType.EAGER) + private Computers computers; + + @JoinColumn(name = "rid") + @OneToOne(cascade = CascadeType.ALL,fetch = FetchType.EAGER) + private ResourcesRoom resourcesRoom; + +} diff --git a/src/main/java/com/syq/entity/ResourcesRoom.java b/src/main/java/com/syq/entity/ResourcesRoom.java index 89468d20819c215f4dbca5eb3ceff76c3bee9808..94633fe7ab1eedf5d664d8bc2d5f1f1fe631966f 100644 --- a/src/main/java/com/syq/entity/ResourcesRoom.java +++ b/src/main/java/com/syq/entity/ResourcesRoom.java @@ -22,4 +22,5 @@ public class ResourcesRoom { private Integer rid;//资源室编号 private String rname;//资源室名称 private String remark;//备注 + private Integer diff;//区分机房与图书间 1代表机房，2代表读书间 } diff --git a/src/main/java/com/syq/entity/Students.java b/src/main/java/com/syq/entity/Students.java index 37871c97ace4e543b2d00358562b4ed088b8b4e7..6568f840c6e38dd4bd719ba2ab116752f3720cc5 100644 --- a/src/main/java/com/syq/entity/Students.java +++ b/src/main/java/com/syq/entity/Students.java @@ -33,6 +33,6 @@ public class Students { private String remark;//备注 @JoinColumn(name = "sysid") - @ManyToOne(cascade = CascadeType.ALL,fetch = FetchType.EAGER) - private System system; + @ManyToOne(fetch = FetchType.EAGER) + private Systeminfo systeminfo; } diff --git a/src/main/java/com/syq/entity/System.java b/src/main/java/com/syq/entity/Systeminfo.java similarity index 95% rename from src/main/java/com/syq/entity/System.java rename to src/main/java/com/syq/entity/Systeminfo.java index 10267d46401d030a4ce304d335dc3fc1becb377e..ea90eaea1b0162562c64b79a225f19a1ef9e4753 100644 --- a/src/main/java/com/syq/entity/System.java +++ b/src/main/java/com/syq/entity/Systeminfo.java @@ -15,7 +15,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @Entity @Table(name = "system")//学生系别 -public class System { +public class Systeminfo { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/com/syq/repository/SystemRepository.java b/src/main/java/com/syq/repository/SystemRepository.java index 0e157440e0e28ccb0aa1ed2eed47c8d78c766a36..61c45ddfa637db705b6a3cb618419697bf886d25 100644 --- a/src/main/java/com/syq/repository/SystemRepository.java +++ b/src/main/java/com/syq/repository/SystemRepository.java @@ -2,9 +2,9 @@ package com.syq.repository; import org.springframework.data.jpa.repository.JpaRepository; -import com.syq.entity.System; +import com.syq.entity.Systeminfo; -public interface SystemRepository extends JpaRepository{ +public interface SystemRepository extends JpaRepository{ } \ No newline at end of file diff --git a/src/main/java/com/syq/service/BooksService.java b/src/main/java/com/syq/service/BooksService.java index 5d9c7796a525682f4e992b88d1372a020aa0210a..15c5c01e96f0c4c1296354e364456d5abce13089 100644 --- a/src/main/java/com/syq/service/BooksService.java +++ b/src/main/java/com/syq/service/BooksService.java @@ -6,5 +6,6 @@ import com.syq.entity.Books; import com.syq.util.FenyeUtil; public interface BooksService { + FenyeUtil listBooksByPage(Books book,Pageable pageable); } diff --git a/src/main/java/com/syq/service/ComputersService.java b/src/main/java/com/syq/service/ComputersService.java index 366eb5df0dc1f8ec51c890f1c24951cda80fd973..09e1a62d215151f6defd1523703636b6b9de613b 100644 --- a/src/main/java/com/syq/service/ComputersService.java +++ b/src/main/java/com/syq/service/ComputersService.java @@ -15,4 +15,18 @@ public interface ComputersService { * @return 分页工具类（layui所需要的数据格式） */ FenyeUtil listComputersByPage(Computers com,Pageable pageable); + + /** + * 添加或修改电脑 + * 创建人：孙玉全 + * @param com 添加或修改的参数 + * @return 添加或修改后的实体信息 + */ + Computers addOrUpdateComputer(Computers com); + + /** + * 删除电脑西信息 + * @param com 删除的参数 无返回值 + */ + void deleteComputer(Computers com); } diff --git a/src/main/java/com/syq/service/ResourcesRoomService.java b/src/main/java/com/syq/service/ResourcesRoomService.java index cb9884f2a05e5e8b001ba6e6ca980e9fdaec807e..c089c70a498de9ee7869f8a74e703ac7333a3014 100644 --- a/src/main/java/com/syq/service/ResourcesRoomService.java +++ b/src/main/java/com/syq/service/ResourcesRoomService.java @@ -6,6 +6,26 @@ import com.syq.entity.ResourcesRoom; public interface ResourcesRoomService { + /** + * 查询所有资源室 + * 创建人：孙玉全 + * @return 所有资源室集合 + */ List getAllResourcesRoom(); + + /** + * 添加或修改资源室 + * 创建人：孙玉全 + * @param res 添加或修改的参数 + * @return 添加或修改后的实体信息 + */ + ResourcesRoom addOrUpdateRoom(ResourcesRoom res); + + /** + * 删除资源室 + * 创建人：孙玉全 + * @param res 删除的参数 无返回值 + */ + void deleteRoom(ResourcesRoom res); } diff --git a/src/main/java/com/syq/service/StudentsService.java b/src/main/java/com/syq/service/StudentsService.java index 690a4c2eee97f6b2646c4cd51cbda8e8a362556f..7d8e80db3eb328b94c891b7ba262e352b2477f98 100644 --- a/src/main/java/com/syq/service/StudentsService.java +++ b/src/main/java/com/syq/service/StudentsService.java @@ -7,6 +7,21 @@ import com.syq.util.FenyeUtil; public interface StudentsService { + /** + * 添加或修改学生信息 + * 创建人：孙玉全 + * @param s 添加或修改的参数 + * @return 学生实体 + */ + Students addAndUpdate(Students s); + + /** + * 删除学生信息 + * 创建人：孙玉全 + * @param s 删除条件 无返回值 + */ + void deleteStudents(Students s); + /** * 条件分页查询所有学生信息 * 创建人：孙玉全 @@ -15,5 +30,7 @@ public interface StudentsService { * @return 分页工具类（layui所需要的格式） */ FenyeUtil listStudentsByPage(Students stu,Pageable pageable); + + } diff --git a/src/main/java/com/syq/service/SystemService.java b/src/main/java/com/syq/service/SystemService.java index fdbb83f9cf3b7d267cede3722d8645eeca68dc95..89d9a64f174f634afb019c7132811f574508ddc8 100644 --- a/src/main/java/com/syq/service/SystemService.java +++ b/src/main/java/com/syq/service/SystemService.java @@ -2,14 +2,30 @@ package com.syq.service; import java.util.List; -import com.syq.entity.System; +import com.syq.entity.Students; +import com.syq.entity.Systeminfo; public interface SystemService { + + /** + * 添加或修改学生系别信息 + * 创建人：孙玉全 + * @param s 添加或修改的参数 + * @return 系别实体 + */ + Systeminfo addAndUpdateSystem(Systeminfo sys); + + /** + * 删除学生系别信息 + * 创建人：孙玉全 + * @param sys 删除的参数 无返回数据 + */ + void deleteSystem(Systeminfo sys); /** * 查询所有系别信息,用于在添加学生是渲染系别下拉框 * 创建人：孙玉全 * @return 系别信息 */ - List getAllSystem(); + List getAllSystem(); } diff --git a/src/main/java/com/syq/service/impl/ComputersServiceImpl.java b/src/main/java/com/syq/service/impl/ComputersServiceImpl.java index ee4f30f096d66d9f0942a5c959ce7b8d0ac79b73..5d58ace0baf3054d3a8e7729d762735d8fbae0c6 100644 --- a/src/main/java/com/syq/service/impl/ComputersServiceImpl.java +++ b/src/main/java/com/syq/service/impl/ComputersServiceImpl.java @@ -25,6 +25,25 @@ public class ComputersServiceImpl implements ComputersService { @Autowired private ComputersRepository computersRepository; + + /** + * 添加或修改电脑 + * 创建人：孙玉全 + * @param com 添加或修改的参数 + * @return 添加或修改后的实体信息 + */ + public Computers addOrUpdateComputer(Computers com) { + return computersRepository.saveAndFlush(com); + } + + /** + * 删除电脑西信息 + * 创建人：孙玉全 + * @param com 删除的参数 无返回值 + */ + public void deleteComputer(Computers com) { + computersRepository.delete(com); + } /** * 条件分页查询电脑信息 diff --git a/src/main/java/com/syq/service/impl/ResourcesRoomServiceImpl.java b/src/main/java/com/syq/service/impl/ResourcesRoomServiceImpl.java index 3866ff1ae58c7fc5646a7954ede1e0ea1ab49f8f..4b3d71849e1669b5f200ac63d0fecffd4b9d0de1 100644 --- a/src/main/java/com/syq/service/impl/ResourcesRoomServiceImpl.java +++ b/src/main/java/com/syq/service/impl/ResourcesRoomServiceImpl.java @@ -15,11 +15,39 @@ public class ResourcesRoomServiceImpl implements ResourcesRoomService { @Autowired private ResourcesRoomRepository resourcesRoomRepository; + /** + * 查询所有资源室 + * 创建人：孙玉全 + * @return 所有资源室集合 + */ @Override public List getAllResourcesRoom() { // TODO Auto-generated method stub return resourcesRoomRepository.findAll(); } + + /** + * 添加或修改资源室 + * 创建人：孙玉全 + * @param res 添加或修改的参数 + * @return 添加或修改后的实体信息 + */ + @Override + public ResourcesRoom addOrUpdateRoom(ResourcesRoom res) { + // TODO Auto-generated method stub + return resourcesRoomRepository.saveAndFlush(res); + } + + /** + * 删除资源室 + * 创建人：孙玉全 + * @param res 删除的参数 无返回值 + */ + @Override + public void deleteRoom(ResourcesRoom res) { + // TODO Auto-generated method stub + resourcesRoomRepository.delete(res); + } } diff --git a/src/main/java/com/syq/service/impl/StudentsServiceImpl.java b/src/main/java/com/syq/service/impl/StudentsServiceImpl.java index 1c4d1b29b0a59139c1829ff3323c534a0a98accf..274347f7704241bb908218acb74e01d986cd83af 100644 --- a/src/main/java/com/syq/service/impl/StudentsServiceImpl.java +++ b/src/main/java/com/syq/service/impl/StudentsServiceImpl.java @@ -24,7 +24,30 @@ public class StudentsServiceImpl implements StudentsService{ @Autowired private StudentRepository studentRepository; + + /** + * 添加或修改学生信息 + * 创建人：孙玉全 + * @param s 添加或修改的参数 + * @return 学生实体 + */ + @Override + public Students addAndUpdate(Students s) { + return studentRepository.saveAndFlush(s); + } + + /** + * 删除学生信息 + * 创建人：孙玉全 + * @param s 删除条件 无返回值 + */ + @Override + public void deleteStudents(Students s) { + studentRepository.delete(s); + } + + /** * 条件分页查询所有学生信息 * 创建人：孙玉全 @@ -42,6 +65,11 @@ public class StudentsServiceImpl implements StudentsService{ return fy; } + /** + * 动态SQL + * @param stu + * @return + */ private Specification getspec(Students stu) { // TODO Auto-generated method stub return new Specification() { @@ -58,10 +86,6 @@ public class StudentsServiceImpl implements StudentsService{ }; } - /** - * 动态SQL - * @param stu - * @return - */ + } diff --git a/src/main/java/com/syq/service/impl/SystemServiceImpl.java b/src/main/java/com/syq/service/impl/SystemServiceImpl.java index 4b14a0ba769faad8fa33a342be0e9e08c4134dee..177f2d3af373b0fba196e0b0c56fd939a182f118 100644 --- a/src/main/java/com/syq/service/impl/SystemServiceImpl.java +++ b/src/main/java/com/syq/service/impl/SystemServiceImpl.java @@ -5,7 +5,8 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.syq.entity.System; +import com.syq.entity.Students; +import com.syq.entity.Systeminfo; import com.syq.repository.SystemRepository; import com.syq.service.SystemService; @@ -14,6 +15,18 @@ public class SystemServiceImpl implements SystemService{ @Autowired private SystemRepository systemRepository; + + /** + * 添加或修改学生系别信息 + * 创建人：孙玉全 + * @param s 添加或修改的参数 + * @return 系别实体 + */ + @Override + public Systeminfo addAndUpdateSystem(Systeminfo sys) { + // TODO Auto-generated method stub + return systemRepository.saveAndFlush(sys); + } /** * 查询所有系别信息,用于在添加学生是渲染系别下拉框 @@ -21,8 +34,20 @@ public class SystemServiceImpl implements SystemService{ * @return 系别信息 */ @Override - public List getAllSystem() { + public List getAllSystem() { return systemRepository.findAll(); } + /** + * 删除学生系别信息 + * 创建人：孙玉全 + * @param sys 删除的参数 无返回数据 + */ + @Override + public void deleteSystem(Systeminfo sys) { + systemRepository.delete(sys); + } + + + }