diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java new file mode 100644 index 0000000..6f82170 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:47 + */ +@Slf4j +@RestController +@RequestMapping("/message") +public class MessageController { + @Autowired + private MessageService messageService; + + /** + * 消息列表 + */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody MessageListRequest messageListRequest) { + return messageService.list(messageListRequest); + } +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java new file mode 100644 index 0000000..6f82170 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:47 + */ +@Slf4j +@RestController +@RequestMapping("/message") +public class MessageController { + @Autowired + private MessageService messageService; + + /** + * 消息列表 + */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody MessageListRequest messageListRequest) { + return messageService.list(messageListRequest); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index b28a32b..661e5f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -1,13 +1,50 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Description: 访客信息提交 * @Author: wangpeng * @Date: 2022/11/8 14:39 */ +@Slf4j +@RestController +@RequestMapping("/visitor") public class VisitController { + @Autowired + private VisitorApplyService visitorApplyService; + /** - * + * 访客信息提交 */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody VisitorApplyAddRequest visitorApplyAddRequest) { + return visitorApplyService.add(visitorApplyAddRequest); + } + + /** + * 访客申请列表，管理员使用keywords任意传，申请者使用keywords传申请者工号 + */ + @PostMapping("/apply/list") + public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest) { + return visitorApplyService.list(visitorApplyListRequest); + } + + /** + * 管理员变更申请状态（通过/不通过） + */ + @PostMapping("/apply/status") + public Object visitorApplyStatus(@RequestBody VisitorApplyStatusRequest visitorApplyStatusRequest) { + return visitorApplyService.updateStatus(visitorApplyStatusRequest); + } } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java new file mode 100644 index 0000000..6f82170 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:47 + */ +@Slf4j +@RestController +@RequestMapping("/message") +public class MessageController { + @Autowired + private MessageService messageService; + + /** + * 消息列表 + */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody MessageListRequest messageListRequest) { + return messageService.list(messageListRequest); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index b28a32b..661e5f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -1,13 +1,50 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Description: 访客信息提交 * @Author: wangpeng * @Date: 2022/11/8 14:39 */ +@Slf4j +@RestController +@RequestMapping("/visitor") public class VisitController { + @Autowired + private VisitorApplyService visitorApplyService; + /** - * + * 访客信息提交 */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody VisitorApplyAddRequest visitorApplyAddRequest) { + return visitorApplyService.add(visitorApplyAddRequest); + } + + /** + * 访客申请列表，管理员使用keywords任意传，申请者使用keywords传申请者工号 + */ + @PostMapping("/apply/list") + public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest) { + return visitorApplyService.list(visitorApplyListRequest); + } + + /** + * 管理员变更申请状态（通过/不通过） + */ + @PostMapping("/apply/status") + public Object visitorApplyStatus(@RequestBody VisitorApplyStatusRequest visitorApplyStatusRequest) { + return visitorApplyService.updateStatus(visitorApplyStatusRequest); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java new file mode 100644 index 0000000..f07223d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.model.VisitorApply; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 访问申请mapper + * @Author: wangpeng + * @Date: 2022/7/20 10:23 + */ +@Mapper +public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java new file mode 100644 index 0000000..6f82170 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:47 + */ +@Slf4j +@RestController +@RequestMapping("/message") +public class MessageController { + @Autowired + private MessageService messageService; + + /** + * 消息列表 + */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody MessageListRequest messageListRequest) { + return messageService.list(messageListRequest); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index b28a32b..661e5f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -1,13 +1,50 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Description: 访客信息提交 * @Author: wangpeng * @Date: 2022/11/8 14:39 */ +@Slf4j +@RestController +@RequestMapping("/visitor") public class VisitController { + @Autowired + private VisitorApplyService visitorApplyService; + /** - * + * 访客信息提交 */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody VisitorApplyAddRequest visitorApplyAddRequest) { + return visitorApplyService.add(visitorApplyAddRequest); + } + + /** + * 访客申请列表，管理员使用keywords任意传，申请者使用keywords传申请者工号 + */ + @PostMapping("/apply/list") + public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest) { + return visitorApplyService.list(visitorApplyListRequest); + } + + /** + * 管理员变更申请状态（通过/不通过） + */ + @PostMapping("/apply/status") + public Object visitorApplyStatus(@RequestBody VisitorApplyStatusRequest visitorApplyStatusRequest) { + return visitorApplyService.updateStatus(visitorApplyStatusRequest); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java new file mode 100644 index 0000000..f07223d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.model.VisitorApply; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 访问申请mapper + * @Author: wangpeng + * @Date: 2022/7/20 10:23 + */ +@Mapper +public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml new file mode 100644 index 0000000..aa5f058 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java new file mode 100644 index 0000000..6f82170 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:47 + */ +@Slf4j +@RestController +@RequestMapping("/message") +public class MessageController { + @Autowired + private MessageService messageService; + + /** + * 消息列表 + */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody MessageListRequest messageListRequest) { + return messageService.list(messageListRequest); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index b28a32b..661e5f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -1,13 +1,50 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Description: 访客信息提交 * @Author: wangpeng * @Date: 2022/11/8 14:39 */ +@Slf4j +@RestController +@RequestMapping("/visitor") public class VisitController { + @Autowired + private VisitorApplyService visitorApplyService; + /** - * + * 访客信息提交 */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody VisitorApplyAddRequest visitorApplyAddRequest) { + return visitorApplyService.add(visitorApplyAddRequest); + } + + /** + * 访客申请列表，管理员使用keywords任意传，申请者使用keywords传申请者工号 + */ + @PostMapping("/apply/list") + public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest) { + return visitorApplyService.list(visitorApplyListRequest); + } + + /** + * 管理员变更申请状态（通过/不通过） + */ + @PostMapping("/apply/status") + public Object visitorApplyStatus(@RequestBody VisitorApplyStatusRequest visitorApplyStatusRequest) { + return visitorApplyService.updateStatus(visitorApplyStatusRequest); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java new file mode 100644 index 0000000..f07223d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.model.VisitorApply; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 访问申请mapper + * @Author: wangpeng + * @Date: 2022/7/20 10:23 + */ +@Mapper +public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml new file mode 100644 index 0000000..aa5f058 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java new file mode 100644 index 0000000..63dc3bd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class MessageListRequest { + private String messageNo; + private String messageTitle; + private String messageSecondTitle; + private String messageContent; +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java new file mode 100644 index 0000000..6f82170 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:47 + */ +@Slf4j +@RestController +@RequestMapping("/message") +public class MessageController { + @Autowired + private MessageService messageService; + + /** + * 消息列表 + */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody MessageListRequest messageListRequest) { + return messageService.list(messageListRequest); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index b28a32b..661e5f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -1,13 +1,50 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Description: 访客信息提交 * @Author: wangpeng * @Date: 2022/11/8 14:39 */ +@Slf4j +@RestController +@RequestMapping("/visitor") public class VisitController { + @Autowired + private VisitorApplyService visitorApplyService; + /** - * + * 访客信息提交 */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody VisitorApplyAddRequest visitorApplyAddRequest) { + return visitorApplyService.add(visitorApplyAddRequest); + } + + /** + * 访客申请列表，管理员使用keywords任意传，申请者使用keywords传申请者工号 + */ + @PostMapping("/apply/list") + public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest) { + return visitorApplyService.list(visitorApplyListRequest); + } + + /** + * 管理员变更申请状态（通过/不通过） + */ + @PostMapping("/apply/status") + public Object visitorApplyStatus(@RequestBody VisitorApplyStatusRequest visitorApplyStatusRequest) { + return visitorApplyService.updateStatus(visitorApplyStatusRequest); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java new file mode 100644 index 0000000..f07223d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.model.VisitorApply; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 访问申请mapper + * @Author: wangpeng + * @Date: 2022/7/20 10:23 + */ +@Mapper +public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml new file mode 100644 index 0000000..aa5f058 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java new file mode 100644 index 0000000..63dc3bd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class MessageListRequest { + private String messageNo; + private String messageTitle; + private String messageSecondTitle; + private String messageContent; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java new file mode 100644 index 0000000..af2813c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyAddRequest { + //访客姓名 + private String visitorName; + //访客身份证 + private String visitorIdCard; + //访客联系方式 + private String visitorPhone; + //访问目的 + private String visitReason; + //访问区域(楼栋) + private String visitPosition; + //访问开始时间 + private String inTime; + //访问结束时间 + private String outTime; + //备注 + private String remarks; + //申请者工号 + private String staffCode; + //申请者姓名 + private String staffName; + //申请者手机号 + private String staffPhone; +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java new file mode 100644 index 0000000..6f82170 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:47 + */ +@Slf4j +@RestController +@RequestMapping("/message") +public class MessageController { + @Autowired + private MessageService messageService; + + /** + * 消息列表 + */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody MessageListRequest messageListRequest) { + return messageService.list(messageListRequest); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index b28a32b..661e5f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -1,13 +1,50 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Description: 访客信息提交 * @Author: wangpeng * @Date: 2022/11/8 14:39 */ +@Slf4j +@RestController +@RequestMapping("/visitor") public class VisitController { + @Autowired + private VisitorApplyService visitorApplyService; + /** - * + * 访客信息提交 */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody VisitorApplyAddRequest visitorApplyAddRequest) { + return visitorApplyService.add(visitorApplyAddRequest); + } + + /** + * 访客申请列表，管理员使用keywords任意传，申请者使用keywords传申请者工号 + */ + @PostMapping("/apply/list") + public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest) { + return visitorApplyService.list(visitorApplyListRequest); + } + + /** + * 管理员变更申请状态（通过/不通过） + */ + @PostMapping("/apply/status") + public Object visitorApplyStatus(@RequestBody VisitorApplyStatusRequest visitorApplyStatusRequest) { + return visitorApplyService.updateStatus(visitorApplyStatusRequest); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java new file mode 100644 index 0000000..f07223d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.model.VisitorApply; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 访问申请mapper + * @Author: wangpeng + * @Date: 2022/7/20 10:23 + */ +@Mapper +public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml new file mode 100644 index 0000000..aa5f058 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java new file mode 100644 index 0000000..63dc3bd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class MessageListRequest { + private String messageNo; + private String messageTitle; + private String messageSecondTitle; + private String messageContent; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java new file mode 100644 index 0000000..af2813c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyAddRequest { + //访客姓名 + private String visitorName; + //访客身份证 + private String visitorIdCard; + //访客联系方式 + private String visitorPhone; + //访问目的 + private String visitReason; + //访问区域(楼栋) + private String visitPosition; + //访问开始时间 + private String inTime; + //访问结束时间 + private String outTime; + //备注 + private String remarks; + //申请者工号 + private String staffCode; + //申请者姓名 + private String staffName; + //申请者手机号 + private String staffPhone; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java new file mode 100644 index 0000000..8bccf4a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyListRequest { + //申请单号/访客姓名/申请者工号/访客联系方式 + private String keywords; + private String startTime; + private String endTime; + private String status; +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java new file mode 100644 index 0000000..6f82170 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:47 + */ +@Slf4j +@RestController +@RequestMapping("/message") +public class MessageController { + @Autowired + private MessageService messageService; + + /** + * 消息列表 + */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody MessageListRequest messageListRequest) { + return messageService.list(messageListRequest); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index b28a32b..661e5f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -1,13 +1,50 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Description: 访客信息提交 * @Author: wangpeng * @Date: 2022/11/8 14:39 */ +@Slf4j +@RestController +@RequestMapping("/visitor") public class VisitController { + @Autowired + private VisitorApplyService visitorApplyService; + /** - * + * 访客信息提交 */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody VisitorApplyAddRequest visitorApplyAddRequest) { + return visitorApplyService.add(visitorApplyAddRequest); + } + + /** + * 访客申请列表，管理员使用keywords任意传，申请者使用keywords传申请者工号 + */ + @PostMapping("/apply/list") + public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest) { + return visitorApplyService.list(visitorApplyListRequest); + } + + /** + * 管理员变更申请状态（通过/不通过） + */ + @PostMapping("/apply/status") + public Object visitorApplyStatus(@RequestBody VisitorApplyStatusRequest visitorApplyStatusRequest) { + return visitorApplyService.updateStatus(visitorApplyStatusRequest); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java new file mode 100644 index 0000000..f07223d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.model.VisitorApply; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 访问申请mapper + * @Author: wangpeng + * @Date: 2022/7/20 10:23 + */ +@Mapper +public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml new file mode 100644 index 0000000..aa5f058 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java new file mode 100644 index 0000000..63dc3bd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class MessageListRequest { + private String messageNo; + private String messageTitle; + private String messageSecondTitle; + private String messageContent; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java new file mode 100644 index 0000000..af2813c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyAddRequest { + //访客姓名 + private String visitorName; + //访客身份证 + private String visitorIdCard; + //访客联系方式 + private String visitorPhone; + //访问目的 + private String visitReason; + //访问区域(楼栋) + private String visitPosition; + //访问开始时间 + private String inTime; + //访问结束时间 + private String outTime; + //备注 + private String remarks; + //申请者工号 + private String staffCode; + //申请者姓名 + private String staffName; + //申请者手机号 + private String staffPhone; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java new file mode 100644 index 0000000..8bccf4a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyListRequest { + //申请单号/访客姓名/申请者工号/访客联系方式 + private String keywords; + private String startTime; + private String endTime; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java new file mode 100644 index 0000000..fbd7d70 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java @@ -0,0 +1,14 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyStatusRequest { + private Long id; + private String status; +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java new file mode 100644 index 0000000..6f82170 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:47 + */ +@Slf4j +@RestController +@RequestMapping("/message") +public class MessageController { + @Autowired + private MessageService messageService; + + /** + * 消息列表 + */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody MessageListRequest messageListRequest) { + return messageService.list(messageListRequest); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index b28a32b..661e5f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -1,13 +1,50 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Description: 访客信息提交 * @Author: wangpeng * @Date: 2022/11/8 14:39 */ +@Slf4j +@RestController +@RequestMapping("/visitor") public class VisitController { + @Autowired + private VisitorApplyService visitorApplyService; + /** - * + * 访客信息提交 */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody VisitorApplyAddRequest visitorApplyAddRequest) { + return visitorApplyService.add(visitorApplyAddRequest); + } + + /** + * 访客申请列表，管理员使用keywords任意传，申请者使用keywords传申请者工号 + */ + @PostMapping("/apply/list") + public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest) { + return visitorApplyService.list(visitorApplyListRequest); + } + + /** + * 管理员变更申请状态（通过/不通过） + */ + @PostMapping("/apply/status") + public Object visitorApplyStatus(@RequestBody VisitorApplyStatusRequest visitorApplyStatusRequest) { + return visitorApplyService.updateStatus(visitorApplyStatusRequest); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java new file mode 100644 index 0000000..f07223d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.model.VisitorApply; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 访问申请mapper + * @Author: wangpeng + * @Date: 2022/7/20 10:23 + */ +@Mapper +public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml new file mode 100644 index 0000000..aa5f058 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java new file mode 100644 index 0000000..63dc3bd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class MessageListRequest { + private String messageNo; + private String messageTitle; + private String messageSecondTitle; + private String messageContent; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java new file mode 100644 index 0000000..af2813c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyAddRequest { + //访客姓名 + private String visitorName; + //访客身份证 + private String visitorIdCard; + //访客联系方式 + private String visitorPhone; + //访问目的 + private String visitReason; + //访问区域(楼栋) + private String visitPosition; + //访问开始时间 + private String inTime; + //访问结束时间 + private String outTime; + //备注 + private String remarks; + //申请者工号 + private String staffCode; + //申请者姓名 + private String staffName; + //申请者手机号 + private String staffPhone; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java new file mode 100644 index 0000000..8bccf4a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyListRequest { + //申请单号/访客姓名/申请者工号/访客联系方式 + private String keywords; + private String startTime; + private String endTime; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java new file mode 100644 index 0000000..fbd7d70 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java @@ -0,0 +1,14 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyStatusRequest { + private Long id; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java new file mode 100644 index 0000000..efe2ac5 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface AdminVisitorApplyStatusDict { + //校验通过 + String VERIFY_PASSED = "1"; + //校验不通过 + String VERIFY_FAILED = "2"; + //无法校验 + String UNABLE_TO_VERIFY = "3"; +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java new file mode 100644 index 0000000..6f82170 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:47 + */ +@Slf4j +@RestController +@RequestMapping("/message") +public class MessageController { + @Autowired + private MessageService messageService; + + /** + * 消息列表 + */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody MessageListRequest messageListRequest) { + return messageService.list(messageListRequest); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index b28a32b..661e5f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -1,13 +1,50 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Description: 访客信息提交 * @Author: wangpeng * @Date: 2022/11/8 14:39 */ +@Slf4j +@RestController +@RequestMapping("/visitor") public class VisitController { + @Autowired + private VisitorApplyService visitorApplyService; + /** - * + * 访客信息提交 */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody VisitorApplyAddRequest visitorApplyAddRequest) { + return visitorApplyService.add(visitorApplyAddRequest); + } + + /** + * 访客申请列表，管理员使用keywords任意传，申请者使用keywords传申请者工号 + */ + @PostMapping("/apply/list") + public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest) { + return visitorApplyService.list(visitorApplyListRequest); + } + + /** + * 管理员变更申请状态（通过/不通过） + */ + @PostMapping("/apply/status") + public Object visitorApplyStatus(@RequestBody VisitorApplyStatusRequest visitorApplyStatusRequest) { + return visitorApplyService.updateStatus(visitorApplyStatusRequest); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java new file mode 100644 index 0000000..f07223d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.model.VisitorApply; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 访问申请mapper + * @Author: wangpeng + * @Date: 2022/7/20 10:23 + */ +@Mapper +public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml new file mode 100644 index 0000000..aa5f058 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java new file mode 100644 index 0000000..63dc3bd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class MessageListRequest { + private String messageNo; + private String messageTitle; + private String messageSecondTitle; + private String messageContent; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java new file mode 100644 index 0000000..af2813c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyAddRequest { + //访客姓名 + private String visitorName; + //访客身份证 + private String visitorIdCard; + //访客联系方式 + private String visitorPhone; + //访问目的 + private String visitReason; + //访问区域(楼栋) + private String visitPosition; + //访问开始时间 + private String inTime; + //访问结束时间 + private String outTime; + //备注 + private String remarks; + //申请者工号 + private String staffCode; + //申请者姓名 + private String staffName; + //申请者手机号 + private String staffPhone; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java new file mode 100644 index 0000000..8bccf4a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyListRequest { + //申请单号/访客姓名/申请者工号/访客联系方式 + private String keywords; + private String startTime; + private String endTime; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java new file mode 100644 index 0000000..fbd7d70 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java @@ -0,0 +1,14 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyStatusRequest { + private Long id; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java new file mode 100644 index 0000000..efe2ac5 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface AdminVisitorApplyStatusDict { + //校验通过 + String VERIFY_PASSED = "1"; + //校验不通过 + String VERIFY_FAILED = "2"; + //无法校验 + String UNABLE_TO_VERIFY = "3"; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java new file mode 100644 index 0000000..56c5e7c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface VisitorApplyStatusDict { + //申请已提交 + String APPLY_SUBMITTED = "1"; + //申请通过 + String APPLY_PASSED = "2"; + //申请不通过 + String APPLY_FAILED = "3"; +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java new file mode 100644 index 0000000..6f82170 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:47 + */ +@Slf4j +@RestController +@RequestMapping("/message") +public class MessageController { + @Autowired + private MessageService messageService; + + /** + * 消息列表 + */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody MessageListRequest messageListRequest) { + return messageService.list(messageListRequest); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index b28a32b..661e5f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -1,13 +1,50 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Description: 访客信息提交 * @Author: wangpeng * @Date: 2022/11/8 14:39 */ +@Slf4j +@RestController +@RequestMapping("/visitor") public class VisitController { + @Autowired + private VisitorApplyService visitorApplyService; + /** - * + * 访客信息提交 */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody VisitorApplyAddRequest visitorApplyAddRequest) { + return visitorApplyService.add(visitorApplyAddRequest); + } + + /** + * 访客申请列表，管理员使用keywords任意传，申请者使用keywords传申请者工号 + */ + @PostMapping("/apply/list") + public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest) { + return visitorApplyService.list(visitorApplyListRequest); + } + + /** + * 管理员变更申请状态（通过/不通过） + */ + @PostMapping("/apply/status") + public Object visitorApplyStatus(@RequestBody VisitorApplyStatusRequest visitorApplyStatusRequest) { + return visitorApplyService.updateStatus(visitorApplyStatusRequest); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java new file mode 100644 index 0000000..f07223d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.model.VisitorApply; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 访问申请mapper + * @Author: wangpeng + * @Date: 2022/7/20 10:23 + */ +@Mapper +public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml new file mode 100644 index 0000000..aa5f058 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java new file mode 100644 index 0000000..63dc3bd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class MessageListRequest { + private String messageNo; + private String messageTitle; + private String messageSecondTitle; + private String messageContent; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java new file mode 100644 index 0000000..af2813c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyAddRequest { + //访客姓名 + private String visitorName; + //访客身份证 + private String visitorIdCard; + //访客联系方式 + private String visitorPhone; + //访问目的 + private String visitReason; + //访问区域(楼栋) + private String visitPosition; + //访问开始时间 + private String inTime; + //访问结束时间 + private String outTime; + //备注 + private String remarks; + //申请者工号 + private String staffCode; + //申请者姓名 + private String staffName; + //申请者手机号 + private String staffPhone; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java new file mode 100644 index 0000000..8bccf4a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyListRequest { + //申请单号/访客姓名/申请者工号/访客联系方式 + private String keywords; + private String startTime; + private String endTime; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java new file mode 100644 index 0000000..fbd7d70 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java @@ -0,0 +1,14 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyStatusRequest { + private Long id; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java new file mode 100644 index 0000000..efe2ac5 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface AdminVisitorApplyStatusDict { + //校验通过 + String VERIFY_PASSED = "1"; + //校验不通过 + String VERIFY_FAILED = "2"; + //无法校验 + String UNABLE_TO_VERIFY = "3"; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java new file mode 100644 index 0000000..56c5e7c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface VisitorApplyStatusDict { + //申请已提交 + String APPLY_SUBMITTED = "1"; + //申请通过 + String APPLY_PASSED = "2"; + //申请不通过 + String APPLY_FAILED = "3"; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java new file mode 100644 index 0000000..ec22d7e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java @@ -0,0 +1,56 @@ +package com.casic.missiles.modular.system.model; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * @Description: 访客申请实体类 + * @Author: wangpeng + * @Date: 2022/11/15 14:35 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Data +@TableName("bus_visit_apply") +public class VisitorApply { + @TableId + private Long id; + @ExcelProperty("访客姓名") + private String visitorName; + @ExcelProperty("申请单号") + private String applyNo; + @ExcelProperty("申请者工号") + private String staffCode; + @ExcelProperty("申请者姓名") + private String staffName; + @ExcelProperty("访客身份证") + private String visitorIdCard; + @ExcelProperty("访客联系方式") + private String visitorPhone; + @ExcelProperty("访问目的") + private String visitReason; + @ExcelProperty("访问区域") + private String visitPosition; + @ExcelProperty("备注") + private String remarks; + @ExcelProperty("访问开始时间") + private String inTime; + @ExcelProperty("访问结束时间") + private String outTime; + @ExcelProperty("状态") + private String status; + + private String createTime; + private String updateTime; +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java new file mode 100644 index 0000000..6f82170 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:47 + */ +@Slf4j +@RestController +@RequestMapping("/message") +public class MessageController { + @Autowired + private MessageService messageService; + + /** + * 消息列表 + */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody MessageListRequest messageListRequest) { + return messageService.list(messageListRequest); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index b28a32b..661e5f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -1,13 +1,50 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Description: 访客信息提交 * @Author: wangpeng * @Date: 2022/11/8 14:39 */ +@Slf4j +@RestController +@RequestMapping("/visitor") public class VisitController { + @Autowired + private VisitorApplyService visitorApplyService; + /** - * + * 访客信息提交 */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody VisitorApplyAddRequest visitorApplyAddRequest) { + return visitorApplyService.add(visitorApplyAddRequest); + } + + /** + * 访客申请列表，管理员使用keywords任意传，申请者使用keywords传申请者工号 + */ + @PostMapping("/apply/list") + public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest) { + return visitorApplyService.list(visitorApplyListRequest); + } + + /** + * 管理员变更申请状态（通过/不通过） + */ + @PostMapping("/apply/status") + public Object visitorApplyStatus(@RequestBody VisitorApplyStatusRequest visitorApplyStatusRequest) { + return visitorApplyService.updateStatus(visitorApplyStatusRequest); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java new file mode 100644 index 0000000..f07223d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.model.VisitorApply; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 访问申请mapper + * @Author: wangpeng + * @Date: 2022/7/20 10:23 + */ +@Mapper +public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml new file mode 100644 index 0000000..aa5f058 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java new file mode 100644 index 0000000..63dc3bd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class MessageListRequest { + private String messageNo; + private String messageTitle; + private String messageSecondTitle; + private String messageContent; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java new file mode 100644 index 0000000..af2813c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyAddRequest { + //访客姓名 + private String visitorName; + //访客身份证 + private String visitorIdCard; + //访客联系方式 + private String visitorPhone; + //访问目的 + private String visitReason; + //访问区域(楼栋) + private String visitPosition; + //访问开始时间 + private String inTime; + //访问结束时间 + private String outTime; + //备注 + private String remarks; + //申请者工号 + private String staffCode; + //申请者姓名 + private String staffName; + //申请者手机号 + private String staffPhone; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java new file mode 100644 index 0000000..8bccf4a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyListRequest { + //申请单号/访客姓名/申请者工号/访客联系方式 + private String keywords; + private String startTime; + private String endTime; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java new file mode 100644 index 0000000..fbd7d70 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java @@ -0,0 +1,14 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyStatusRequest { + private Long id; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java new file mode 100644 index 0000000..efe2ac5 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface AdminVisitorApplyStatusDict { + //校验通过 + String VERIFY_PASSED = "1"; + //校验不通过 + String VERIFY_FAILED = "2"; + //无法校验 + String UNABLE_TO_VERIFY = "3"; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java new file mode 100644 index 0000000..56c5e7c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface VisitorApplyStatusDict { + //申请已提交 + String APPLY_SUBMITTED = "1"; + //申请通过 + String APPLY_PASSED = "2"; + //申请不通过 + String APPLY_FAILED = "3"; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java new file mode 100644 index 0000000..ec22d7e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java @@ -0,0 +1,56 @@ +package com.casic.missiles.modular.system.model; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * @Description: 访客申请实体类 + * @Author: wangpeng + * @Date: 2022/11/15 14:35 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Data +@TableName("bus_visit_apply") +public class VisitorApply { + @TableId + private Long id; + @ExcelProperty("访客姓名") + private String visitorName; + @ExcelProperty("申请单号") + private String applyNo; + @ExcelProperty("申请者工号") + private String staffCode; + @ExcelProperty("申请者姓名") + private String staffName; + @ExcelProperty("访客身份证") + private String visitorIdCard; + @ExcelProperty("访客联系方式") + private String visitorPhone; + @ExcelProperty("访问目的") + private String visitReason; + @ExcelProperty("访问区域") + private String visitPosition; + @ExcelProperty("备注") + private String remarks; + @ExcelProperty("访问开始时间") + private String inTime; + @ExcelProperty("访问结束时间") + private String outTime; + @ExcelProperty("状态") + private String status; + + private String createTime; + private String updateTime; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java new file mode 100644 index 0000000..dba4a59 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.dto.MessageListRequest; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:48 + */ +public interface MessageService { + Object list(MessageListRequest messageListRequest); +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java new file mode 100644 index 0000000..6f82170 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:47 + */ +@Slf4j +@RestController +@RequestMapping("/message") +public class MessageController { + @Autowired + private MessageService messageService; + + /** + * 消息列表 + */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody MessageListRequest messageListRequest) { + return messageService.list(messageListRequest); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index b28a32b..661e5f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -1,13 +1,50 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Description: 访客信息提交 * @Author: wangpeng * @Date: 2022/11/8 14:39 */ +@Slf4j +@RestController +@RequestMapping("/visitor") public class VisitController { + @Autowired + private VisitorApplyService visitorApplyService; + /** - * + * 访客信息提交 */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody VisitorApplyAddRequest visitorApplyAddRequest) { + return visitorApplyService.add(visitorApplyAddRequest); + } + + /** + * 访客申请列表，管理员使用keywords任意传，申请者使用keywords传申请者工号 + */ + @PostMapping("/apply/list") + public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest) { + return visitorApplyService.list(visitorApplyListRequest); + } + + /** + * 管理员变更申请状态（通过/不通过） + */ + @PostMapping("/apply/status") + public Object visitorApplyStatus(@RequestBody VisitorApplyStatusRequest visitorApplyStatusRequest) { + return visitorApplyService.updateStatus(visitorApplyStatusRequest); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java new file mode 100644 index 0000000..f07223d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.model.VisitorApply; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 访问申请mapper + * @Author: wangpeng + * @Date: 2022/7/20 10:23 + */ +@Mapper +public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml new file mode 100644 index 0000000..aa5f058 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java new file mode 100644 index 0000000..63dc3bd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class MessageListRequest { + private String messageNo; + private String messageTitle; + private String messageSecondTitle; + private String messageContent; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java new file mode 100644 index 0000000..af2813c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyAddRequest { + //访客姓名 + private String visitorName; + //访客身份证 + private String visitorIdCard; + //访客联系方式 + private String visitorPhone; + //访问目的 + private String visitReason; + //访问区域(楼栋) + private String visitPosition; + //访问开始时间 + private String inTime; + //访问结束时间 + private String outTime; + //备注 + private String remarks; + //申请者工号 + private String staffCode; + //申请者姓名 + private String staffName; + //申请者手机号 + private String staffPhone; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java new file mode 100644 index 0000000..8bccf4a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyListRequest { + //申请单号/访客姓名/申请者工号/访客联系方式 + private String keywords; + private String startTime; + private String endTime; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java new file mode 100644 index 0000000..fbd7d70 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java @@ -0,0 +1,14 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyStatusRequest { + private Long id; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java new file mode 100644 index 0000000..efe2ac5 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface AdminVisitorApplyStatusDict { + //校验通过 + String VERIFY_PASSED = "1"; + //校验不通过 + String VERIFY_FAILED = "2"; + //无法校验 + String UNABLE_TO_VERIFY = "3"; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java new file mode 100644 index 0000000..56c5e7c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface VisitorApplyStatusDict { + //申请已提交 + String APPLY_SUBMITTED = "1"; + //申请通过 + String APPLY_PASSED = "2"; + //申请不通过 + String APPLY_FAILED = "3"; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java new file mode 100644 index 0000000..ec22d7e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java @@ -0,0 +1,56 @@ +package com.casic.missiles.modular.system.model; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * @Description: 访客申请实体类 + * @Author: wangpeng + * @Date: 2022/11/15 14:35 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Data +@TableName("bus_visit_apply") +public class VisitorApply { + @TableId + private Long id; + @ExcelProperty("访客姓名") + private String visitorName; + @ExcelProperty("申请单号") + private String applyNo; + @ExcelProperty("申请者工号") + private String staffCode; + @ExcelProperty("申请者姓名") + private String staffName; + @ExcelProperty("访客身份证") + private String visitorIdCard; + @ExcelProperty("访客联系方式") + private String visitorPhone; + @ExcelProperty("访问目的") + private String visitReason; + @ExcelProperty("访问区域") + private String visitPosition; + @ExcelProperty("备注") + private String remarks; + @ExcelProperty("访问开始时间") + private String inTime; + @ExcelProperty("访问结束时间") + private String outTime; + @ExcelProperty("状态") + private String status; + + private String createTime; + private String updateTime; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java new file mode 100644 index 0000000..dba4a59 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.dto.MessageListRequest; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:48 + */ +public interface MessageService { + Object list(MessageListRequest messageListRequest); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java new file mode 100644 index 0000000..3bc9b9b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; + +/** + * @Description: 访问申请service + * @Author: wangpeng + * @Date: 2022/7/20 14:59 + */ +public interface VisitorApplyService { +// List visitorApplyListPage(Page page, VisitorApplyRequest visitorApplyRequest); + + Object add(VisitorApplyAddRequest visitorApplyAddRequest); + + Object list(VisitorApplyListRequest visitorApplyListRequest); + + Object updateStatus(VisitorApplyStatusRequest visitorApplyStatusRequest); +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java new file mode 100644 index 0000000..6f82170 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:47 + */ +@Slf4j +@RestController +@RequestMapping("/message") +public class MessageController { + @Autowired + private MessageService messageService; + + /** + * 消息列表 + */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody MessageListRequest messageListRequest) { + return messageService.list(messageListRequest); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index b28a32b..661e5f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -1,13 +1,50 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Description: 访客信息提交 * @Author: wangpeng * @Date: 2022/11/8 14:39 */ +@Slf4j +@RestController +@RequestMapping("/visitor") public class VisitController { + @Autowired + private VisitorApplyService visitorApplyService; + /** - * + * 访客信息提交 */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody VisitorApplyAddRequest visitorApplyAddRequest) { + return visitorApplyService.add(visitorApplyAddRequest); + } + + /** + * 访客申请列表，管理员使用keywords任意传，申请者使用keywords传申请者工号 + */ + @PostMapping("/apply/list") + public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest) { + return visitorApplyService.list(visitorApplyListRequest); + } + + /** + * 管理员变更申请状态（通过/不通过） + */ + @PostMapping("/apply/status") + public Object visitorApplyStatus(@RequestBody VisitorApplyStatusRequest visitorApplyStatusRequest) { + return visitorApplyService.updateStatus(visitorApplyStatusRequest); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java new file mode 100644 index 0000000..f07223d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.model.VisitorApply; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 访问申请mapper + * @Author: wangpeng + * @Date: 2022/7/20 10:23 + */ +@Mapper +public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml new file mode 100644 index 0000000..aa5f058 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java new file mode 100644 index 0000000..63dc3bd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class MessageListRequest { + private String messageNo; + private String messageTitle; + private String messageSecondTitle; + private String messageContent; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java new file mode 100644 index 0000000..af2813c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyAddRequest { + //访客姓名 + private String visitorName; + //访客身份证 + private String visitorIdCard; + //访客联系方式 + private String visitorPhone; + //访问目的 + private String visitReason; + //访问区域(楼栋) + private String visitPosition; + //访问开始时间 + private String inTime; + //访问结束时间 + private String outTime; + //备注 + private String remarks; + //申请者工号 + private String staffCode; + //申请者姓名 + private String staffName; + //申请者手机号 + private String staffPhone; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java new file mode 100644 index 0000000..8bccf4a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyListRequest { + //申请单号/访客姓名/申请者工号/访客联系方式 + private String keywords; + private String startTime; + private String endTime; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java new file mode 100644 index 0000000..fbd7d70 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java @@ -0,0 +1,14 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyStatusRequest { + private Long id; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java new file mode 100644 index 0000000..efe2ac5 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface AdminVisitorApplyStatusDict { + //校验通过 + String VERIFY_PASSED = "1"; + //校验不通过 + String VERIFY_FAILED = "2"; + //无法校验 + String UNABLE_TO_VERIFY = "3"; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java new file mode 100644 index 0000000..56c5e7c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface VisitorApplyStatusDict { + //申请已提交 + String APPLY_SUBMITTED = "1"; + //申请通过 + String APPLY_PASSED = "2"; + //申请不通过 + String APPLY_FAILED = "3"; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java new file mode 100644 index 0000000..ec22d7e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java @@ -0,0 +1,56 @@ +package com.casic.missiles.modular.system.model; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * @Description: 访客申请实体类 + * @Author: wangpeng + * @Date: 2022/11/15 14:35 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Data +@TableName("bus_visit_apply") +public class VisitorApply { + @TableId + private Long id; + @ExcelProperty("访客姓名") + private String visitorName; + @ExcelProperty("申请单号") + private String applyNo; + @ExcelProperty("申请者工号") + private String staffCode; + @ExcelProperty("申请者姓名") + private String staffName; + @ExcelProperty("访客身份证") + private String visitorIdCard; + @ExcelProperty("访客联系方式") + private String visitorPhone; + @ExcelProperty("访问目的") + private String visitReason; + @ExcelProperty("访问区域") + private String visitPosition; + @ExcelProperty("备注") + private String remarks; + @ExcelProperty("访问开始时间") + private String inTime; + @ExcelProperty("访问结束时间") + private String outTime; + @ExcelProperty("状态") + private String status; + + private String createTime; + private String updateTime; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java new file mode 100644 index 0000000..dba4a59 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.dto.MessageListRequest; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:48 + */ +public interface MessageService { + Object list(MessageListRequest messageListRequest); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java new file mode 100644 index 0000000..3bc9b9b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; + +/** + * @Description: 访问申请service + * @Author: wangpeng + * @Date: 2022/7/20 14:59 + */ +public interface VisitorApplyService { +// List visitorApplyListPage(Page page, VisitorApplyRequest visitorApplyRequest); + + Object add(VisitorApplyAddRequest visitorApplyAddRequest); + + Object list(VisitorApplyListRequest visitorApplyListRequest); + + Object updateStatus(VisitorApplyStatusRequest visitorApplyStatusRequest); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MessageServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MessageServiceImpl.java new file mode 100644 index 0000000..74222c1 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MessageServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:48 + */ +@Slf4j +@Service +public class MessageServiceImpl implements MessageService { + @Override + public Object list(MessageListRequest messageListRequest) { + return null; + } +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java new file mode 100644 index 0000000..6f82170 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:47 + */ +@Slf4j +@RestController +@RequestMapping("/message") +public class MessageController { + @Autowired + private MessageService messageService; + + /** + * 消息列表 + */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody MessageListRequest messageListRequest) { + return messageService.list(messageListRequest); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index b28a32b..661e5f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -1,13 +1,50 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Description: 访客信息提交 * @Author: wangpeng * @Date: 2022/11/8 14:39 */ +@Slf4j +@RestController +@RequestMapping("/visitor") public class VisitController { + @Autowired + private VisitorApplyService visitorApplyService; + /** - * + * 访客信息提交 */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody VisitorApplyAddRequest visitorApplyAddRequest) { + return visitorApplyService.add(visitorApplyAddRequest); + } + + /** + * 访客申请列表，管理员使用keywords任意传，申请者使用keywords传申请者工号 + */ + @PostMapping("/apply/list") + public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest) { + return visitorApplyService.list(visitorApplyListRequest); + } + + /** + * 管理员变更申请状态（通过/不通过） + */ + @PostMapping("/apply/status") + public Object visitorApplyStatus(@RequestBody VisitorApplyStatusRequest visitorApplyStatusRequest) { + return visitorApplyService.updateStatus(visitorApplyStatusRequest); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java new file mode 100644 index 0000000..f07223d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.model.VisitorApply; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 访问申请mapper + * @Author: wangpeng + * @Date: 2022/7/20 10:23 + */ +@Mapper +public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml new file mode 100644 index 0000000..aa5f058 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java new file mode 100644 index 0000000..63dc3bd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class MessageListRequest { + private String messageNo; + private String messageTitle; + private String messageSecondTitle; + private String messageContent; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java new file mode 100644 index 0000000..af2813c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyAddRequest { + //访客姓名 + private String visitorName; + //访客身份证 + private String visitorIdCard; + //访客联系方式 + private String visitorPhone; + //访问目的 + private String visitReason; + //访问区域(楼栋) + private String visitPosition; + //访问开始时间 + private String inTime; + //访问结束时间 + private String outTime; + //备注 + private String remarks; + //申请者工号 + private String staffCode; + //申请者姓名 + private String staffName; + //申请者手机号 + private String staffPhone; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java new file mode 100644 index 0000000..8bccf4a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyListRequest { + //申请单号/访客姓名/申请者工号/访客联系方式 + private String keywords; + private String startTime; + private String endTime; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java new file mode 100644 index 0000000..fbd7d70 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java @@ -0,0 +1,14 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyStatusRequest { + private Long id; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java new file mode 100644 index 0000000..efe2ac5 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface AdminVisitorApplyStatusDict { + //校验通过 + String VERIFY_PASSED = "1"; + //校验不通过 + String VERIFY_FAILED = "2"; + //无法校验 + String UNABLE_TO_VERIFY = "3"; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java new file mode 100644 index 0000000..56c5e7c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface VisitorApplyStatusDict { + //申请已提交 + String APPLY_SUBMITTED = "1"; + //申请通过 + String APPLY_PASSED = "2"; + //申请不通过 + String APPLY_FAILED = "3"; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java new file mode 100644 index 0000000..ec22d7e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java @@ -0,0 +1,56 @@ +package com.casic.missiles.modular.system.model; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * @Description: 访客申请实体类 + * @Author: wangpeng + * @Date: 2022/11/15 14:35 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Data +@TableName("bus_visit_apply") +public class VisitorApply { + @TableId + private Long id; + @ExcelProperty("访客姓名") + private String visitorName; + @ExcelProperty("申请单号") + private String applyNo; + @ExcelProperty("申请者工号") + private String staffCode; + @ExcelProperty("申请者姓名") + private String staffName; + @ExcelProperty("访客身份证") + private String visitorIdCard; + @ExcelProperty("访客联系方式") + private String visitorPhone; + @ExcelProperty("访问目的") + private String visitReason; + @ExcelProperty("访问区域") + private String visitPosition; + @ExcelProperty("备注") + private String remarks; + @ExcelProperty("访问开始时间") + private String inTime; + @ExcelProperty("访问结束时间") + private String outTime; + @ExcelProperty("状态") + private String status; + + private String createTime; + private String updateTime; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java new file mode 100644 index 0000000..dba4a59 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.dto.MessageListRequest; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:48 + */ +public interface MessageService { + Object list(MessageListRequest messageListRequest); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java new file mode 100644 index 0000000..3bc9b9b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; + +/** + * @Description: 访问申请service + * @Author: wangpeng + * @Date: 2022/7/20 14:59 + */ +public interface VisitorApplyService { +// List visitorApplyListPage(Page page, VisitorApplyRequest visitorApplyRequest); + + Object add(VisitorApplyAddRequest visitorApplyAddRequest); + + Object list(VisitorApplyListRequest visitorApplyListRequest); + + Object updateStatus(VisitorApplyStatusRequest visitorApplyStatusRequest); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MessageServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MessageServiceImpl.java new file mode 100644 index 0000000..74222c1 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MessageServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:48 + */ +@Slf4j +@Service +public class MessageServiceImpl implements MessageService { + @Override + public Object list(MessageListRequest messageListRequest) { + return null; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java new file mode 100644 index 0000000..fd5189d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/7/19 18:38 + */ +@Slf4j +@Service +public class StaffInfoServiceImpl extends ServiceImpl { + +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java new file mode 100644 index 0000000..6f82170 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:47 + */ +@Slf4j +@RestController +@RequestMapping("/message") +public class MessageController { + @Autowired + private MessageService messageService; + + /** + * 消息列表 + */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody MessageListRequest messageListRequest) { + return messageService.list(messageListRequest); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index b28a32b..661e5f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -1,13 +1,50 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Description: 访客信息提交 * @Author: wangpeng * @Date: 2022/11/8 14:39 */ +@Slf4j +@RestController +@RequestMapping("/visitor") public class VisitController { + @Autowired + private VisitorApplyService visitorApplyService; + /** - * + * 访客信息提交 */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody VisitorApplyAddRequest visitorApplyAddRequest) { + return visitorApplyService.add(visitorApplyAddRequest); + } + + /** + * 访客申请列表，管理员使用keywords任意传，申请者使用keywords传申请者工号 + */ + @PostMapping("/apply/list") + public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest) { + return visitorApplyService.list(visitorApplyListRequest); + } + + /** + * 管理员变更申请状态（通过/不通过） + */ + @PostMapping("/apply/status") + public Object visitorApplyStatus(@RequestBody VisitorApplyStatusRequest visitorApplyStatusRequest) { + return visitorApplyService.updateStatus(visitorApplyStatusRequest); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java new file mode 100644 index 0000000..f07223d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.model.VisitorApply; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 访问申请mapper + * @Author: wangpeng + * @Date: 2022/7/20 10:23 + */ +@Mapper +public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml new file mode 100644 index 0000000..aa5f058 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java new file mode 100644 index 0000000..63dc3bd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class MessageListRequest { + private String messageNo; + private String messageTitle; + private String messageSecondTitle; + private String messageContent; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java new file mode 100644 index 0000000..af2813c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyAddRequest { + //访客姓名 + private String visitorName; + //访客身份证 + private String visitorIdCard; + //访客联系方式 + private String visitorPhone; + //访问目的 + private String visitReason; + //访问区域(楼栋) + private String visitPosition; + //访问开始时间 + private String inTime; + //访问结束时间 + private String outTime; + //备注 + private String remarks; + //申请者工号 + private String staffCode; + //申请者姓名 + private String staffName; + //申请者手机号 + private String staffPhone; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java new file mode 100644 index 0000000..8bccf4a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyListRequest { + //申请单号/访客姓名/申请者工号/访客联系方式 + private String keywords; + private String startTime; + private String endTime; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java new file mode 100644 index 0000000..fbd7d70 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java @@ -0,0 +1,14 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyStatusRequest { + private Long id; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java new file mode 100644 index 0000000..efe2ac5 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface AdminVisitorApplyStatusDict { + //校验通过 + String VERIFY_PASSED = "1"; + //校验不通过 + String VERIFY_FAILED = "2"; + //无法校验 + String UNABLE_TO_VERIFY = "3"; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java new file mode 100644 index 0000000..56c5e7c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface VisitorApplyStatusDict { + //申请已提交 + String APPLY_SUBMITTED = "1"; + //申请通过 + String APPLY_PASSED = "2"; + //申请不通过 + String APPLY_FAILED = "3"; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java new file mode 100644 index 0000000..ec22d7e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java @@ -0,0 +1,56 @@ +package com.casic.missiles.modular.system.model; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * @Description: 访客申请实体类 + * @Author: wangpeng + * @Date: 2022/11/15 14:35 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Data +@TableName("bus_visit_apply") +public class VisitorApply { + @TableId + private Long id; + @ExcelProperty("访客姓名") + private String visitorName; + @ExcelProperty("申请单号") + private String applyNo; + @ExcelProperty("申请者工号") + private String staffCode; + @ExcelProperty("申请者姓名") + private String staffName; + @ExcelProperty("访客身份证") + private String visitorIdCard; + @ExcelProperty("访客联系方式") + private String visitorPhone; + @ExcelProperty("访问目的") + private String visitReason; + @ExcelProperty("访问区域") + private String visitPosition; + @ExcelProperty("备注") + private String remarks; + @ExcelProperty("访问开始时间") + private String inTime; + @ExcelProperty("访问结束时间") + private String outTime; + @ExcelProperty("状态") + private String status; + + private String createTime; + private String updateTime; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java new file mode 100644 index 0000000..dba4a59 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.dto.MessageListRequest; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:48 + */ +public interface MessageService { + Object list(MessageListRequest messageListRequest); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java new file mode 100644 index 0000000..3bc9b9b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; + +/** + * @Description: 访问申请service + * @Author: wangpeng + * @Date: 2022/7/20 14:59 + */ +public interface VisitorApplyService { +// List visitorApplyListPage(Page page, VisitorApplyRequest visitorApplyRequest); + + Object add(VisitorApplyAddRequest visitorApplyAddRequest); + + Object list(VisitorApplyListRequest visitorApplyListRequest); + + Object updateStatus(VisitorApplyStatusRequest visitorApplyStatusRequest); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MessageServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MessageServiceImpl.java new file mode 100644 index 0000000..74222c1 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MessageServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:48 + */ +@Slf4j +@Service +public class MessageServiceImpl implements MessageService { + @Override + public Object list(MessageListRequest messageListRequest) { + return null; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java new file mode 100644 index 0000000..fd5189d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/7/19 18:38 + */ +@Slf4j +@Service +public class StaffInfoServiceImpl extends ServiceImpl { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java new file mode 100644 index 0000000..7c3fbfb --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dao.VisitorApplyMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.enums.VisitorApplyStatusDict; +import com.casic.missiles.modular.system.model.VisitorApply; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 15:01 + */ +@Slf4j +@Service +public class VisitorApplyServiceImpl extends ServiceImpl implements VisitorApplyService { + @Autowired + private VisitorApplyMapper visitorApplyMapper; + + @Override + public Object add(VisitorApplyAddRequest visitorApplyAddRequest) { + VisitorApply visitorApply = new VisitorApply(); + BeanUtils.copyProperties(visitorApplyAddRequest, visitorApply); + visitorApply.setStatus(VisitorApplyStatusDict.APPLY_SUBMITTED); + if(visitorApplyMapper.insert(visitorApply) > 0){ + // TODO: 2022/11/15 给物业管理员发送校验通过通知，生成单号 + // 当用户在小程序内发生过提交表单行为且该表单声明为要发模板消息的，开发者需要向用户提供服务时， + // 可允许开发者向用户在7天内推送有限条数的模板消息（一次提交表单可下发1条多次提交下发条数独立，相互不影响） + // TODO: 2022/11/17 消息发送成功存入消息表 + + return ResponseData.success(); + } + return ResponseData.error("访客申请失败"); + } + + @Override + public Object list(VisitorApplyListRequest visitorApplyListRequest) { + List list = visitorApplyMapper.selectApplyList(visitorApplyListRequest); + if(CollectionUtils.isEmpty(list)){ + return new ArrayList<>(); + } + return ResponseData.success(list); + } + + @Override + public Object updateStatus(VisitorApplyStatusRequest visitorApplyStatusRequest) { + VisitorApply visitorApply = new VisitorApply(); + BeanUtils.copyProperties(visitorApplyStatusRequest, visitorApply); + if(visitorApplyMapper.updateById(visitorApply) > 0){ + //申请通过 + if(VisitorApplyStatusDict.APPLY_PASSED.equals(visitorApply.getStatus())){ + // TODO: 2022/11/17 向用户发送申请通过消息通知 + + // TODO: 2022/11/17 消息发送成功存入消息表 + + } + //申请不通过 + if(VisitorApplyStatusDict.APPLY_FAILED.equals(visitorApply.getStatus())){ + // TODO: 2022/11/17 向用户发送申请不通过消息通知 + + // TODO: 2022/11/17 消息发送成功存入消息表 + + } + return ResponseData.success(); + } + return ResponseData.error("提交失败"); + } +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java new file mode 100644 index 0000000..6f82170 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:47 + */ +@Slf4j +@RestController +@RequestMapping("/message") +public class MessageController { + @Autowired + private MessageService messageService; + + /** + * 消息列表 + */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody MessageListRequest messageListRequest) { + return messageService.list(messageListRequest); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index b28a32b..661e5f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -1,13 +1,50 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Description: 访客信息提交 * @Author: wangpeng * @Date: 2022/11/8 14:39 */ +@Slf4j +@RestController +@RequestMapping("/visitor") public class VisitController { + @Autowired + private VisitorApplyService visitorApplyService; + /** - * + * 访客信息提交 */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody VisitorApplyAddRequest visitorApplyAddRequest) { + return visitorApplyService.add(visitorApplyAddRequest); + } + + /** + * 访客申请列表，管理员使用keywords任意传，申请者使用keywords传申请者工号 + */ + @PostMapping("/apply/list") + public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest) { + return visitorApplyService.list(visitorApplyListRequest); + } + + /** + * 管理员变更申请状态（通过/不通过） + */ + @PostMapping("/apply/status") + public Object visitorApplyStatus(@RequestBody VisitorApplyStatusRequest visitorApplyStatusRequest) { + return visitorApplyService.updateStatus(visitorApplyStatusRequest); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java new file mode 100644 index 0000000..f07223d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.model.VisitorApply; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 访问申请mapper + * @Author: wangpeng + * @Date: 2022/7/20 10:23 + */ +@Mapper +public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml new file mode 100644 index 0000000..aa5f058 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java new file mode 100644 index 0000000..63dc3bd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class MessageListRequest { + private String messageNo; + private String messageTitle; + private String messageSecondTitle; + private String messageContent; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java new file mode 100644 index 0000000..af2813c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyAddRequest { + //访客姓名 + private String visitorName; + //访客身份证 + private String visitorIdCard; + //访客联系方式 + private String visitorPhone; + //访问目的 + private String visitReason; + //访问区域(楼栋) + private String visitPosition; + //访问开始时间 + private String inTime; + //访问结束时间 + private String outTime; + //备注 + private String remarks; + //申请者工号 + private String staffCode; + //申请者姓名 + private String staffName; + //申请者手机号 + private String staffPhone; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java new file mode 100644 index 0000000..8bccf4a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyListRequest { + //申请单号/访客姓名/申请者工号/访客联系方式 + private String keywords; + private String startTime; + private String endTime; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java new file mode 100644 index 0000000..fbd7d70 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java @@ -0,0 +1,14 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyStatusRequest { + private Long id; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java new file mode 100644 index 0000000..efe2ac5 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface AdminVisitorApplyStatusDict { + //校验通过 + String VERIFY_PASSED = "1"; + //校验不通过 + String VERIFY_FAILED = "2"; + //无法校验 + String UNABLE_TO_VERIFY = "3"; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java new file mode 100644 index 0000000..56c5e7c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface VisitorApplyStatusDict { + //申请已提交 + String APPLY_SUBMITTED = "1"; + //申请通过 + String APPLY_PASSED = "2"; + //申请不通过 + String APPLY_FAILED = "3"; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java new file mode 100644 index 0000000..ec22d7e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java @@ -0,0 +1,56 @@ +package com.casic.missiles.modular.system.model; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * @Description: 访客申请实体类 + * @Author: wangpeng + * @Date: 2022/11/15 14:35 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Data +@TableName("bus_visit_apply") +public class VisitorApply { + @TableId + private Long id; + @ExcelProperty("访客姓名") + private String visitorName; + @ExcelProperty("申请单号") + private String applyNo; + @ExcelProperty("申请者工号") + private String staffCode; + @ExcelProperty("申请者姓名") + private String staffName; + @ExcelProperty("访客身份证") + private String visitorIdCard; + @ExcelProperty("访客联系方式") + private String visitorPhone; + @ExcelProperty("访问目的") + private String visitReason; + @ExcelProperty("访问区域") + private String visitPosition; + @ExcelProperty("备注") + private String remarks; + @ExcelProperty("访问开始时间") + private String inTime; + @ExcelProperty("访问结束时间") + private String outTime; + @ExcelProperty("状态") + private String status; + + private String createTime; + private String updateTime; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java new file mode 100644 index 0000000..dba4a59 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.dto.MessageListRequest; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:48 + */ +public interface MessageService { + Object list(MessageListRequest messageListRequest); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java new file mode 100644 index 0000000..3bc9b9b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; + +/** + * @Description: 访问申请service + * @Author: wangpeng + * @Date: 2022/7/20 14:59 + */ +public interface VisitorApplyService { +// List visitorApplyListPage(Page page, VisitorApplyRequest visitorApplyRequest); + + Object add(VisitorApplyAddRequest visitorApplyAddRequest); + + Object list(VisitorApplyListRequest visitorApplyListRequest); + + Object updateStatus(VisitorApplyStatusRequest visitorApplyStatusRequest); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MessageServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MessageServiceImpl.java new file mode 100644 index 0000000..74222c1 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MessageServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:48 + */ +@Slf4j +@Service +public class MessageServiceImpl implements MessageService { + @Override + public Object list(MessageListRequest messageListRequest) { + return null; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java new file mode 100644 index 0000000..fd5189d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/7/19 18:38 + */ +@Slf4j +@Service +public class StaffInfoServiceImpl extends ServiceImpl { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java new file mode 100644 index 0000000..7c3fbfb --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dao.VisitorApplyMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.enums.VisitorApplyStatusDict; +import com.casic.missiles.modular.system.model.VisitorApply; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 15:01 + */ +@Slf4j +@Service +public class VisitorApplyServiceImpl extends ServiceImpl implements VisitorApplyService { + @Autowired + private VisitorApplyMapper visitorApplyMapper; + + @Override + public Object add(VisitorApplyAddRequest visitorApplyAddRequest) { + VisitorApply visitorApply = new VisitorApply(); + BeanUtils.copyProperties(visitorApplyAddRequest, visitorApply); + visitorApply.setStatus(VisitorApplyStatusDict.APPLY_SUBMITTED); + if(visitorApplyMapper.insert(visitorApply) > 0){ + // TODO: 2022/11/15 给物业管理员发送校验通过通知，生成单号 + // 当用户在小程序内发生过提交表单行为且该表单声明为要发模板消息的，开发者需要向用户提供服务时， + // 可允许开发者向用户在7天内推送有限条数的模板消息（一次提交表单可下发1条多次提交下发条数独立，相互不影响） + // TODO: 2022/11/17 消息发送成功存入消息表 + + return ResponseData.success(); + } + return ResponseData.error("访客申请失败"); + } + + @Override + public Object list(VisitorApplyListRequest visitorApplyListRequest) { + List list = visitorApplyMapper.selectApplyList(visitorApplyListRequest); + if(CollectionUtils.isEmpty(list)){ + return new ArrayList<>(); + } + return ResponseData.success(list); + } + + @Override + public Object updateStatus(VisitorApplyStatusRequest visitorApplyStatusRequest) { + VisitorApply visitorApply = new VisitorApply(); + BeanUtils.copyProperties(visitorApplyStatusRequest, visitorApply); + if(visitorApplyMapper.updateById(visitorApply) > 0){ + //申请通过 + if(VisitorApplyStatusDict.APPLY_PASSED.equals(visitorApply.getStatus())){ + // TODO: 2022/11/17 向用户发送申请通过消息通知 + + // TODO: 2022/11/17 消息发送成功存入消息表 + + } + //申请不通过 + if(VisitorApplyStatusDict.APPLY_FAILED.equals(visitorApply.getStatus())){ + // TODO: 2022/11/17 向用户发送申请不通过消息通知 + + // TODO: 2022/11/17 消息发送成功存入消息表 + + } + return ResponseData.success(); + } + return ResponseData.error("提交失败"); + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index e937cb1..0a975cf 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -12,7 +12,7 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken + no-login-urls: /**/**,${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken #flowable数据源和多数据源配置 db: init: diff --git a/casic-server/pom.xml b/casic-server/pom.xml index cd24fd8..819f6f2 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,7 +35,23 @@ ${boot.version} provided - + + com.casic + casic-file-support + ${admin.version} + + + + com.casic + casic-file + ${admin.version} + + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java new file mode 100644 index 0000000..6f82170 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/MessageController.java @@ -0,0 +1,31 @@ +package com.casic.missiles.modular.system.controller; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:47 + */ +@Slf4j +@RestController +@RequestMapping("/message") +public class MessageController { + @Autowired + private MessageService messageService; + + /** + * 消息列表 + */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody MessageListRequest messageListRequest) { + return messageService.list(messageListRequest); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index b28a32b..661e5f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -1,13 +1,50 @@ package com.casic.missiles.modular.system.controller; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Description: 访客信息提交 * @Author: wangpeng * @Date: 2022/11/8 14:39 */ +@Slf4j +@RestController +@RequestMapping("/visitor") public class VisitController { + @Autowired + private VisitorApplyService visitorApplyService; + /** - * + * 访客信息提交 */ + @PostMapping("/apply/submit") + public Object visitorApply(@RequestBody VisitorApplyAddRequest visitorApplyAddRequest) { + return visitorApplyService.add(visitorApplyAddRequest); + } + + /** + * 访客申请列表，管理员使用keywords任意传，申请者使用keywords传申请者工号 + */ + @PostMapping("/apply/list") + public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest) { + return visitorApplyService.list(visitorApplyListRequest); + } + + /** + * 管理员变更申请状态（通过/不通过） + */ + @PostMapping("/apply/status") + public Object visitorApplyStatus(@RequestBody VisitorApplyStatusRequest visitorApplyStatusRequest) { + return visitorApplyService.updateStatus(visitorApplyStatusRequest); + } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java new file mode 100644 index 0000000..f07223d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.model.VisitorApply; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 访问申请mapper + * @Author: wangpeng + * @Date: 2022/7/20 10:23 + */ +@Mapper +public interface VisitorApplyMapper extends BaseMapper { + List selectApplyList(@Param("request") VisitorApplyListRequest request); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml new file mode 100644 index 0000000..aa5f058 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java new file mode 100644 index 0000000..63dc3bd --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/MessageListRequest.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class MessageListRequest { + private String messageNo; + private String messageTitle; + private String messageSecondTitle; + private String messageContent; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java new file mode 100644 index 0000000..af2813c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyAddRequest.java @@ -0,0 +1,34 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyAddRequest { + //访客姓名 + private String visitorName; + //访客身份证 + private String visitorIdCard; + //访客联系方式 + private String visitorPhone; + //访问目的 + private String visitReason; + //访问区域(楼栋) + private String visitPosition; + //访问开始时间 + private String inTime; + //访问结束时间 + private String outTime; + //备注 + private String remarks; + //申请者工号 + private String staffCode; + //申请者姓名 + private String staffName; + //申请者手机号 + private String staffPhone; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java new file mode 100644 index 0000000..8bccf4a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyListRequest { + //申请单号/访客姓名/申请者工号/访客联系方式 + private String keywords; + private String startTime; + private String endTime; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java new file mode 100644 index 0000000..fbd7d70 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java @@ -0,0 +1,14 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 14:52 + */ +@Data +public class VisitorApplyStatusRequest { + private Long id; + private String status; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java new file mode 100644 index 0000000..efe2ac5 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/AdminVisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface AdminVisitorApplyStatusDict { + //校验通过 + String VERIFY_PASSED = "1"; + //校验不通过 + String VERIFY_FAILED = "2"; + //无法校验 + String UNABLE_TO_VERIFY = "3"; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java new file mode 100644 index 0000000..56c5e7c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/VisitorApplyStatusDict.java @@ -0,0 +1,15 @@ +package com.casic.missiles.modular.system.enums; + +/** + * @Description: 申请者访客申请状态 + * @Author: wangpeng + * @Date: 2022/11/15 15:44 + */ +public interface VisitorApplyStatusDict { + //申请已提交 + String APPLY_SUBMITTED = "1"; + //申请通过 + String APPLY_PASSED = "2"; + //申请不通过 + String APPLY_FAILED = "3"; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java new file mode 100644 index 0000000..ec22d7e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java @@ -0,0 +1,56 @@ +package com.casic.missiles.modular.system.model; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * @Description: 访客申请实体类 + * @Author: wangpeng + * @Date: 2022/11/15 14:35 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +@Data +@TableName("bus_visit_apply") +public class VisitorApply { + @TableId + private Long id; + @ExcelProperty("访客姓名") + private String visitorName; + @ExcelProperty("申请单号") + private String applyNo; + @ExcelProperty("申请者工号") + private String staffCode; + @ExcelProperty("申请者姓名") + private String staffName; + @ExcelProperty("访客身份证") + private String visitorIdCard; + @ExcelProperty("访客联系方式") + private String visitorPhone; + @ExcelProperty("访问目的") + private String visitReason; + @ExcelProperty("访问区域") + private String visitPosition; + @ExcelProperty("备注") + private String remarks; + @ExcelProperty("访问开始时间") + private String inTime; + @ExcelProperty("访问结束时间") + private String outTime; + @ExcelProperty("状态") + private String status; + + private String createTime; + private String updateTime; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java new file mode 100644 index 0000000..dba4a59 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/MessageService.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.dto.MessageListRequest; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:48 + */ +public interface MessageService { + Object list(MessageListRequest messageListRequest); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java new file mode 100644 index 0000000..3bc9b9b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.service; + +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; + +/** + * @Description: 访问申请service + * @Author: wangpeng + * @Date: 2022/7/20 14:59 + */ +public interface VisitorApplyService { +// List visitorApplyListPage(Page page, VisitorApplyRequest visitorApplyRequest); + + Object add(VisitorApplyAddRequest visitorApplyAddRequest); + + Object list(VisitorApplyListRequest visitorApplyListRequest); + + Object updateStatus(VisitorApplyStatusRequest visitorApplyStatusRequest); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MessageServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MessageServiceImpl.java new file mode 100644 index 0000000..74222c1 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/MessageServiceImpl.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.casic.missiles.modular.system.dto.MessageListRequest; +import com.casic.missiles.modular.system.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/17 13:48 + */ +@Slf4j +@Service +public class MessageServiceImpl implements MessageService { + @Override + public Object list(MessageListRequest messageListRequest) { + return null; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java new file mode 100644 index 0000000..fd5189d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/StaffInfoServiceImpl.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/7/19 18:38 + */ +@Slf4j +@Service +public class StaffInfoServiceImpl extends ServiceImpl { + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java new file mode 100644 index 0000000..7c3fbfb --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java @@ -0,0 +1,80 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dao.VisitorApplyMapper; +import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; +import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; +import com.casic.missiles.modular.system.enums.VisitorApplyStatusDict; +import com.casic.missiles.modular.system.model.VisitorApply; +import com.casic.missiles.modular.system.service.VisitorApplyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2022/11/15 15:01 + */ +@Slf4j +@Service +public class VisitorApplyServiceImpl extends ServiceImpl implements VisitorApplyService { + @Autowired + private VisitorApplyMapper visitorApplyMapper; + + @Override + public Object add(VisitorApplyAddRequest visitorApplyAddRequest) { + VisitorApply visitorApply = new VisitorApply(); + BeanUtils.copyProperties(visitorApplyAddRequest, visitorApply); + visitorApply.setStatus(VisitorApplyStatusDict.APPLY_SUBMITTED); + if(visitorApplyMapper.insert(visitorApply) > 0){ + // TODO: 2022/11/15 给物业管理员发送校验通过通知，生成单号 + // 当用户在小程序内发生过提交表单行为且该表单声明为要发模板消息的，开发者需要向用户提供服务时， + // 可允许开发者向用户在7天内推送有限条数的模板消息（一次提交表单可下发1条多次提交下发条数独立，相互不影响） + // TODO: 2022/11/17 消息发送成功存入消息表 + + return ResponseData.success(); + } + return ResponseData.error("访客申请失败"); + } + + @Override + public Object list(VisitorApplyListRequest visitorApplyListRequest) { + List list = visitorApplyMapper.selectApplyList(visitorApplyListRequest); + if(CollectionUtils.isEmpty(list)){ + return new ArrayList<>(); + } + return ResponseData.success(list); + } + + @Override + public Object updateStatus(VisitorApplyStatusRequest visitorApplyStatusRequest) { + VisitorApply visitorApply = new VisitorApply(); + BeanUtils.copyProperties(visitorApplyStatusRequest, visitorApply); + if(visitorApplyMapper.updateById(visitorApply) > 0){ + //申请通过 + if(VisitorApplyStatusDict.APPLY_PASSED.equals(visitorApply.getStatus())){ + // TODO: 2022/11/17 向用户发送申请通过消息通知 + + // TODO: 2022/11/17 消息发送成功存入消息表 + + } + //申请不通过 + if(VisitorApplyStatusDict.APPLY_FAILED.equals(visitorApply.getStatus())){ + // TODO: 2022/11/17 向用户发送申请不通过消息通知 + + // TODO: 2022/11/17 消息发送成功存入消息表 + + } + return ResponseData.success(); + } + return ResponseData.error("提交失败"); + } +} diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index e937cb1..0a975cf 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -12,7 +12,7 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken + no-login-urls: /**/**,${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken #flowable数据源和多数据源配置 db: init: diff --git a/pom.xml b/pom.xml index bfe1cc1..be2c219 100644 --- a/pom.xml +++ b/pom.xml @@ -26,8 +26,7 @@ 2.0.0.alpha - - + 2.0.0.alpha 3.2.1 1.7 3.6