From 2fe1a1ab52de49d2f6dcddcc7ecebb2191431c95 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Sun, 23 Apr 2023 17:49:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/toolbar-default-actions.js | 3 +- .../static/editor-app/toolbar-controller.js | 3 +- .../controller/PowerApplyController.java | 118 ++++++++++++++++++ .../controller/ReportLogController.java | 2 +- .../controller/ReportManageConroller.java | 17 ++- .../da/report/dao/mysql/PowerApplyActDao.java | 45 +++++++ .../da/report/dao/mysql/PowerApplyDao.java | 44 +++++++ .../adc/da/report/dao/mysql/ReportDao.java | 1 + .../java/com/adc/da/report/eo/PowerApply.java | 84 +++++++++++++ .../com/adc/da/report/eo/PowerApplyAct.java | 85 +++++++++++++ .../report/service/IPowerApplyActService.java | 58 +++++++++ .../da/report/service/IPowerApplyService.java | 58 +++++++++ .../adc/da/report/service/IReportService.java | 2 + .../service/impl/IReportServiceImpl.java | 24 +++- .../impl/IpowerApplyActServiceImpl.java | 113 +++++++++++++++++ .../service/impl/IpowerApplyServiceImpl.java | 113 +++++++++++++++++ .../java/com/adc/da/report/vo/BasePageVO.java | 108 ++++++++++++++++ .../da/report/vo/DeleteParamRequestVO.java | 21 ++++ .../adc/da/report/vo/PowerApplyActPageVO.java | 61 +++++++++ .../adc/da/report/vo/PowerApplyPageVO.java | 50 ++++++++ .../mapper/mysql/PowerApplyActMapper.xml | 85 +++++++++++++ .../mybatis/mapper/mysql/PowerApplyMapper.xml | 77 ++++++++++++ .../mapper/mysql/ReportManageMapper.xml | 9 ++ 23 files changed, 1172 insertions(+), 9 deletions(-) create mode 100644 adc-da-report/src/main/java/com/adc/da/report/controller/PowerApplyController.java create mode 100644 adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java create mode 100644 adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyDao.java create mode 100644 adc-da-report/src/main/java/com/adc/da/report/eo/PowerApply.java create mode 100644 adc-da-report/src/main/java/com/adc/da/report/eo/PowerApplyAct.java create mode 100644 adc-da-report/src/main/java/com/adc/da/report/service/IPowerApplyActService.java create mode 100644 adc-da-report/src/main/java/com/adc/da/report/service/IPowerApplyService.java create mode 100644 adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java create mode 100644 adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyServiceImpl.java create mode 100644 adc-da-report/src/main/java/com/adc/da/report/vo/BasePageVO.java create mode 100644 adc-da-report/src/main/java/com/adc/da/report/vo/DeleteParamRequestVO.java create mode 100644 adc-da-report/src/main/java/com/adc/da/report/vo/PowerApplyActPageVO.java create mode 100644 adc-da-report/src/main/java/com/adc/da/report/vo/PowerApplyPageVO.java create mode 100644 adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml create mode 100644 adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyMapper.xml diff --git a/adc-da-main/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js b/adc-da-main/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js index 07fde71..37f92d4 100644 --- a/adc-da-main/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js +++ b/adc-da-main/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js @@ -439,7 +439,8 @@ var SaveModelCtrl = [ '$rootScope', '$scope', '$http', '$route', '$location', if (successCallback) { successCallback(); } - window.open('http://localhost:7060/userCenter/processMapping?id=AEHJB8YNJ3','_parent' ) + // window.open('http://localhost:7060/userCenter/processMapping?id=AEHJB8YNJ3','_parent' ) + window.close() }) .error(function (data, status, headers, config) { $scope.error = {}; diff --git a/adc-da-main/src/main/resources/static/editor-app/toolbar-controller.js b/adc-da-main/src/main/resources/static/editor-app/toolbar-controller.js index 2a203b9..da9e847 100644 --- a/adc-da-main/src/main/resources/static/editor-app/toolbar-controller.js +++ b/adc-da-main/src/main/resources/static/editor-app/toolbar-controller.js @@ -61,7 +61,8 @@ angular.module('activitiModeler') // executeFunctionByName(buttonClicked.action, window, services); console.log(window.location.href); console.log(window.location.host); - window.open('http://localhost:7060/userCenter/processMapping?id=AEHJB8YNJ3','_parent' ) + // window.open('http://localhost:7060/userCenter/processMapping?id=AEHJB8YNJ3','_parent' ) + window.close() }; /* Key bindings */ diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/PowerApplyController.java b/adc-da-report/src/main/java/com/adc/da/report/controller/PowerApplyController.java new file mode 100644 index 0000000..dc8edcd --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/PowerApplyController.java @@ -0,0 +1,118 @@ +package com.adc.da.report.controller; + + +import com.adc.da.report.eo.PowerApply; +import com.adc.da.report.service.IPowerApplyService; +import com.adc.da.report.vo.DeleteParamRequestVO; +import com.adc.da.report.vo.PowerApplyPageVO; +import com.adc.da.util.http.ResponseMessage; +import com.adc.da.util.http.Result; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author bu + * @version 1.0 + * @description 权限申请 工作流表 前端控制器 + * @date 2023-04-23 + */ +@Slf4j +@RestController +@RequestMapping("/${restPath}/report/powerApply") +@Api(tags = "report|权限申请 工作流表") +public class PowerApplyController { + + @Autowired + private IPowerApplyService powerApplyService; + + /** + * @param powerApplyPageVO + * @return com.adc.da.util.http.ResponseMessage + * @author bu + * @date 2023-04-23 + * @description 分页查询 + */ + @PostMapping(value = "/page") + @ApiOperation(value = "分页查询") + @ApiImplicitParam(name = "powerApplyPageVO", value = "查询条件VO", dataType = "PowerApplyPageVO") + public ResponseMessage> page(@RequestBody PowerApplyPageVO powerApplyPageVO){ + + //分页查询 + Page powerApplyIPage = powerApplyService.selectPage(powerApplyPageVO); + return Result.success(powerApplyIPage); + } + + /** + * @param powerApplyPageVO + * @return com.adc.da.util.http.ResponseMessage + * @author bu + * @date 2023-04-23 + * @description 列表查询 + */ + @PostMapping("/list") + @ApiOperation(value = "列表查询") + @ApiImplicitParam(name = "powerApplyPageVO", value = "查询条件VO", dataType = "PowerApplyPageVO") + public ResponseMessage> list(@RequestBody PowerApplyPageVO powerApplyPageVO) { + + //列表查询 + List powerApplyList = powerApplyService.selectList(powerApplyPageVO); + return Result.success(powerApplyList); + } + + /** + * @param id + * @return com.adc.da.util.http.ResponseMessage + * @author bu + * @date 2023-04-23 + * @description 根据id查询 + */ + @GetMapping("/info/{id}") + @ApiOperation(value = "根据id查询") + @ApiImplicitParam(name = "id", value = "主键ID", dataType = "String") + public ResponseMessage info(@PathVariable("id") String id){ + + //根据id查询 + PowerApply powerApply = powerApplyService.selectById(id); + return Result.success(powerApply); + } + + /** + * @param powerApply + * @return com.adc.da.util.http.ResponseMessage + * @author bu + * @date 2023-04-23 + * @description 单条数据新增/更改 + */ + @PostMapping("/saveOrUpdate") + @ApiOperation(value = "单条数据新增/更改") + @ApiImplicitParam(name = "powerApply", value = " PowerApply实体", dataType = "PowerApply") + public ResponseMessage saveOrUpdate(@RequestBody PowerApply powerApply){ + + //单条数据新增/更改 + powerApplyService.saveOrUpdateSingle(powerApply); + return Result.success(powerApply.getId()); + } + + /** + * @param deleteParamRequestVO + * @return com.adc.da.util.http.ResponseMessage + * @author bu + * @date 2023-04-23 + * @description 根据id或id数组进行删除 + */ + @DeleteMapping("/delete") + @ApiOperation(value = "单条/批量删除数据") + public ResponseMessage delete(@RequestBody DeleteParamRequestVO deleteParamRequestVO){ + + //单条/批量删除数据 + powerApplyService.deleteById(deleteParamRequestVO); + return Result.success(); + } +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportLogController.java b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportLogController.java index 538c908..d2afacb 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportLogController.java +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportLogController.java @@ -7,11 +7,11 @@ import com.adc.da.util.http.Result; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import javax.annotation.Resource; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import java.text.ParseException; /** diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java index 73a3be2..a22c1fb 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java @@ -11,24 +11,23 @@ import com.adc.da.report.vo.ReportQueryVo; import com.adc.da.report.vo.ReportVo; import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; -import com.aliyun.oss.OSS; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; -import javax.annotation.Resource; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.URLEncoder; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -311,4 +310,16 @@ public class ReportManageConroller { } + /** + * 权限审批流程 添加报告按钮 可添加的报告 + * @return + * @throws ParseException + */ + @ApiOperation("添加报告") + @GetMapping("/addReportPage") + public ResponseMessage addReportPage(@RequestBody ReportQueryVo vo) throws Exception { + IPage reportVoIPage = reportService.addReportPage(vo); + return Result.success(reportVoIPage); + } + } diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java new file mode 100644 index 0000000..8f2704e --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java @@ -0,0 +1,45 @@ +package com.adc.da.report.dao.mysql; + +import com.adc.da.report.eo.PowerApplyAct; +import com.adc.da.report.vo.PowerApplyActPageVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author bu + * @version 1.0 + * @description 权限申请 工作流表 Mapper接口 + * @date 2023-04-23 + */ +public interface PowerApplyActDao extends BaseMapper { + + /** + * @param powerApplyActPageVO + * @param page + * @author bu + * @date 2023-04-23 + * @description 使用分页插件进行查询 + */ + List selectPage(Page page, @Param("pageVO") PowerApplyActPageVO powerApplyActPageVO); + + /** + * @param powerApplyActPageVO + * @param page + * @author bu + * @date 2023-04-23 + * @description 使用分页插件进行查询总数 + */ + Long selectPageCount(@Param("pageVO") PowerApplyActPageVO powerApplyActPageVO); + + /** + * @param powerApplyActPageVO + * @return java.util.List + * @author bu + * @date 2023-04-23 + * @description 列表查询 + */ + List queryList(@Param("pageVO") PowerApplyActPageVO powerApplyActPageVO); +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyDao.java new file mode 100644 index 0000000..f55ef5a --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyDao.java @@ -0,0 +1,44 @@ +package com.adc.da.report.dao.mysql; + +import com.adc.da.report.eo.PowerApply; +import com.adc.da.report.vo.PowerApplyPageVO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author bu + * @version 1.0 + * @description 权限申请 工作流表 Mapper接口 + * @date 2023-04-23 + */ +public interface PowerApplyDao extends BaseMapper { + + /** + * @param powerApplyPageVO + * @param page + * @author bu + * @date 2023-04-23 + * @description 使用分页插件进行查询 + */ + List selectPage(Page page, @Param("pageVO") PowerApplyPageVO powerApplyPageVO); + + /** + * @param powerApplyPageVO + * @author bu + * @date 2023-04-23 + * @description 使用分页插件进行查询总数 + */ + Long selectPageCount(@Param("pageVO") PowerApplyPageVO powerApplyPageVO); + + /** + * @param powerApplyPageVO + * @return java.util.List + * @author bu + * @date 2023-04-23 + * @description 列表查询 + */ + List queryList(@Param("pageVO") PowerApplyPageVO powerApplyPageVO); +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java index 210fa97..7efae2a 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java @@ -30,4 +30,5 @@ public interface ReportDao extends BaseMapper { */ List getReportDateList(@Param("usid")String usid); + IPage getAddReportPage(IPage page, @Param("pageVO") ReportQueryVo vo); } diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/PowerApply.java b/adc-da-report/src/main/java/com/adc/da/report/eo/PowerApply.java new file mode 100644 index 0000000..16a8113 --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/eo/PowerApply.java @@ -0,0 +1,84 @@ +package com.adc.da.report.eo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * @author bu + * @version 1.0 + * @description 权限申请 工作流表 + * @date 2023-04-23 + */ +@Data +@TableName("power_apply") +public class PowerApply { + + /** + * id + */ + @TableId(value = "id",type = IdType.UUID) + private String id; + + + /** + * 数据id + */ + @TableField("data_id") + private String dataId; + + /** + * 报告Id + */ + @TableField("report_id") + private String reportId; + + /** + * 申请原因 + */ + @TableField("apply_reason") + private String applyReason; + + /** + * 申请人 + */ + @TableField("user_id") + private String userId; + + /** + * 申请原因 + */ + @TableField("power") + private Integer power; + /** + * 创建人id + */ + @TableField("create_user_id") + private String createUserId; + + /** + * 创建时间 + */ + @TableField("create_date") + private String createDate; + + /** + * 修改时间 + */ + @TableField("update_date") + private String updateDate; + + + /** + * 创建人id + */ + @TableField("update_user_id") + private String updateUserId; + /** + * 删除标志 + */ + @TableField("del_flag") + private Integer delFlag; +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/PowerApplyAct.java b/adc-da-report/src/main/java/com/adc/da/report/eo/PowerApplyAct.java new file mode 100644 index 0000000..add2979 --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/eo/PowerApplyAct.java @@ -0,0 +1,85 @@ +package com.adc.da.report.eo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * @author bu + * @version 1.0 + * @description 权限申请 工作流表 + * @date 2023-04-23 + */ +@Data +@TableName("power_apply_act") +public class PowerApplyAct { + + /** + * id + */ + @TableId(value = "id",type = IdType.UUID) + private String id; + + + /** + * 流程id + */ + @TableField("prc_id") + private String prcId; + + /** + * 任务id + */ + @TableField("task_id") + private String taskId; + + /** + * 数据id + */ + @TableField("data_id") + private String dataId; + + /** + * 报告名称 + */ + @TableField("report_id") + private String reportId; + + /** + * 申请人 + */ + @TableField("user_id") + private String userId; + + /** + * 创建人id + */ + @TableField("create_user_id") + private String createUserId; + + /** + * 创建时间 + */ + @TableField("create_date") + private String createDate; + + /** + * 修改时间 + */ + @TableField("update_date") + private String updateDate; + + + /** + * 更改人id + */ + @TableField("update_user_id") + private String updateUserId; + /** + * 删除标志 + */ + @TableField("del_flag") + private Integer delFlag; +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/IPowerApplyActService.java b/adc-da-report/src/main/java/com/adc/da/report/service/IPowerApplyActService.java new file mode 100644 index 0000000..5636464 --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/service/IPowerApplyActService.java @@ -0,0 +1,58 @@ +package com.adc.da.report.service; + +import com.adc.da.report.eo.PowerApplyAct; +import com.adc.da.report.vo.DeleteParamRequestVO; +import com.adc.da.report.vo.PowerApplyActPageVO; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import java.util.List; + +public interface IPowerApplyActService { + + /** + * @param powerApplyActPageVO + * @return + * @author bu + * @date 2023-04-23 + * @description 分页查询 + */ + public Page selectPage(PowerApplyActPageVO powerApplyActPageVO); + + + /** + * @param powerApplyActPageVO + * @return java.util.List + * @author bu + * @date 2023-04-23 + * @description 列表查询 + */ + public List selectList(PowerApplyActPageVO powerApplyActPageVO); + + /** + * @param id + * @return com.adc.da.report.entity.PowerApplyAct + * @author bu + * @date 2023-04-23 + * @description 根据id查询 + */ + public PowerApplyAct selectById(String id); + + /** + * @param powerApplyAct + * @return boolean + * @author bu + * @date 2023-04-23 + * @description 单条数据新增/更改 + */ + public void saveOrUpdateSingle(PowerApplyAct powerApplyAct); + + + /** + * @param deleteParamVO + * @return void + * @author bu + * @date 2023-04-23 + * @description 根据id或id数组进行删除 + */ + public void deleteById(DeleteParamRequestVO deleteParamVO); +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/IPowerApplyService.java b/adc-da-report/src/main/java/com/adc/da/report/service/IPowerApplyService.java new file mode 100644 index 0000000..1f146f8 --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/service/IPowerApplyService.java @@ -0,0 +1,58 @@ +package com.adc.da.report.service; + +import com.adc.da.report.eo.PowerApply; +import com.adc.da.report.vo.DeleteParamRequestVO; +import com.adc.da.report.vo.PowerApplyPageVO; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import java.util.List; + +public interface IPowerApplyService { + + /** + * @param powerApplyPageVO + * @return + * @author bu + * @date 2023-04-23 + * @description 分页查询 + */ + public Page selectPage(PowerApplyPageVO powerApplyPageVO); + + + /** + * @param powerApplyPageVO + * @return java.util.List + * @author bu + * @date 2023-04-23 + * @description 列表查询 + */ + public List selectList(PowerApplyPageVO powerApplyPageVO); + + /** + * @param id + * @return com.adc.da.report.entity.PowerApply + * @author bu + * @date 2023-04-23 + * @description 根据id查询 + */ + public PowerApply selectById(String id); + + /** + * @param powerApply + * @return boolean + * @author bu + * @date 2023-04-23 + * @description 单条数据新增/更改 + */ + public void saveOrUpdateSingle(PowerApply powerApply); + + + /** + * @param deleteParamVO + * @return void + * @author bu + * @date 2023-04-23 + * @description 根据id或id数组进行删除 + */ + public void deleteById(DeleteParamRequestVO deleteParamVO); +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java b/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java index e4b615d..2f0c296 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java @@ -45,4 +45,6 @@ public interface IReportService { * @return */ String reportHtml(String id); + + IPage addReportPage(ReportQueryVo vo) throws Exception; } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index a0de580..5ff4337 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -18,17 +18,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import javax.annotation.Resource; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.OutputStream; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -270,6 +268,26 @@ public class IReportServiceImpl implements IReportService { } + @Override + public IPage addReportPage(ReportQueryVo vo) throws Exception { + IPage page = new Page<>(); + page.setCurrent(vo.getPageNo()); + page.setSize(vo.getPageSize()); + + //判断是不是管理员 + boolean admin = CommonUtils.isAdmin(); + if (admin) { + vo.setUsid(null); + } else { + vo.setUsid(CommonUtils.getUserId()); + } + + + IPage list = reportDao.getAddReportPage(page, vo); + + return list; + } + /** * 创建htmlstring * diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java new file mode 100644 index 0000000..99c5250 --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java @@ -0,0 +1,113 @@ +package com.adc.da.report.service.impl; + + +import com.adc.da.report.dao.mysql.PowerApplyActDao; +import com.adc.da.report.eo.PowerApplyAct; +import com.adc.da.report.service.IPowerApplyActService; +import com.adc.da.report.vo.DeleteParamRequestVO; +import com.adc.da.report.vo.PowerApplyActPageVO; +import com.adc.da.util.utils.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author bu + * @version 1.0 + * @description 权限申请 工作流表 服务实现类 + * @date 2023-04-23 + */ +@Slf4j +@Service +public class IpowerApplyActServiceImpl extends ServiceImpl implements IPowerApplyActService { + + /** + * @param powerApplyActPageVO + * @return + * @author bu + * @date 2023-04-23 + * @description 分页查询 + */ + public Page selectPage(PowerApplyActPageVO powerApplyActPageVO){ + Page page = new Page<>(powerApplyActPageVO.getCurrent(), + powerApplyActPageVO.getSize()); + page.setRecords(baseMapper.selectPage(page, powerApplyActPageVO)); + Long total = baseMapper.selectPageCount(powerApplyActPageVO); + page.setTotal(total); + return page; + } + + /** + * @param powerApplyActPageVO + * @return java.util.List + * @author bu + * @date 2023-04-23 + * @description 列表查询 + */ + public List selectList(PowerApplyActPageVO powerApplyActPageVO) { + return baseMapper.queryList(powerApplyActPageVO); + } + + /** + * @param id + * @return com.adc.da.report.entity.PowerApplyAct + * @author bu + * @date 2023-04-23 + * @description 根据id查询 + */ + public PowerApplyAct selectById(String id) { + return baseMapper.selectById(id); + } + + /** + * @param powerApplyAct + * @return boolean + * @author bu + * @date 2023-04-23 + * @description 单条数据新增/更改 + */ + public void saveOrUpdateSingle(PowerApplyAct powerApplyAct) { + if (StringUtils.isEmpty(powerApplyAct.getId())) { + baseMapper.insert(powerApplyAct); + } else { + baseMapper.updateById(powerApplyAct); + } + } + + /** + * @param deleteParamVO + * @return void + * @author bu + * @date 2023-04-23 + * @description 根据id或id数组进行删除 + */ + public void deleteById(DeleteParamRequestVO deleteParamVO) { + if (ObjectUtils.isEmpty(deleteParamVO)) { + return; + } + List ids = new ArrayList<>(); + + if (!ObjectUtils.isEmpty(deleteParamVO.getId())) { + ids.add(deleteParamVO.getId()); + } + if (!ObjectUtils.isEmpty(deleteParamVO.getIds())) { + ids.addAll(deleteParamVO.getIds()); + } + if (ObjectUtils.isEmpty(deleteParamVO)) { + return; + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(PowerApplyAct::getId,ids); + PowerApplyAct powerApplyAct = new PowerApplyAct(); + powerApplyAct.setDelFlag(1); + baseMapper.update(powerApplyAct,wrapper); + } + + +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyServiceImpl.java new file mode 100644 index 0000000..b5b1a52 --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyServiceImpl.java @@ -0,0 +1,113 @@ +package com.adc.da.report.service.impl; + + +import com.adc.da.report.dao.mysql.PowerApplyDao; +import com.adc.da.report.eo.PowerApply; +import com.adc.da.report.service.IPowerApplyService; +import com.adc.da.report.vo.DeleteParamRequestVO; +import com.adc.da.report.vo.PowerApplyPageVO; +import com.adc.da.util.utils.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author bu + * @version 1.0 + * @description 权限申请 工作流表 服务实现类 + * @date 2023-04-23 + */ +@Slf4j +@Service +public class IpowerApplyServiceImpl extends ServiceImpl implements IPowerApplyService { + + /** + * @param powerApplyPageVO + * @return + * @author bu + * @date 2023-04-23 + * @description 分页查询 + */ + public Page selectPage(PowerApplyPageVO powerApplyPageVO){ + Page page = new Page<>(powerApplyPageVO.getCurrent(), + powerApplyPageVO.getSize()); + page.setRecords(baseMapper.selectPage(page, powerApplyPageVO)); + Long total = baseMapper.selectPageCount(powerApplyPageVO); + page.setTotal(total); + return page; + } + + /** + * @param powerApplyPageVO + * @return java.util.List + * @author bu + * @date 2023-04-23 + * @description 列表查询 + */ + public List selectList(PowerApplyPageVO powerApplyPageVO) { + return baseMapper.queryList(powerApplyPageVO); + } + + /** + * @param id + * @return com.adc.da.report.entity.PowerApply + * @author bu + * @date 2023-04-23 + * @description 根据id查询 + */ + public PowerApply selectById(String id) { + return baseMapper.selectById(id); + } + + /** + * @param powerApply + * @return boolean + * @author bu + * @date 2023-04-23 + * @description 单条数据新增/更改 + */ + public void saveOrUpdateSingle(PowerApply powerApply) { + if (StringUtils.isEmpty(powerApply.getId())) { + baseMapper.insert(powerApply); + } else { + baseMapper.updateById(powerApply); + } + } + + /** + * @param deleteParamVO + * @return void + * @author bu + * @date 2023-04-23 + * @description 根据id或id数组进行删除 + */ + public void deleteById(DeleteParamRequestVO deleteParamVO) { + if (ObjectUtils.isEmpty(deleteParamVO)) { + return; + } + List ids = new ArrayList<>(); + + if (!ObjectUtils.isEmpty(deleteParamVO.getId())) { + ids.add(deleteParamVO.getId()); + } + if (!ObjectUtils.isEmpty(deleteParamVO.getIds())) { + ids.addAll(deleteParamVO.getIds()); + } + if (ObjectUtils.isEmpty(deleteParamVO)) { + return; + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(PowerApply::getId,ids); + PowerApply powerApply = new PowerApply(); + powerApply.setDelFlag(1); + baseMapper.update(powerApply,wrapper); + } + + +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/BasePageVO.java b/adc-da-report/src/main/java/com/adc/da/report/vo/BasePageVO.java new file mode 100644 index 0000000..bf189fc --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/BasePageVO.java @@ -0,0 +1,108 @@ +package com.adc.da.report.vo; + +import com.adc.da.util.exception.AdcDaBaseException; +import io.swagger.annotations.ApiModelProperty; +import org.apache.commons.lang.StringUtils; +import org.springframework.util.ObjectUtils; + +public class BasePageVO { + private final static String xssStr = "'|and |exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |;|or |+"; + /** + * 页码 + */ + @ApiModelProperty("页码") + private Integer current; + /** + * 每页大小 + */ + @ApiModelProperty("每页大小") + private Integer size; + + /** + * 排序 + */ + @ApiModelProperty("排序") + private String order; + + /** + * 排序字段 + */ + @ApiModelProperty("排序字段") + private String orderField; + + + public Integer getCurrent() { + if (!ObjectUtils.isEmpty(current) && current > 0) { + return current; + } + return 1; + } + + public Integer getSize() { + if (!ObjectUtils.isEmpty(size) && size > 0) { + return size; + } + return 15; + } + + public String getOrder() { + if (StringUtils.isEmpty(this.order)) { + return "desc"; + } + if ("desc".equals(this.order) || "asc".equals(this.order) ) { + return order; + } + return "desc"; + } + + public String getOrderField() { + if (StringUtils.isNotEmpty(orderField)) { + filterContent(this.orderField); + return camelToUnderline(this.orderField); + } + return null; + } + + + /** + * sql注入过滤处理，遇到注入关键字抛异常 + * + * @param value + * @return + */ + public static void filterContent(String value) { + if (value == null || "".equals(value)) { + return; + } + // 统一转为小写 + value = value.toLowerCase(); + String[] xssArr = xssStr.split("\\|"); + for (int i = 0; i < xssArr.length; i++) { + if (value.indexOf(xssArr[i]) > -1) { + throw new AdcDaBaseException("请注意，值可能存在SQL注入风险!--->" + value); + } + } + return; + } + + /** + * 将驼峰命名转化成下划线 + * @param para + * @return + */ + public static String camelToUnderline(String para){ + if(para.length()<3){ + return para.toLowerCase(); + } + StringBuilder sb=new StringBuilder(para); + int temp=0;//定位 + //从第三个字符开始 避免命名不规范 + for(int i=2;i ids; +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/PowerApplyActPageVO.java b/adc-da-report/src/main/java/com/adc/da/report/vo/PowerApplyActPageVO.java new file mode 100644 index 0000000..fde698b --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/PowerApplyActPageVO.java @@ -0,0 +1,61 @@ +package com.adc.da.report.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author bu + * @version 1.0 + * @description 权限申请 工作流表查询条件VO + * @date 2023-04-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PowerApplyActPageVO extends BasePageVO { + + + /** + * 流程id + */ + private String prcId; + + /** + * 任务id + */ + private String taskId; + + /** + * 数据id + */ + private String dataId; + + /** + * 报告名称 + */ + private String reportName; + + /** + * 车系 + */ + private String carType; + + /** + * 报告年份 + */ + private String reportYears; + + /** + * 报告部门 + */ + private String reportOrg; + + /** + * 涉密等级 + */ + private String classifiedLevel; + + /** + * 报告类别 + */ + private String reportType; +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/PowerApplyPageVO.java b/adc-da-report/src/main/java/com/adc/da/report/vo/PowerApplyPageVO.java new file mode 100644 index 0000000..0a4f4f6 --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/PowerApplyPageVO.java @@ -0,0 +1,50 @@ +package com.adc.da.report.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author bu + * @version 1.0 + * @description 权限申请 工作流表查询条件VO + * @date 2023-04-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PowerApplyPageVO extends BasePageVO { + + /** + * 数据id + */ + private String dataId; + + /** + * 报告名称 + */ + private String reportName; + + /** + * 车系 + */ + private String carType; + + /** + * 报告年份 + */ + private String reportYears; + + /** + * 报告部门 + */ + private String reportOrg; + + /** + * 涉密等级 + */ + private String classifiedLevel; + + /** + * 报告类别 + */ + private String reportType; +} diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml new file mode 100644 index 0000000..e8a838b --- /dev/null +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + power_apply_act + + + + + id, + prc_id, task_id, data_id,user_id,report_id,create_user_id,create_date,update_date,update_user_id,del_flag + + + + + + AND del = '${@com.adc.da.sys.constant.YesOrNoEnum@NO.value}' + + + AND prc_id LIKE CONCAT(CONCAT('%',#{pageVO.prcId}),'%') + + + AND task_id LIKE CONCAT(CONCAT('%',#{pageVO.taskId}),'%') + + + AND data_id LIKE CONCAT(CONCAT('%',#{pageVO.dataId}),'%') + + + AND report_id LIKE CONCAT(CONCAT('%',#{pageVO.reportId}),'%') + + + AND user_id LIKE CONCAT(CONCAT('%',#{pageVO.userId}),'%') + + + + + + + + + + + + + + + diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyMapper.xml new file mode 100644 index 0000000..2c1dc9e --- /dev/null +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + power_apply_act + + + + + id, + data_id,report_id,user_id,create_user_id,create_date,update_date,update_user_id,del_flag + + + + + + AND del = '${@com.adc.da.sys.constant.YesOrNoEnum@NO.value}' + + + AND data_id LIKE CONCAT(CONCAT('%',#{pageVO.dataId}),'%') + + + AND report_id LIKE CONCAT(CONCAT('%',#{pageVO.reportId}),'%') + + + AND user_id LIKE CONCAT(CONCAT('%',#{pageVO.userId}),'%') + + + + + + + + + + + + + + + diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml index 344a55c..4d24a20 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml @@ -124,4 +124,13 @@ ORDER BY year DESC + + +