From b8c7f58cb510030dd7ce67938ffc5ffe15465ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=81=B0=E5=A4=AA=E7=8B=BC?= <1214761728@qq.com> Date: Fri, 16 Oct 2020 10:31:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EDataSubmit=E7=9B=B8=E5=85=B3m?= =?UTF-8?q?aper=E5=8F=8Aservice=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E5=B0=9A=E6=9C=AA=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/shiro/CenterAuthShiroConfig.java | 1 + .../controller/rest/VfileMenuController.java | 17 +- .../controller/views/OpenPageController.java | 13 ++ .../java/com/cetc32/dh/entity/DataSubmit.java | 176 ++++++++++++++++++ .../cetc32/dh/mybatis/DataSubmitMapper.java | 38 ++++ .../cetc32/dh/service/DataSubmitService.java | 51 +++++ .../service/impl/DataSubmitServiceImpl.java | 89 +++++++++ src/main/resources/application-xwy.yml | 3 +- .../resources/mapper/DataSubmitMapper.xml | 123 ++++++++++++ 9 files changed, 504 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/cetc32/dh/controller/views/OpenPageController.java create mode 100644 src/main/java/com/cetc32/dh/entity/DataSubmit.java create mode 100644 src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java create mode 100644 src/main/java/com/cetc32/dh/service/DataSubmitService.java create mode 100644 src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java create mode 100644 src/main/resources/mapper/DataSubmitMapper.xml diff --git a/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java b/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java index f1d2c3d..d921632 100644 --- a/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java +++ b/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java @@ -85,6 +85,7 @@ public class CenterAuthShiroConfig { filterRuleMap.put("/**","jwt"); // 访问 /unauthorized/** 不通过JWTFilter filterRuleMap.put("/unauthorized/**","anon"); + filterRuleMap.put("/open/**","anon"); factoryBean.setFilterChainDefinitionMap(filterRuleMap); return factoryBean; } diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java index 9af6319..5349682 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java @@ -12,9 +12,7 @@ import com.cetc32.dh.common.response.PageDataResult; import com.cetc32.dh.common.response.ResponseResult; import com.cetc32.dh.entity.VfileMenu; import com.github.pagehelper.PageHelper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -174,10 +172,17 @@ public class VfileMenuController { * 备注:无 */ @ApiOperation(value="queryFilesByKeywords",notes="") + /* @ApiImplicitParams({ + @ApiImplicitParam(name = "current", value = "当前页码", required = true, + dataType = "Integer", paramType = "query", defaultValue = "1"), + + @ApiImplicitParam(name = "page", value = "每页数据条数", required = true, + dataType = "Integer", paramType = "query", defaultValue = "10") + })*/ @PostMapping("/find") - public PageDataResult queryFilesByObj(@RequestParam("current") Integer pageNum, - @RequestParam("page") Integer pageSize, - VfileMenu vfileMenu){ + public PageDataResult queryFilesByObj(@ApiParam(value="pageNum",required = true,defaultValue = "1") @RequestParam("current") Integer pageNum, + @ApiParam(value="pageSize",required = true,defaultValue = "10") @RequestParam("page") Integer pageSize, + @ApiParam(value="vfileMenu")VfileMenu vfileMenu){ //if(vfil) //vfileMenu=new VfileMenu(null,null,null,null,null,null,null,13L,2017); PageDataResult pdr = new PageDataResult(); diff --git a/src/main/java/com/cetc32/dh/controller/views/OpenPageController.java b/src/main/java/com/cetc32/dh/controller/views/OpenPageController.java new file mode 100644 index 0000000..009bd9b --- /dev/null +++ b/src/main/java/com/cetc32/dh/controller/views/OpenPageController.java @@ -0,0 +1,13 @@ +package com.cetc32.dh.controller.views; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/open/") +public class OpenPageController { + @GetMapping String api(){ + return "api"; + } +} diff --git a/src/main/java/com/cetc32/dh/entity/DataSubmit.java b/src/main/java/com/cetc32/dh/entity/DataSubmit.java new file mode 100644 index 0000000..fc082a4 --- /dev/null +++ b/src/main/java/com/cetc32/dh/entity/DataSubmit.java @@ -0,0 +1,176 @@ +/** + * Copyright(C)版权所有 中国电子科技集团公司第三十二研究所 + * @Title: 数据库实体类 + * @author: 徐文远 + * @version: 1.0 + * @date: 2020/10/15 + * 备注:无 + */ +package com.cetc32.dh.entity; + +import javax.persistence.Column; +import javax.persistence.Table; + +/** + * 数据库实体类 + * @author: xiao + * @version: 徐文远 + * @date: 2020/10/15 + * 备注:无 + */ +@Table(name="data_submit") +public class DataSubmit { + /** + * id + * */ + @Column(name = "id ") + Integer id ; + + /** + * 数据上报类型 + * **/ + @Column(name = "subtype") + Integer subtype; + + /** + * 权限级别 + * */ + @Column(name = "plevel") + Integer plevel; + + /** + * 状态：1表示一提交待审核，2一审核通过，3一审核拒绝 + * */ + @Column(name = "status") + Integer status; + + /** + * 提交者 + * */ + @Column(name = "sumbitor") + String sumbitor; + + /** + * 审核人 + * */ + @Column(name = "approver") + String approver; + + /** + * 所属菜单 + * */ + @Column(name = "menuId") + Integer menuId; + + /** + * 标题 + * */ + @Column(name = "title") + String title; + + /** + * 区域 + * */ + @Column(name = "area") + String area; + + /** + * 存储路径 + * */ + @Column(name = "path") + String path; + + /** + * 所属年分 + * */ + @Column(name = "year") + Integer year; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getSubtype() { + return subtype; + } + + public void setSubtype(Integer subtype) { + this.subtype = subtype; + } + + public Integer getPlevel() { + return plevel; + } + + public void setPlevel(Integer plevel) { + this.plevel = plevel; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getSumbitor() { + return sumbitor; + } + + public void setSumbitor(String sumbitor) { + this.sumbitor = sumbitor; + } + + public String getApprover() { + return approver; + } + + public void setApprover(String approver) { + this.approver = approver; + } + + public Integer getMenuId() { + return menuId; + } + + public void setMenuId(Integer menuId) { + this.menuId = menuId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public Integer getYear() { + return year; + } + + public void setYear(Integer year) { + this.year = year; + } +} diff --git a/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java new file mode 100644 index 0000000..a5c13da --- /dev/null +++ b/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java @@ -0,0 +1,38 @@ +/** + * Copyright(C)版权所有 中国电子科技集团公司第三十二研究所 + * @Title: 数据库接口文件 + * @author: 徐文远 + * @version: 1.0 + * @date: 2020/10/16 + * 备注:无 + */ +package com.cetc32.dh.mybatis; + +import com.cetc32.dh.entity.DataSubmit; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface DataSubmitMapper { + /** + * 插入一个提交记录 + * @param dataSubmit 插入的数据集合 + * @return 反馈是否插入成功 + * */ + Integer insertOne(DataSubmit dataSubmit); + + /** + * 根据ID 更新提交的信息 + * @param dataSubmit 更新的数据集合 + * @return 反馈是否更新成功 + * */ + Integer updateById(DataSubmit dataSubmit); + + /** + * 根据ID 更新提交的信息 + * @param dataSubmit 更新的数据集合，通常dataSubmit一次查询只包含submitor或者approver中的一个。 + * @return 反馈查询到的数据 + * */ + List selectMine(DataSubmit dataSubmit); +} diff --git a/src/main/java/com/cetc32/dh/service/DataSubmitService.java b/src/main/java/com/cetc32/dh/service/DataSubmitService.java new file mode 100644 index 0000000..74b93bf --- /dev/null +++ b/src/main/java/com/cetc32/dh/service/DataSubmitService.java @@ -0,0 +1,51 @@ +/** + * Copyright(C)版权所有 中国电子科技集团公司第三十二研究所 + * @Title: service层接口文件 + * @author: 徐文远 + * @version: 1.0 + * @date: 2020/10/16 + * 备注:无 + * 更改描述：无 + */ +package com.cetc32.dh.service; + +import com.cetc32.dh.entity.DataSubmit; + +import java.util.List; + +public interface DataSubmitService { + /** + * 提交请求后数据插入操作 + * @param ds 更新到数库的数据 + * @return 反馈是否成功 + * **/ + public Integer insertDataSubmit(DataSubmit ds); + + /** + * 拒绝用户此时数据导入申请 + * @param ds 写入到数库的数据 + * @return 反馈是否成功 + * **/ + public Integer rejectSubmit(DataSubmit ds); + + /** + * 接受用户此时数据导入申请 + * @param ds 更新到数库的数据 + * @return 反馈是否成功 + * **/ + public Integer acceptSubmit(DataSubmit ds); + + /** + * 查询当前登陆用户提交的导入申请 + * @param dataSubmit 待查询的数据 + * @return 反馈查询到的结果 + * **/ + public List selectMySubmit(DataSubmit dataSubmit); + + /** + * 查询当前登陆用户的审核过的以及未审核的提交信息 + * @param dataSubmit 待查询的数据 + * @return 反馈查询到的结果 + * **/ + public List selectMyApprove(DataSubmit dataSubmit); +} diff --git a/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java new file mode 100644 index 0000000..8e297cf --- /dev/null +++ b/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java @@ -0,0 +1,89 @@ +/** + * Copyright(C)版权所有 中国电子科技集团公司第三十二研究所 + * @Title: service层接实现类 + * @author: 徐文远 + * @version: 1.0 + * @date: 2020/10/16 + * 备注:无 + * 更改描述：无 + */ +package com.cetc32.dh.service.impl; + +import com.cetc32.dh.entity.DataSubmit; +import com.cetc32.dh.mybatis.DataSubmitMapper; +import com.cetc32.dh.service.DataSubmitService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class DataSubmitServiceImpl implements DataSubmitService { + + DataSubmitMapper dsMapper; + + /** + * 提交请求后数据插入操作 + * + * @param ds 更新到数库的数据 + * @return 反馈是否成功 + **/ + @Override + public Integer insertDataSubmit(DataSubmit ds) { + return null; + } + + /** + * 拒绝用户此时数据导入申请 + * + * @param ds 写入到数库的数据 + * @return 反馈是否成功 + **/ + @Override + public Integer rejectSubmit(DataSubmit ds) { + return null; + } + + /** + * 接受用户此时数据导入申请 + * + * @param ds 更新到数库的数据 + * @return 反馈是否成功 + **/ + @Override + public Integer acceptSubmit(DataSubmit ds) { + return null; + } + + /** + * 查询当前登陆用户提交的导入申请 + * + * @param dataSubmit 待查询的数据 + * @return 反馈查询到的结果 + **/ + @Override + public List selectMySubmit(DataSubmit dataSubmit) { + return null; + } + + /** + * 查询当前登陆用户的审核过的以及未审核的提交信息 + * + * @param dataSubmit 待查询的数据 + * @return 反馈查询到的结果 + **/ + @Override + public List selectMyApprove(DataSubmit dataSubmit) { + return null; + } + + /** + * DataSubmitMapper注入方法，必须用@Autowired注解 + * @param dsMapper 待注入的bean + * @return 反馈为空 + * **/ + @Autowired + public void setDsMapper(DataSubmitMapper dsMapper) { + this.dsMapper = dsMapper; + } +} diff --git a/src/main/resources/application-xwy.yml b/src/main/resources/application-xwy.yml index c549b36..7da57bc 100644 --- a/src/main/resources/application-xwy.yml +++ b/src/main/resources/application-xwy.yml @@ -14,7 +14,8 @@ spring: # test-on-borrow: true driver-class-name: com.mysql.cj.jdbc.Driver type: com.zaxxer.hikari.HikariDataSource - + thymeleaf: + cache: false servlet: multipart: max-file-size: 500MB diff --git a/src/main/resources/mapper/DataSubmitMapper.xml b/src/main/resources/mapper/DataSubmitMapper.xml new file mode 100644 index 0000000..03f0760 --- /dev/null +++ b/src/main/resources/mapper/DataSubmitMapper.xml @@ -0,0 +1,123 @@ + + + + + + insert into data_submit + + + + id, + + + + subtype, + + + + plevel, + + + + submitor, + + + + approver, + + + + menuId, + + + + title, + + + + area, + + + + year, + + + + + + + + #{id}, + + + + #{subtype}, + + + + #{plevel}, + + + + #{submitor}, + + + + #{approver}, + + + + #{menuId}, + + + + #{title}, + + + + #{area}, + + + + #{year}, + + + + + + + update data_submit + + + status = #{status}, + + + plevel = #{plevel}, + + + menuId = #{menuId}, + + + + year = #{year}, + + + + area = #{area}, + + + where id = #{id} + + + + \ No newline at end of file -- Gitee