From e522f5fb80bfcb91273e15a6ffa2a3dccdca0bdd Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Wed, 28 Apr 2021 16:24:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E4=BB=B6=E5=A4=B9?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IndexAuditLogController.java | 144 ++++++++ .../api/indexlib/IndexLibController.java | 4 +- .../IndexAuditLogAppController.java | 121 +++++++ .../api/indexlib/IndexLibAppController.java | 169 +++++++++ .../controller/route/indexWebController.java | 5 +- .../dao/indexauditlog/IIndexAuditLogDao.java | 127 +++++++ .../bos/indexauditlog/IndexAuditLogBO.java | 113 ++++++ .../bos/indextemplate/IndexTemplateBO.java | 9 + .../dtos/indexauditlog/IndexAuditLogDTO.java | 77 ++++ .../pojo/dtos/indexlib/IndexLibDTO.java | 11 +- .../dtos/indextemplate/IndexTemplateDTO.java | 10 + .../pos/indexauditlog/IndexAuditLogPO.java | 113 ++++++ .../pos/indextemplate/IndexTemplatePO.java | 9 + .../vos/indexauditlog/IndexAuditLogVO.java | 69 ++++ .../vos/indextemplate/IndexTemplateVO.java | 12 + .../indexauditlog/IIndexAuditLogService.java | 188 ++++++++++ .../impl/IndexAuditLogServiceImpl.java | 213 +++++++++++ .../impl/IndexGeneralServiceImpl.java | 14 +- .../service/indexlib/IIndexLibService.java | 7 + .../indexlib/impl/IndexLibServiceImpl.java | 69 ++-- .../basicCheckPersonInfo-mapper.xml | 0 .../basicCheckPersonAction-mapper.xml | 0 .../indexauditlog/index-audit-log-mapper.xml | 333 ++++++++++++++++++ .../indexGeneral-mapper.xml | 0 .../indexLib-mapper.xml | 1 - .../indexTemplate-mapper.xml | 12 + .../partyPunishInfo-mapper.xml | 0 .../problemClue-mapper.xml | 0 .../superviseCheck-mapper.xml | 0 .../list.html | 2 +- .../save.html | 0 .../show.html | 0 .../update.html | 0 .../list.html | 2 +- .../save.html | 0 .../show.html | 0 .../update.html | 0 .../route/indexauditlog/list-audit.html | 243 +++++++++++++ .../static/route/indexauditlog/list.html | 267 ++++++++++++++ .../static/route/indexauditlog/save.html | 131 +++++++ .../static/route/indexauditlog/update.html | 195 ++++++++++ .../{indexGeneral => indexgeneral}/list.html | 2 +- .../{indexGeneral => indexgeneral}/save.html | 0 .../{indexGeneral => indexgeneral}/show.html | 0 .../update.html | 0 .../route/{indexLib => indexlib}/list.html | 0 .../route/{indexLib => indexlib}/save.html | 0 .../route/{indexLib => indexlib}/tree.html | 2 +- .../route/{indexLib => indexlib}/update.html | 0 .../list.html | 8 + .../save.html | 6 + .../update.html | 6 + .../list.html | 2 +- .../save.html | 0 .../show.html | 0 .../update.html | 0 .../{problemClue => problemclue}/list.html | 2 +- .../{problemClue => problemclue}/save.html | 0 .../{problemClue => problemclue}/show.html | 0 .../{problemClue => problemclue}/update.html | 0 .../list.html | 2 +- .../save.html | 0 .../show.html | 0 .../update.html | 0 src/main/resources/templates/index.html | 2 +- 65 files changed, 2665 insertions(+), 37 deletions(-) create mode 100644 src/main/java/com/tenlion/twoduty/controller/api/indexauditlog/IndexAuditLogController.java create mode 100644 src/main/java/com/tenlion/twoduty/controller/app/api/indexauditlog/IndexAuditLogAppController.java create mode 100644 src/main/java/com/tenlion/twoduty/dao/indexauditlog/IIndexAuditLogDao.java create mode 100644 src/main/java/com/tenlion/twoduty/pojo/bos/indexauditlog/IndexAuditLogBO.java create mode 100644 src/main/java/com/tenlion/twoduty/pojo/dtos/indexauditlog/IndexAuditLogDTO.java create mode 100644 src/main/java/com/tenlion/twoduty/pojo/pos/indexauditlog/IndexAuditLogPO.java create mode 100644 src/main/java/com/tenlion/twoduty/pojo/vos/indexauditlog/IndexAuditLogVO.java create mode 100644 src/main/java/com/tenlion/twoduty/service/indexauditlog/IIndexAuditLogService.java create mode 100644 src/main/java/com/tenlion/twoduty/service/indexauditlog/impl/IndexAuditLogServiceImpl.java rename src/main/resources/mybatis/mapper/{basicCheckPersonInfo => basiccheckpersonInfo}/basicCheckPersonInfo-mapper.xml (100%) rename src/main/resources/mybatis/mapper/{basicCheckPersonAction => basiccheckpersonaction}/basicCheckPersonAction-mapper.xml (100%) create mode 100644 src/main/resources/mybatis/mapper/indexauditlog/index-audit-log-mapper.xml rename src/main/resources/mybatis/mapper/{indexGeneral => indexgeneral}/indexGeneral-mapper.xml (100%) rename src/main/resources/mybatis/mapper/{indexLib => indexlib}/indexLib-mapper.xml (99%) rename src/main/resources/mybatis/mapper/{indexTemplate => indextemplate}/indexTemplate-mapper.xml (94%) rename src/main/resources/mybatis/mapper/{partyPunishInfo => partypunishInfo}/partyPunishInfo-mapper.xml (100%) rename src/main/resources/mybatis/mapper/{problemClue => problemclue}/problemClue-mapper.xml (100%) rename src/main/resources/mybatis/mapper/{superviseCheck => supervisecheck}/superviseCheck-mapper.xml (100%) rename src/main/resources/static/route/{basicCheckPersonAction => basiccheckpersonaction}/list.html (99%) rename src/main/resources/static/route/{basicCheckPersonAction => basiccheckpersonaction}/save.html (100%) rename src/main/resources/static/route/{basicCheckPersonAction => basiccheckpersonaction}/show.html (100%) rename src/main/resources/static/route/{basicCheckPersonAction => basiccheckpersonaction}/update.html (100%) rename src/main/resources/static/route/{basicCheckPersonInfo => basiccheckpersoninfo}/list.html (99%) rename src/main/resources/static/route/{basicCheckPersonInfo => basiccheckpersoninfo}/save.html (100%) rename src/main/resources/static/route/{basicCheckPersonInfo => basiccheckpersoninfo}/show.html (100%) rename src/main/resources/static/route/{basicCheckPersonInfo => basiccheckpersoninfo}/update.html (100%) create mode 100644 src/main/resources/static/route/indexauditlog/list-audit.html create mode 100644 src/main/resources/static/route/indexauditlog/list.html create mode 100644 src/main/resources/static/route/indexauditlog/save.html create mode 100644 src/main/resources/static/route/indexauditlog/update.html rename src/main/resources/static/route/{indexGeneral => indexgeneral}/list.html (99%) rename src/main/resources/static/route/{indexGeneral => indexgeneral}/save.html (100%) rename src/main/resources/static/route/{indexGeneral => indexgeneral}/show.html (100%) rename src/main/resources/static/route/{indexGeneral => indexgeneral}/update.html (100%) rename src/main/resources/static/route/{indexLib => indexlib}/list.html (100%) rename src/main/resources/static/route/{indexLib => indexlib}/save.html (100%) rename src/main/resources/static/route/{indexLib => indexlib}/tree.html (98%) rename src/main/resources/static/route/{indexLib => indexlib}/update.html (100%) rename src/main/resources/static/route/{indexTemplate => indextemplate}/list.html (96%) rename src/main/resources/static/route/{indexTemplate => indextemplate}/save.html (95%) rename src/main/resources/static/route/{indexTemplate => indextemplate}/update.html (95%) rename src/main/resources/static/route/{partyPunishInfo => partypunishinfo}/list.html (99%) rename src/main/resources/static/route/{partyPunishInfo => partypunishinfo}/save.html (100%) rename src/main/resources/static/route/{partyPunishInfo => partypunishinfo}/show.html (100%) rename src/main/resources/static/route/{partyPunishInfo => partypunishinfo}/update.html (100%) rename src/main/resources/static/route/{problemClue => problemclue}/list.html (99%) rename src/main/resources/static/route/{problemClue => problemclue}/save.html (100%) rename src/main/resources/static/route/{problemClue => problemclue}/show.html (100%) rename src/main/resources/static/route/{problemClue => problemclue}/update.html (100%) rename src/main/resources/static/route/{superviseCheck => supervisecheck}/list.html (99%) rename src/main/resources/static/route/{superviseCheck => supervisecheck}/save.html (100%) rename src/main/resources/static/route/{superviseCheck => supervisecheck}/show.html (100%) rename src/main/resources/static/route/{superviseCheck => supervisecheck}/update.html (100%) diff --git a/src/main/java/com/tenlion/twoduty/controller/api/indexauditlog/IndexAuditLogController.java b/src/main/java/com/tenlion/twoduty/controller/api/indexauditlog/IndexAuditLogController.java new file mode 100644 index 0000000..392273b --- /dev/null +++ b/src/main/java/com/tenlion/twoduty/controller/api/indexauditlog/IndexAuditLogController.java @@ -0,0 +1,144 @@ +package com.tenlion.twoduty.controller.api.indexauditlog; + +import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO; +import com.tenlion.twoduty.service.indexlib.IIndexLibService; +import ink.wgink.annotation.CheckRequestBodyAnnotation; +import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.common.component.SecurityComponent; +import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResult; +import ink.wgink.pojo.result.SuccessResultData; +import ink.wgink.pojo.result.SuccessResultList; +import com.tenlion.twoduty.pojo.dtos.indexauditlog.IndexAuditLogDTO; +import com.tenlion.twoduty.pojo.vos.indexauditlog.IndexAuditLogVO; +import com.tenlion.twoduty.service.indexauditlog.IIndexAuditLogService; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * @ClassName: IndexAuditLogController + * @Description: 指标审核日志表 + * @Author: CodeFactory + * @Date: 2021-04-23 11:05:28 + * @Version: 3.0 + **/ +@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "指标审核日志表接口") +@RestController +@RequestMapping(ISystemConstant.API_PREFIX + "/indexauditlog") +public class IndexAuditLogController extends DefaultBaseController { + + @Autowired + private IIndexAuditLogService indexAuditLogService; + @Autowired + private SecurityComponent securityComponent; + @Autowired + private IIndexLibService iIndexLibService; + + + @ApiOperation(value = "指标审核分页列表", notes = "指标审核分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listauditpage/{indexLibId}") + public SuccessResultList> listAuditPage(ListPage page,@PathVariable("indexLibId") String indexLibId) { + Map params = requestParams(); + params.put("indexAuditUserId",securityComponent.getCurrentUser().getUserId()); + List list = new ArrayList<>(); + for (IndexLibDTO indexLibDTO : iIndexLibService.getWebIndexLibId(indexLibId)) { + list.add(indexLibDTO.getIndexLibId()); + } + params.put("indexLibIds",list); + page.setParams(params); + return indexAuditLogService.listPage(page); + } + + + + @ApiOperation(value = "新增指标审核日志表", notes = "新增指标审核日志表接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("save") + @CheckRequestBodyAnnotation + public SuccessResult save(@RequestBody IndexAuditLogVO indexAuditLogVO) { + indexAuditLogService.save(indexAuditLogVO); + return new SuccessResult(); + } + + @ApiOperation(value = "删除指标审核日志表", notes = "删除指标审核日志表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @DeleteMapping("remove/{ids}") + public SuccessResult remove(@PathVariable("ids") String ids) { + indexAuditLogService.remove(Arrays.asList(ids.split("\\_"))); + return new SuccessResult(); + } + + @ApiOperation(value = "修改指标审核日志表", notes = "修改指标审核日志表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "indexAuditLogId", value = "指标审核日志表ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update/{indexAuditLogId}") + @CheckRequestBodyAnnotation + public SuccessResult update(@PathVariable("indexAuditLogId") String indexAuditLogId, @RequestBody IndexAuditLogVO indexAuditLogVO) { + indexAuditLogService.update(indexAuditLogId, indexAuditLogVO); + return new SuccessResult(); + } + + @ApiOperation(value = "指标审核日志表详情", notes = "指标审核日志表详情接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "indexAuditLogId", value = "指标审核日志表ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get/{indexAuditLogId}") + public IndexAuditLogDTO get(@PathVariable("indexAuditLogId") String indexAuditLogId) { + return indexAuditLogService.get(indexAuditLogId); + } + + @ApiOperation(value = "指标审核日志表列表", notes = "指标审核日志表列表接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list") + public List list() { + Map params = requestParams(); + return indexAuditLogService.list(params); + } + + @ApiOperation(value = "指标审核日志表分页列表", notes = "指标审核日志表分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpage") + public SuccessResultList> listPage(ListPage page) { + Map params = requestParams(); + page.setParams(params); + return indexAuditLogService.listPage(page); + } + + @ApiOperation(value = "指标审核日志表统计", notes = "指标审核日志表统计接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("count") + SuccessResultData count() { + Map params = requestParams(); + return new SuccessResultData<>(indexAuditLogService.count(params)); + } + +} \ No newline at end of file diff --git a/src/main/java/com/tenlion/twoduty/controller/api/indexlib/IndexLibController.java b/src/main/java/com/tenlion/twoduty/controller/api/indexlib/IndexLibController.java index de0c989..c95f2f3 100644 --- a/src/main/java/com/tenlion/twoduty/controller/api/indexlib/IndexLibController.java +++ b/src/main/java/com/tenlion/twoduty/controller/api/indexlib/IndexLibController.java @@ -41,6 +41,7 @@ public class IndexLibController extends DefaultBaseController { private IIndexLibService indexLibService; + @ApiOperation(value = "指标统计", notes = "指标统计接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("countIndexLib/{indexLibParentId}") @@ -49,9 +50,6 @@ public class IndexLibController extends DefaultBaseController { } - - - @ApiOperation(value = "web页面导航列表", notes = "web页面导航列表接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("listwebtags") diff --git a/src/main/java/com/tenlion/twoduty/controller/app/api/indexauditlog/IndexAuditLogAppController.java b/src/main/java/com/tenlion/twoduty/controller/app/api/indexauditlog/IndexAuditLogAppController.java new file mode 100644 index 0000000..7b1535c --- /dev/null +++ b/src/main/java/com/tenlion/twoduty/controller/app/api/indexauditlog/IndexAuditLogAppController.java @@ -0,0 +1,121 @@ +package com.tenlion.twoduty.controller.app.api.indexauditlog; + +import ink.wgink.annotation.CheckRequestBodyAnnotation; +import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResult; +import ink.wgink.pojo.result.SuccessResultData; +import ink.wgink.pojo.result.SuccessResultList; +import com.tenlion.twoduty.pojo.dtos.indexauditlog.IndexAuditLogDTO; +import com.tenlion.twoduty.pojo.vos.indexauditlog.IndexAuditLogVO; +import com.tenlion.twoduty.service.indexauditlog.IIndexAuditLogService; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * @ClassName: IndexAuditLogAppController + * @Description: 指标审核日志表 + * @Author: CodeFactory + * @Date: 2021-04-23 11:05:28 + * @Version: 3.0 + **/ +@Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "指标审核日志表接口") +@RestController +@RequestMapping(ISystemConstant.APP_PREFIX + "/indexauditlog") +public class IndexAuditLogAppController extends DefaultBaseController { + + @Autowired + private IIndexAuditLogService indexAuditLogService; + + @ApiOperation(value = "新增指标审核日志表", notes = "新增指标审核日志表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("save") + @CheckRequestBodyAnnotation + public SuccessResult save(@RequestHeader("token") String token, @RequestBody IndexAuditLogVO indexAuditLogVO) { + indexAuditLogService.save(token, indexAuditLogVO); + return new SuccessResult(); + } + + @ApiOperation(value = "删除指标审核日志表(id列表)", notes = "删除指标审核日志表(id列表)接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @DeleteMapping("remove/{ids}") + public SuccessResult remove(@RequestHeader("token") String token, @PathVariable("ids") String ids) { + indexAuditLogService.remove(token, Arrays.asList(ids.split("\\_"))); + return new SuccessResult(); + } + + @ApiOperation(value = "修改指标审核日志表", notes = "修改指标审核日志表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "indexAuditLogId", value = "指标审核日志表ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("updateindexauditlog/{indexAuditLogId}") + @CheckRequestBodyAnnotation + public SuccessResult updateIndexAuditLog(@RequestHeader("token") String token, @PathVariable("indexAuditLogId") String indexAuditLogId, @RequestBody IndexAuditLogVO indexAuditLogVO) { + indexAuditLogService.update(token, indexAuditLogId, indexAuditLogVO); + return new SuccessResult(); + } + + @ApiOperation(value = "指标审核日志表详情(通过ID)", notes = "指标审核日志表详情(通过ID)接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "indexAuditLogId", value = "指标审核日志表ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get/{indexAuditLogId}") + public IndexAuditLogDTO get(@RequestHeader("token") String token, @PathVariable("indexAuditLogId") String indexAuditLogId) { + return indexAuditLogService.get(indexAuditLogId); + } + + @ApiOperation(value = "指标审核日志表列表", notes = "指标审核日志表列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list") + public List list(@RequestHeader("token") String token) { + Map params = requestParams(); + return indexAuditLogService.list(params); + } + + @ApiOperation(value = "指标审核日志表分页列表", notes = "指标审核日志表分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpageindexauditlog") + public SuccessResultList> listPage(@RequestHeader("token") String token, ListPage page) { + Map params = requestParams(); + page.setParams(params); + return indexAuditLogService.listPage(page); + } + + @ApiOperation(value = "指标审核日志表统计", notes = "指标审核日志表统计接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("count") + SuccessResultData count() { + Map params = requestParams(); + return new SuccessResultData<>(indexAuditLogService.count(params)); + } + +} \ No newline at end of file diff --git a/src/main/java/com/tenlion/twoduty/controller/app/api/indexlib/IndexLibAppController.java b/src/main/java/com/tenlion/twoduty/controller/app/api/indexlib/IndexLibAppController.java index c34ecf0..ba830dd 100644 --- a/src/main/java/com/tenlion/twoduty/controller/app/api/indexlib/IndexLibAppController.java +++ b/src/main/java/com/tenlion/twoduty/controller/app/api/indexlib/IndexLibAppController.java @@ -1,5 +1,8 @@ package com.tenlion.twoduty.controller.app.api.indexlib; + +import com.alibaba.fastjson.JSONObject; + import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; @@ -14,8 +17,12 @@ import com.tenlion.twoduty.service.indexlib.IIndexLibService; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import javax.servlet.http.HttpServletRequest; import java.util.Arrays; +import java.util.Enumeration; import java.util.List; import java.util.Map; @@ -34,6 +41,168 @@ public class IndexLibAppController extends DefaultBaseController { @Autowired private IIndexLibService indexLibService; + @GetMapping("test"+ISystemConstant.APP_RELEASE_SUFFIX) + public JSONObject test(){ + JSONObject json = new JSONObject(); + HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); + Enumeration headerNames = request.getHeaderNames(); + while (headerNames.hasMoreElements()){ + String headerName = (String) headerNames.nextElement(); + json.put(headerName,request.getHeader(headerName)); + } + json.put("getMethod:" ,request.getMethod()); + json.put("getQueryString:" ,request.getQueryString() ); + json.put("getProtocol:" , request.getProtocol() ); + json.put("getContextPath" ,request.getContextPath() ); + json.put("getPathInfo:" ,request.getPathInfo() ); + json.put("getPathTranslated:" ,request.getPathTranslated()); + json.put("getServletPath:" ,request.getServletPath()); + json.put("getRemoteAddr:" , request.getRemoteAddr()); + json.put("getRemoteHost:" , request.getRemoteHost()); + json.put("getRemotePort:" , request.getRemotePort()); + json.put("getLocalAddr:" , request.getLocalAddr()); + json.put("getLocalName:" , request.getLocalName() ); + json.put("getLocalPort:" ,request.getLocalPort()); + json.put("getServerName:" , request.getServerName()); + json.put("getServerPort:" , request.getServerPort()); + json.put("getScheme:" ,request.getScheme()); + json.put("getRequestURL:" , request.getRequestURL() ); + Enumeration parameterNames = request.getParameterNames(); + while (parameterNames.hasMoreElements()){ + String parasm = (String) parameterNames.nextElement(); + json.put(parasm,request.getParameter(parasm)); + } + + return json; + } + + @GetMapping("test2"+ISystemConstant.APP_RELEASE_SUFFIX+"/{aa}") + public JSONObject test2( @PathVariable("aa") String aa){ + JSONObject json = new JSONObject(); + JSONObject header = new JSONObject(); + JSONObject requset = new JSONObject(); + JSONObject path = new JSONObject(); + path.put("aa",aa); + HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); + Enumeration headerNames = request.getHeaderNames(); + while (headerNames.hasMoreElements()){ + String headerName = (String) headerNames.nextElement(); + header.put(headerName,request.getHeader(headerName)); + } + requset.put("getMethod:" ,request.getMethod()); + requset.put("getQueryString:" ,request.getQueryString() ); + requset.put("getProtocol:" , request.getProtocol() ); + requset.put("getContextPath" ,request.getContextPath() ); + requset.put("getPathInfo:" ,request.getPathInfo() ); + requset.put("getPathTranslated:" ,request.getPathTranslated()); + requset.put("getServletPath:" ,request.getServletPath()); + requset.put("getRemoteAddr:" , request.getRemoteAddr()); + requset.put("getRemoteHost:" , request.getRemoteHost()); + requset.put("getRemotePort:" , request.getRemotePort()); + requset.put("getLocalAddr:" , request.getLocalAddr()); + requset.put("getLocalName:" , request.getLocalName() ); + requset.put("getLocalPort:" ,request.getLocalPort()); + requset.put("getServerName:" , request.getServerName()); + requset.put("getServerPort:" , request.getServerPort()); + requset.put("getScheme:" ,request.getScheme()); + requset.put("getRequestURL:" , request.getRequestURL() ); + Enumeration parameterNames = request.getParameterNames(); + while (parameterNames.hasMoreElements()){ + String parasm = (String) parameterNames.nextElement(); + json.put(parasm,request.getParameter(parasm)); + } + json.put("header",header); + json.put("requset",requset); + json.put("path",path); + return json; + } + + @PostMapping("testpost1"+ISystemConstant.APP_RELEASE_SUFFIX) + public JSONObject testPOST1(@RequestBody JSONObject form){ + JSONObject json = new JSONObject(); + JSONObject header = new JSONObject(); + JSONObject requset = new JSONObject(); + HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); + Enumeration headerNames = request.getHeaderNames(); + while (headerNames.hasMoreElements()){ + String headerName = (String) headerNames.nextElement(); + header.put(headerName,request.getHeader(headerName)); + } + + requset.put("getMethod:" ,request.getMethod()); + requset.put("getQueryString:" ,request.getQueryString() ); + requset.put("getProtocol:" , request.getProtocol() ); + requset.put("getContextPath" ,request.getContextPath() ); + requset.put("getPathInfo:" ,request.getPathInfo() ); + requset.put("getPathTranslated:" ,request.getPathTranslated()); + requset.put("getServletPath:" ,request.getServletPath()); + requset.put("getRemoteAddr:" , request.getRemoteAddr()); + requset.put("getRemoteHost:" , request.getRemoteHost()); + requset.put("getRemotePort:" , request.getRemotePort()); + requset.put("getLocalAddr:" , request.getLocalAddr()); + requset.put("getLocalName:" , request.getLocalName() ); + requset.put("getLocalPort:" ,request.getLocalPort()); + requset.put("getServerName:" , request.getServerName()); + requset.put("getServerPort:" , request.getServerPort()); + requset.put("getScheme:" ,request.getScheme()); + requset.put("getRequestURL:" , request.getRequestURL() ); + Enumeration parameterNames = request.getParameterNames(); + while (parameterNames.hasMoreElements()){ + String parasm = (String) parameterNames.nextElement(); + requset.put(parasm,request.getParameter(parasm)); + } + + json.put("header",header); + json.put("requset",requset); + json.put("from",form); + return json; + } + + @PostMapping("testpost2"+ISystemConstant.APP_RELEASE_SUFFIX) + public JSONObject testPOST2(Map map){ + + JSONObject json = new JSONObject(); + JSONObject header = new JSONObject(); + JSONObject requset = new JSONObject(); + HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); + Enumeration headerNames = request.getHeaderNames(); + while (headerNames.hasMoreElements()){ + String headerName = (String) headerNames.nextElement(); + header.put(headerName,request.getHeader(headerName)); + } + + requset.put("getMethod:" ,request.getMethod()); + requset.put("getQueryString:" ,request.getQueryString() ); + requset.put("getProtocol:" , request.getProtocol() ); + requset.put("getContextPath" ,request.getContextPath() ); + requset.put("getPathInfo:" ,request.getPathInfo() ); + requset.put("getPathTranslated:" ,request.getPathTranslated()); + requset.put("getServletPath:" ,request.getServletPath()); + requset.put("getRemoteAddr:" , request.getRemoteAddr()); + requset.put("getRemoteHost:" , request.getRemoteHost()); + requset.put("getRemotePort:" , request.getRemotePort()); + requset.put("getLocalAddr:" , request.getLocalAddr()); + requset.put("getLocalName:" , request.getLocalName() ); + requset.put("getLocalPort:" ,request.getLocalPort()); + requset.put("getServerName:" , request.getServerName()); + requset.put("getServerPort:" , request.getServerPort()); + requset.put("getScheme:" ,request.getScheme()); + requset.put("getRequestURL:" , request.getRequestURL() ); + Enumeration parameterNames = request.getParameterNames(); + while (parameterNames.hasMoreElements()){ + String parasm = (String) parameterNames.nextElement(); + requset.put(parasm,request.getParameter(parasm)); + } + + json.put("header",header); + json.put("requset",requset); + json.put("map",map); + return json; + } + + + + @ApiOperation(value = "新增", notes = "新增接口") @ApiImplicitParams({ @ApiImplicitParam(name = "token", value = "token", paramType = "header") diff --git a/src/main/java/com/tenlion/twoduty/controller/route/indexWebController.java b/src/main/java/com/tenlion/twoduty/controller/route/indexWebController.java index 0e5da6d..d804167 100644 --- a/src/main/java/com/tenlion/twoduty/controller/route/indexWebController.java +++ b/src/main/java/com/tenlion/twoduty/controller/route/indexWebController.java @@ -4,6 +4,7 @@ package com.tenlion.twoduty.controller.route; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.common.component.SecurityComponent; import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.properties.ServerProperties; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -24,7 +25,8 @@ import org.springframework.web.servlet.ModelAndView; public class indexWebController extends DefaultBaseController { @Autowired private SecurityComponent securityComponent; - + @Autowired + private ServerProperties serverProperties; @ApiOperation(value = "后台页面首页", notes = "后台页面首页接口") @GetMapping("indexweb") @@ -32,6 +34,7 @@ public class indexWebController extends DefaultBaseController { ModelAndView mv = new ModelAndView("index"); mv.addObject("userName",securityComponent.getCurrentUser().getUserName()); mv.addObject("userUserName",securityComponent.getCurrentUser().getUserUsername()); + mv.addObject("systemTitle",serverProperties.getSystemTitle()); return mv; } diff --git a/src/main/java/com/tenlion/twoduty/dao/indexauditlog/IIndexAuditLogDao.java b/src/main/java/com/tenlion/twoduty/dao/indexauditlog/IIndexAuditLogDao.java new file mode 100644 index 0000000..6a8c6c3 --- /dev/null +++ b/src/main/java/com/tenlion/twoduty/dao/indexauditlog/IIndexAuditLogDao.java @@ -0,0 +1,127 @@ +package com.tenlion.twoduty.dao.indexauditlog; + +import ink.wgink.exceptions.RemoveException; +import ink.wgink.exceptions.SaveException; +import ink.wgink.exceptions.SearchException; +import ink.wgink.exceptions.UpdateException; +import com.tenlion.twoduty.pojo.bos.indexauditlog.IndexAuditLogBO; +import com.tenlion.twoduty.pojo.pos.indexauditlog.IndexAuditLogPO; +import com.tenlion.twoduty.pojo.dtos.indexauditlog.IndexAuditLogDTO; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: IIndexAuditLogDao + * @Description: 指标审核日志表 + * @Author: CodeFactory + * @Date: 2021-04-23 11:05:28 + * @Version: 3.0 + **/ +@Repository +public interface IIndexAuditLogDao { + + + /** + * 修改业务表审核状态 + * @param params + * @throws UpdateException + */ + void updateBAuditStatus(Map params) throws UpdateException; + /** + * 新增指标审核日志表 + * + * @param params + * @throws SaveException + */ + void save(Map params) throws SaveException; + + /** + * 删除指标审核日志表 + * + * @param params + * @throws RemoveException + */ + void remove(Map params) throws RemoveException; + + /** + * 删除指标审核日志表（物理） + * + * @param params + * @throws RemoveException + */ + void delete(Map params) throws RemoveException; + + /** + * 修改指标审核日志表 + * + * @param params + * @throws UpdateException + */ + void update(Map params) throws UpdateException; + + /** + * 指标审核日志表详情 + * + * @param params + * @return + * @throws SearchException + */ + IndexAuditLogDTO get(Map params) throws SearchException; + + /** + * 指标审核日志表详情 + * + * @param params + * @return + * @throws SearchException + */ + IndexAuditLogBO getBO(Map params) throws SearchException; + + /** + * 指标审核日志表详情 + * + * @param params + * @return + * @throws SearchException + */ + IndexAuditLogPO getPO(Map params) throws SearchException; + + /** + * 指标审核日志表列表 + * + * @param params + * @return + * @throws SearchException + */ + List list(Map params) throws SearchException; + + /** + * 指标审核日志表列表 + * + * @param params + * @return + * @throws SearchException + */ + List listBO(Map params) throws SearchException; + + /** + * 指标审核日志表列表 + * + * @param params + * @return + * @throws SearchException + */ + List listPO(Map params) throws SearchException; + + /** + * 指标审核日志表统计 + * + * @param params + * @return + * @throws SearchException + */ + Integer count(Map params) throws SearchException; + +} \ No newline at end of file diff --git a/src/main/java/com/tenlion/twoduty/pojo/bos/indexauditlog/IndexAuditLogBO.java b/src/main/java/com/tenlion/twoduty/pojo/bos/indexauditlog/IndexAuditLogBO.java new file mode 100644 index 0000000..3a20bb3 --- /dev/null +++ b/src/main/java/com/tenlion/twoduty/pojo/bos/indexauditlog/IndexAuditLogBO.java @@ -0,0 +1,113 @@ +package com.tenlion.twoduty.pojo.bos.indexauditlog; + +/** + * + * @ClassName: IndexAuditLogBO + * @Description: 指标审核日志表 + * @Author: CodeFactory + * @Date: 2021-04-23 11:05:28 + * @Version: 3.0 + **/ +public class IndexAuditLogBO { + + private String indexAuditLogId; + private String indexBId; + private String indexLibId; + + private String indexAuditStatus; + private String indexAuditResult; + private String indexAuditUserId; + private String gmtCreate; + private String creator; + private String gmtModified; + private String modifier; + private Integer isDelete; + + public String getIndexAuditLogId() { + return indexAuditLogId == null ? "" : indexAuditLogId.trim(); + } + + public void setIndexAuditLogId(String indexAuditLogId) { + this.indexAuditLogId = indexAuditLogId; + } + + public String getIndexBId() { + return indexBId == null ? "" : indexBId.trim(); + } + + public void setIndexBId(String indexBId) { + this.indexBId = indexBId; + } + + public String getIndexAuditStatus() { + return indexAuditStatus == null ? "" : indexAuditStatus.trim(); + } + + public void setIndexAuditStatus(String indexAuditStatus) { + this.indexAuditStatus = indexAuditStatus; + } + + public String getIndexAuditResult() { + return indexAuditResult == null ? "" : indexAuditResult.trim(); + } + + public void setIndexAuditResult(String indexAuditResult) { + this.indexAuditResult = indexAuditResult; + } + + public String getIndexAuditUserId() { + return indexAuditUserId == null ? "" : indexAuditUserId.trim(); + } + + public void setIndexAuditUserId(String indexAuditUserId) { + this.indexAuditUserId = indexAuditUserId; + } + + public String getGmtCreate() { + return gmtCreate == null ? "" : gmtCreate.trim(); + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public String getCreator() { + return creator == null ? "" : creator.trim(); + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getGmtModified() { + return gmtModified == null ? "" : gmtModified.trim(); + } + + public void setGmtModified(String gmtModified) { + this.gmtModified = gmtModified; + } + + public String getModifier() { + return modifier == null ? "" : modifier.trim(); + } + + public void setModifier(String modifier) { + this.modifier = modifier; + } + + public Integer getIsDelete() { + return isDelete == null ? 0 : isDelete; + } + + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } + + public String getIndexLibId() { + return indexLibId; + } + + public void setIndexLibId(String indexLibId) { + this.indexLibId = indexLibId; + } +} diff --git a/src/main/java/com/tenlion/twoduty/pojo/bos/indextemplate/IndexTemplateBO.java b/src/main/java/com/tenlion/twoduty/pojo/bos/indextemplate/IndexTemplateBO.java index 3c8ba86..3d3593b 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/bos/indextemplate/IndexTemplateBO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/bos/indextemplate/IndexTemplateBO.java @@ -16,6 +16,7 @@ public class IndexTemplateBO { private String indexTemplateName; private String indexTemplateSavePath; private String indexTemplateUploadPath; + private String indexTemplateShowPath; private String indexTemplateListPath; private String indexTemplateTableName; private String indexTemplateRemark; @@ -129,4 +130,12 @@ public class IndexTemplateBO { public void setIndexTemplateTableName(String indexTemplateTableName) { this.indexTemplateTableName = indexTemplateTableName; } + + public String getIndexTemplateShowPath() { + return indexTemplateShowPath; + } + + public void setIndexTemplateShowPath(String indexTemplateShowPath) { + this.indexTemplateShowPath = indexTemplateShowPath; + } } diff --git a/src/main/java/com/tenlion/twoduty/pojo/dtos/indexauditlog/IndexAuditLogDTO.java b/src/main/java/com/tenlion/twoduty/pojo/dtos/indexauditlog/IndexAuditLogDTO.java new file mode 100644 index 0000000..4d599b3 --- /dev/null +++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/indexauditlog/IndexAuditLogDTO.java @@ -0,0 +1,77 @@ +package com.tenlion.twoduty.pojo.dtos.indexauditlog; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * + * @ClassName: IndexAuditLogDTO + * @Description: 指标审核日志表 + * @Author: CodeFactory + * @Date: 2021-04-23 11:05:28 + * @Version: 3.0 + **/ +@ApiModel +public class IndexAuditLogDTO { + + @ApiModelProperty(name = "indexAuditLogId", value = "主键") + private String indexAuditLogId; + @ApiModelProperty(name = "indexBId", value = "指标业务ID") + private String indexBId; + @ApiModelProperty(name = "indexLibId", value = "指标ID") + private String indexLibId; + @ApiModelProperty(name = "indexAuditStatus", value = "审核状态：0 待审核 1审核通过 2已归档 -1审核不通过") + private String indexAuditStatus; + @ApiModelProperty(name = "indexAuditResult", value = "审核内容") + private String indexAuditResult; + @ApiModelProperty(name = "indexAuditUserId", value = "审核人ID") + private String indexAuditUserId; + + public String getIndexAuditLogId() { + return indexAuditLogId == null ? "" : indexAuditLogId.trim(); + } + + public void setIndexAuditLogId(String indexAuditLogId) { + this.indexAuditLogId = indexAuditLogId; + } + + public String getIndexBId() { + return indexBId == null ? "" : indexBId.trim(); + } + + public void setIndexBId(String indexBId) { + this.indexBId = indexBId; + } + + public String getIndexAuditStatus() { + return indexAuditStatus == null ? "" : indexAuditStatus.trim(); + } + + public void setIndexAuditStatus(String indexAuditStatus) { + this.indexAuditStatus = indexAuditStatus; + } + + public String getIndexAuditResult() { + return indexAuditResult == null ? "" : indexAuditResult.trim(); + } + + public void setIndexAuditResult(String indexAuditResult) { + this.indexAuditResult = indexAuditResult; + } + + public String getIndexAuditUserId() { + return indexAuditUserId == null ? "" : indexAuditUserId.trim(); + } + + public void setIndexAuditUserId(String indexAuditUserId) { + this.indexAuditUserId = indexAuditUserId; + } + + public String getIndexLibId() { + return indexLibId; + } + + public void setIndexLibId(String indexLibId) { + this.indexLibId = indexLibId; + } +} diff --git a/src/main/java/com/tenlion/twoduty/pojo/dtos/indexlib/IndexLibDTO.java b/src/main/java/com/tenlion/twoduty/pojo/dtos/indexlib/IndexLibDTO.java index 508e78c..53097d9 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/dtos/indexlib/IndexLibDTO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/indexlib/IndexLibDTO.java @@ -39,7 +39,8 @@ public class IndexLibDTO { private String indexTemplateUploadPath; @ApiModelProperty(name = "indexTemplateListPath", value = "列表路径") private String indexTemplateListPath; - + @ApiModelProperty(name = "indexTemplateShowPath", value = "查看路径") + private String indexTemplateShowPath; @@ -138,4 +139,12 @@ public class IndexLibDTO { public void setIndexTemplateListPath(String indexTemplateListPath) { this.indexTemplateListPath = indexTemplateListPath; } + + public String getIndexTemplateShowPath() { + return indexTemplateShowPath; + } + + public void setIndexTemplateShowPath(String indexTemplateShowPath) { + this.indexTemplateShowPath = indexTemplateShowPath; + } } diff --git a/src/main/java/com/tenlion/twoduty/pojo/dtos/indextemplate/IndexTemplateDTO.java b/src/main/java/com/tenlion/twoduty/pojo/dtos/indextemplate/IndexTemplateDTO.java index 550e3a8..1a83ac7 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/dtos/indextemplate/IndexTemplateDTO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/indextemplate/IndexTemplateDTO.java @@ -25,6 +25,8 @@ public class IndexTemplateDTO { private String indexTemplateSavePath; @ApiModelProperty(name = "indexTemplateUploadPath", value = "修改路径") private String indexTemplateUploadPath; + @ApiModelProperty(name = "indexTemplateShowPath", value = "显示路径") + private String indexTemplateShowPath; @ApiModelProperty(name = "indexTemplateListPath", value = "列表路径") private String indexTemplateListPath; @ApiModelProperty(name = "indexTemplateTableName", value = "业务表名") @@ -97,4 +99,12 @@ public class IndexTemplateDTO { public void setIndexTemplateTableName(String indexTemplateTableName) { this.indexTemplateTableName = indexTemplateTableName; } + + public String getIndexTemplateShowPath() { + return indexTemplateShowPath; + } + + public void setIndexTemplateShowPath(String indexTemplateShowPath) { + this.indexTemplateShowPath = indexTemplateShowPath; + } } diff --git a/src/main/java/com/tenlion/twoduty/pojo/pos/indexauditlog/IndexAuditLogPO.java b/src/main/java/com/tenlion/twoduty/pojo/pos/indexauditlog/IndexAuditLogPO.java new file mode 100644 index 0000000..c5fcbce --- /dev/null +++ b/src/main/java/com/tenlion/twoduty/pojo/pos/indexauditlog/IndexAuditLogPO.java @@ -0,0 +1,113 @@ +package com.tenlion.twoduty.pojo.pos.indexauditlog; + +/** + * + * @ClassName: IndexAuditLogPO + * @Description: 指标审核日志表 + * @Author: CodeFactory + * @Date: 2021-04-23 11:05:28 + * @Version: 3.0 + **/ +public class IndexAuditLogPO { + + private String indexAuditLogId; + private String indexBId; + private String indexLibId; + private String indexAuditStatus; + private String indexAuditResult; + private String indexAuditUserId; + private String gmtCreate; + private String creator; + private String gmtModified; + private String modifier; + private Integer isDelete; + + public String getIndexAuditLogId() { + return indexAuditLogId == null ? "" : indexAuditLogId.trim(); + } + + public void setIndexAuditLogId(String indexAuditLogId) { + this.indexAuditLogId = indexAuditLogId; + } + + public String getIndexBId() { + return indexBId == null ? "" : indexBId.trim(); + } + + public void setIndexBId(String indexBId) { + this.indexBId = indexBId; + } + + public String getIndexAuditStatus() { + return indexAuditStatus == null ? "" : indexAuditStatus.trim(); + } + + public void setIndexAuditStatus(String indexAuditStatus) { + this.indexAuditStatus = indexAuditStatus; + } + + public String getIndexAuditResult() { + return indexAuditResult == null ? "" : indexAuditResult.trim(); + } + + public void setIndexAuditResult(String indexAuditResult) { + this.indexAuditResult = indexAuditResult; + } + + public String getIndexAuditUserId() { + return indexAuditUserId == null ? "" : indexAuditUserId.trim(); + } + + public void setIndexAuditUserId(String indexAuditUserId) { + this.indexAuditUserId = indexAuditUserId; + } + + public String getGmtCreate() { + return gmtCreate == null ? "" : gmtCreate.trim(); + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public String getCreator() { + return creator == null ? "" : creator.trim(); + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getGmtModified() { + return gmtModified == null ? "" : gmtModified.trim(); + } + + public void setGmtModified(String gmtModified) { + this.gmtModified = gmtModified; + } + + public String getModifier() { + return modifier == null ? "" : modifier.trim(); + } + + public void setModifier(String modifier) { + this.modifier = modifier; + } + + public Integer getIsDelete() { + return isDelete == null ? 0 : isDelete; + } + + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } + + + public String getIndexLibId() { + return indexLibId; + } + + public void setIndexLibId(String indexLibId) { + this.indexLibId = indexLibId; + } +} diff --git a/src/main/java/com/tenlion/twoduty/pojo/pos/indextemplate/IndexTemplatePO.java b/src/main/java/com/tenlion/twoduty/pojo/pos/indextemplate/IndexTemplatePO.java index 8ae0a23..8f31007 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/pos/indextemplate/IndexTemplatePO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/pos/indextemplate/IndexTemplatePO.java @@ -16,6 +16,7 @@ public class IndexTemplatePO { private String indexTemplateName; private String indexTemplateSavePath; private String indexTemplateUploadPath; + private String indexTemplateShowPath; private String indexTemplateListPath; private String indexTemplateTableName; private String indexTemplateRemark; @@ -129,4 +130,12 @@ public class IndexTemplatePO { public void setIndexTemplateTableName(String indexTemplateTableName) { this.indexTemplateTableName = indexTemplateTableName; } + + public String getIndexTemplateShowPath() { + return indexTemplateShowPath; + } + + public void setIndexTemplateShowPath(String indexTemplateShowPath) { + this.indexTemplateShowPath = indexTemplateShowPath; + } } diff --git a/src/main/java/com/tenlion/twoduty/pojo/vos/indexauditlog/IndexAuditLogVO.java b/src/main/java/com/tenlion/twoduty/pojo/vos/indexauditlog/IndexAuditLogVO.java new file mode 100644 index 0000000..2b6d58a --- /dev/null +++ b/src/main/java/com/tenlion/twoduty/pojo/vos/indexauditlog/IndexAuditLogVO.java @@ -0,0 +1,69 @@ +package com.tenlion.twoduty.pojo.vos.indexauditlog; + +import ink.wgink.annotation.CheckEmptyAnnotation; +import ink.wgink.annotation.CheckNumberAnnotation; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * + * @ClassName: IndexAuditLogVO + * @Description: 指标审核日志表 + * @Author: CodeFactory + * @Date: 2021-04-23 11:05:28 + * @Version: 3.0 + **/ +@ApiModel +public class IndexAuditLogVO { + + @ApiModelProperty(name = "indexBId", value = "指标业务ID") + private String indexBId; + @ApiModelProperty(name = "indexLibId", value = "指标ID") + private String indexLibId; + @ApiModelProperty(name = "indexAuditStatus", value = "审核状态：0 待审核 1审核通过 2已归档 -1审核不通过") + private String indexAuditStatus; + @ApiModelProperty(name = "indexAuditResult", value = "审核内容") + private String indexAuditResult; + @ApiModelProperty(name = "indexAuditUserId", value = "审核人ID") + private String indexAuditUserId; + + public String getIndexBId() { + return indexBId == null ? "" : indexBId.trim(); + } + + public void setIndexBId(String indexBId) { + this.indexBId = indexBId; + } + + public String getIndexAuditStatus() { + return indexAuditStatus == null ? "" : indexAuditStatus.trim(); + } + + public void setIndexAuditStatus(String indexAuditStatus) { + this.indexAuditStatus = indexAuditStatus; + } + + public String getIndexAuditResult() { + return indexAuditResult == null ? "" : indexAuditResult.trim(); + } + + public void setIndexAuditResult(String indexAuditResult) { + this.indexAuditResult = indexAuditResult; + } + + public String getIndexAuditUserId() { + return indexAuditUserId == null ? "" : indexAuditUserId.trim(); + } + + public void setIndexAuditUserId(String indexAuditUserId) { + this.indexAuditUserId = indexAuditUserId; + } + + public String getIndexLibId() { + return indexLibId; + } + + public void setIndexLibId(String indexLibId) { + this.indexLibId = indexLibId; + } +} diff --git a/src/main/java/com/tenlion/twoduty/pojo/vos/indextemplate/IndexTemplateVO.java b/src/main/java/com/tenlion/twoduty/pojo/vos/indextemplate/IndexTemplateVO.java index 7c1faae..38ef181 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/vos/indextemplate/IndexTemplateVO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/vos/indextemplate/IndexTemplateVO.java @@ -23,6 +23,9 @@ public class IndexTemplateVO { private String indexTemplateSavePath; @ApiModelProperty(name = "indexTemplateUploadPath", value = "修改路径") private String indexTemplateUploadPath; + @ApiModelProperty(name = "indexTemplateShowPath", value = "显示路径") + private String indexTemplateShowPath; + @ApiModelProperty(name = "indexTemplateListPath", value = "列表路径") private String indexTemplateListPath; @ApiModelProperty(name = "indexTemplateTableName", value = "业务表名") @@ -88,4 +91,13 @@ public class IndexTemplateVO { public void setIndexTemplateTableName(String indexTemplateTableName) { this.indexTemplateTableName = indexTemplateTableName; } + + + public String getIndexTemplateShowPath() { + return indexTemplateShowPath; + } + + public void setIndexTemplateShowPath(String indexTemplateShowPath) { + this.indexTemplateShowPath = indexTemplateShowPath; + } } diff --git a/src/main/java/com/tenlion/twoduty/service/indexauditlog/IIndexAuditLogService.java b/src/main/java/com/tenlion/twoduty/service/indexauditlog/IIndexAuditLogService.java new file mode 100644 index 0000000..d6c51ed --- /dev/null +++ b/src/main/java/com/tenlion/twoduty/service/indexauditlog/IIndexAuditLogService.java @@ -0,0 +1,188 @@ +package com.tenlion.twoduty.service.indexauditlog; + +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.SuccessResultList; +import com.tenlion.twoduty.pojo.dtos.indexauditlog.IndexAuditLogDTO; +import com.tenlion.twoduty.pojo.vos.indexauditlog.IndexAuditLogVO; +import com.tenlion.twoduty.pojo.bos.indexauditlog.IndexAuditLogBO; +import com.tenlion.twoduty.pojo.pos.indexauditlog.IndexAuditLogPO; + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: IIndexAuditLogService + * @Description: 指标审核日志表 + * @Author: CodeFactory + * @Date: 2021-04-23 11:05:28 + * @Version: 3.0 + **/ +public interface IIndexAuditLogService { + + /** + * 新增指标审核日志表 + * + * @param indexAuditLogVO + * @return + */ + void save(IndexAuditLogVO indexAuditLogVO); + + /** + * 新增指标审核日志表 + * + * @param token + * @param indexAuditLogVO + * @return + */ + void save(String token, IndexAuditLogVO indexAuditLogVO); + + /** + * 新增指标审核日志表 + * + * @param indexAuditLogVO + * @return indexAuditLogId + */ + String saveReturnId(IndexAuditLogVO indexAuditLogVO); + + /** + * 新增指标审核日志表 + * + * @param token + * @param indexAuditLogVO + * @return indexAuditLogId + */ + String saveReturnId(String token, IndexAuditLogVO indexAuditLogVO); + + /** + * 删除指标审核日志表 + * + * @param ids id列表 + * @return + */ + void remove(List ids); + + + /** + * 删除指标审核日志表 + * + * @param token + * @param ids id列表 + * @return + */ + void remove(String token, List ids); + + /** + * 删除指标审核日志表（物理删除） + * + * @param ids id列表 + */ + void delete(List ids); + + /** + * 修改指标审核日志表 + * + * @param indexAuditLogId + * @param indexAuditLogVO + * @return + */ + void update(String indexAuditLogId, IndexAuditLogVO indexAuditLogVO); + + /** + * 修改指标审核日志表 + * + * @param token + * @param indexAuditLogId + * @param indexAuditLogVO + * @return + */ + void update(String token, String indexAuditLogId, IndexAuditLogVO indexAuditLogVO); + + /** + * 指标审核日志表详情 + * + * @param params 参数Map + * @return + */ + IndexAuditLogDTO get(Map params); + + /** + * 指标审核日志表详情 + * + * @param indexAuditLogId + * @return + */ + IndexAuditLogDTO get(String indexAuditLogId); + + /** + * 指标审核日志表详情 + * + * @param params 参数Map + * @return + */ + IndexAuditLogBO getBO(Map params); + + /** + * 指标审核日志表详情 + * + * @param indexAuditLogId + * @return + */ + IndexAuditLogBO getBO(String indexAuditLogId); + + /** + * 指标审核日志表详情 + * + * @param params 参数Map + * @return + */ + IndexAuditLogPO getPO(Map params); + + /** + * 指标审核日志表详情 + * + * @param indexAuditLogId + * @return + */ + IndexAuditLogPO getPO(String indexAuditLogId); + + /** + * 指标审核日志表列表 + * + * @param params + * @return + */ + List list(Map params); + + /** + * 指标审核日志表列表 + * + * @param params + * @return + */ + List listBO(Map params); + + /** + * 指标审核日志表列表 + * + * @param params + * @return + */ + List listPO(Map params); + + /** + * 指标审核日志表分页列表 + * + * @param page + * @return + */ + SuccessResultList> listPage(ListPage page); + + /** + * 指标审核日志表统计 + * + * @param params + * @return + */ + Integer count(Map params); + +} \ No newline at end of file diff --git a/src/main/java/com/tenlion/twoduty/service/indexauditlog/impl/IndexAuditLogServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/indexauditlog/impl/IndexAuditLogServiceImpl.java new file mode 100644 index 0000000..60e03e3 --- /dev/null +++ b/src/main/java/com/tenlion/twoduty/service/indexauditlog/impl/IndexAuditLogServiceImpl.java @@ -0,0 +1,213 @@ +package com.tenlion.twoduty.service.indexauditlog.impl; + +import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO; +import com.tenlion.twoduty.pojo.dtos.indextemplate.IndexTemplateDTO; +import com.tenlion.twoduty.service.indexlib.IIndexLibService; +import com.tenlion.twoduty.service.indextemplate.IIndexTemplateService; +import ink.wgink.common.base.DefaultBaseService; +import ink.wgink.common.component.SecurityComponent; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.SuccessResult; +import ink.wgink.pojo.result.SuccessResultList; +import ink.wgink.util.map.HashMapUtil; +import ink.wgink.util.UUIDUtil; +import com.tenlion.twoduty.dao.indexauditlog.IIndexAuditLogDao; +import com.tenlion.twoduty.pojo.dtos.indexauditlog.IndexAuditLogDTO; +import com.tenlion.twoduty.pojo.vos.indexauditlog.IndexAuditLogVO; +import com.tenlion.twoduty.pojo.bos.indexauditlog.IndexAuditLogBO; +import com.tenlion.twoduty.pojo.pos.indexauditlog.IndexAuditLogPO; +import com.tenlion.twoduty.service.indexauditlog.IIndexAuditLogService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * @ClassName: IndexAuditLogServiceImpl + * @Description: 指标审核日志表 + * @Author: CodeFactory + * @Date: 2021-04-23 11:05:28 + * @Version: 3.0 + **/ +@Service +public class IndexAuditLogServiceImpl extends DefaultBaseService implements IIndexAuditLogService { + + @Autowired + private IIndexAuditLogDao indexAuditLogDao; + @Autowired + private IIndexLibService iIndexLibService; + @Autowired + private IIndexTemplateService indexTemplateService; + + public SuccessResultList> listAuditPage(ListPage page) { + PageHelper.startPage(page.getPage(), page.getRows()); + List indexAuditLogDTOs = list(page.getParams()); + PageInfo pageInfo = new PageInfo<>(indexAuditLogDTOs); + return new SuccessResultList<>(indexAuditLogDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); + } + + + + + + + + + + @Override + public void save(IndexAuditLogVO indexAuditLogVO) { + saveReturnId(indexAuditLogVO); + } + + @Override + public void save(String token, IndexAuditLogVO indexAuditLogVO) { + saveReturnId(token, indexAuditLogVO); + } + + @Override + public String saveReturnId(IndexAuditLogVO indexAuditLogVO) { + indexAuditLogVO.setIndexAuditStatus("0"); + indexAuditLogVO.setIndexAuditUserId("1"); + return saveReturnId(null, indexAuditLogVO); + } + + @Override + public String saveReturnId(String token, IndexAuditLogVO indexAuditLogVO) { + String indexAuditLogId = UUIDUtil.getUUID(); + Map params = HashMapUtil.beanToMap(indexAuditLogVO); + params.put("indexAuditLogId", indexAuditLogId); + if (StringUtils.isBlank(token)) { + setSaveInfo(params); + } else { + setAppSaveInfo(token, params); + } + indexAuditLogDao.save(params); + return indexAuditLogId; + } + + @Override + public void remove(List ids) { + remove(null, ids); + } + + @Override + public void remove(String token, List ids) { + Map params = getHashMap(2); + params.put("indexAuditLogIds", ids); + if (StringUtils.isBlank(token)) { + setUpdateInfo(params); + } else { + setAppUpdateInfo(token, params); + } + indexAuditLogDao.remove(params); + } + + @Override + public void delete(List ids) { + Map params = getHashMap(2); + params.put("indexAuditLogIds", ids); + indexAuditLogDao.delete(params); + } + + @Override + public void update(String indexAuditLogId, IndexAuditLogVO indexAuditLogVO) { + update(null, indexAuditLogId, indexAuditLogVO); + } + + @Override + public void update(String token, String indexAuditLogId, IndexAuditLogVO indexAuditLogVO) { + + Map params = HashMapUtil.beanToMap(indexAuditLogVO); + params.put("indexAuditLogId", indexAuditLogId); + if (StringUtils.isBlank(token)) { + setUpdateInfo(params); + } else { + setAppUpdateInfo(token, params); + } + indexAuditLogDao.update(params); + IndexAuditLogDTO indexAuditLogDTO = this.get(indexAuditLogId); + + IndexLibDTO indexLibDTO = iIndexLibService.get(indexAuditLogDTO.getIndexLibId()); + if(indexLibDTO != null){ + IndexTemplateDTO indexTemplateDTO = indexTemplateService.get(indexLibDTO.getIndexTemplateId()); + String tableName = indexTemplateDTO.getIndexTemplateTableName(); + Map uParams = new HashMap<>(); + uParams.put("type",tableName.substring(0,1)); + uParams.put("tableName",tableName); + uParams.put("indexBId",indexAuditLogDTO.getIndexBId()); + uParams.put("auditStatus",indexAuditLogVO.getIndexAuditStatus()); + indexAuditLogDao.updateBAuditStatus(uParams); + } + + + } + + @Override + public IndexAuditLogDTO get(Map params) { + return indexAuditLogDao.get(params); + } + + @Override + public IndexAuditLogDTO get(String indexAuditLogId) { + Map params = super.getHashMap(2); + params.put("indexAuditLogId", indexAuditLogId); + return get(params); + } + + @Override + public IndexAuditLogBO getBO(Map params) { + return indexAuditLogDao.getBO(params); + } + + @Override + public IndexAuditLogBO getBO(String indexAuditLogId) { + Map params = super.getHashMap(2); + params.put("indexAuditLogId", indexAuditLogId); + return getBO(params); + } + + @Override + public IndexAuditLogPO getPO(Map params) { + return indexAuditLogDao.getPO(params); + } + + @Override + public IndexAuditLogPO getPO(String indexAuditLogId) { + Map params = super.getHashMap(2); + params.put("indexAuditLogId", indexAuditLogId); + return getPO(params); + } + + @Override + public List list(Map params) { + return indexAuditLogDao.list(params); + } + + @Override + public List listBO(Map params) { + return indexAuditLogDao.listBO(params); + } + + @Override + public List listPO(Map params) { + return indexAuditLogDao.listPO(params); + } + + @Override + public SuccessResultList> listPage(ListPage page) { + PageHelper.startPage(page.getPage(), page.getRows()); + List indexAuditLogDTOs = list(page.getParams()); + PageInfo pageInfo = new PageInfo<>(indexAuditLogDTOs); + return new SuccessResultList<>(indexAuditLogDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); + } + + @Override + public Integer count(Map params) { + Integer count = indexAuditLogDao.count(params); + return count == null ? 0 : count; + } + +} \ No newline at end of file diff --git a/src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java index 5ff31b6..acffb77 100644 --- a/src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java @@ -1,5 +1,7 @@ package com.tenlion.twoduty.service.indexgeneral.impl; +import com.tenlion.twoduty.pojo.vos.indexauditlog.IndexAuditLogVO; +import com.tenlion.twoduty.service.indexauditlog.IIndexAuditLogService; import com.tenlion.twoduty.utils.AuditStatusEnum; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.common.component.SecurityComponent; @@ -34,7 +36,8 @@ public class IndexGeneralServiceImpl extends DefaultBaseService implements IInde @Autowired private IIndexGeneralDao indexGeneralDao; - + @Autowired + private IIndexAuditLogService iIndexAuditLogService; @Override public void save(IndexGeneralVO indexGeneralVO) { @@ -63,6 +66,11 @@ public class IndexGeneralServiceImpl extends DefaultBaseService implements IInde setAppSaveInfo(token, params); } indexGeneralDao.save(params); + + IndexAuditLogVO auditLogVO = new IndexAuditLogVO(); + auditLogVO.setIndexBId(indexGeneralId); + auditLogVO.setIndexLibId(indexGeneralVO.getDutyIndexLibId()); + iIndexAuditLogService.save(auditLogVO); return indexGeneralId; } @@ -106,6 +114,10 @@ public class IndexGeneralServiceImpl extends DefaultBaseService implements IInde setAppUpdateInfo(token, params); } indexGeneralDao.update(params); + IndexAuditLogVO auditLogVO = new IndexAuditLogVO(); + auditLogVO.setIndexBId(indexGeneralId); + auditLogVO.setIndexLibId(indexGeneralVO.getDutyIndexLibId()); + iIndexAuditLogService.save(auditLogVO); } @Override diff --git a/src/main/java/com/tenlion/twoduty/service/indexlib/IIndexLibService.java b/src/main/java/com/tenlion/twoduty/service/indexlib/IIndexLibService.java index 143daef..b10c0d8 100644 --- a/src/main/java/com/tenlion/twoduty/service/indexlib/IIndexLibService.java +++ b/src/main/java/com/tenlion/twoduty/service/indexlib/IIndexLibService.java @@ -21,6 +21,13 @@ import java.util.Map; **/ public interface IIndexLibService { + /** + * 获取web显示的指标 + * @param indexLibParentId + * @return + */ + List getWebIndexLibId(String indexLibParentId); + /** * 统计指标状态数量 * @param indexLibParentId diff --git a/src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java index 522d61f..2d4f5ae 100644 --- a/src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java @@ -6,6 +6,7 @@ import com.tenlion.twoduty.pojo.dtos.indextemplate.IndexTemplateDTO; import com.tenlion.twoduty.service.indextemplate.IIndexTemplateService; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.common.component.SecurityComponent; +import ink.wgink.exceptions.ParamsException; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; @@ -43,11 +44,13 @@ public class IndexLibServiceImpl extends DefaultBaseService implements IIndexLib @Autowired private SecurityComponent securityComponent; - public IndexLibCountDTO countIndexLib(String indexLibParentId){ - Integer count1 = 0; - Integer count2 = 0; - Integer count3 = 0; - Integer count4 = 0; + /** + * 获取web显示的指标 + * @param indexLibParentId + * @return + */ + public List getWebIndexLibId(String indexLibParentId){ + List resultList = new ArrayList<>(); Map params = new HashMap(); params.put("indexLibParentId",indexLibParentId); //查询指标分类树 @@ -58,23 +61,34 @@ public class IndexLibServiceImpl extends DefaultBaseService implements IIndexLib params.put("indexLibParentId",indexLibZTreeDTO.getId()); //查询具体指标 List list = this.list(params); - for (IndexLibDTO indexLibDTO : list) { - String templateId = indexLibDTO.getIndexTemplateId(); - if (!StringUtils.isBlank(templateId)) { - IndexTemplateDTO indexTemplateDTO = indexTemplateService.get(templateId); - String templateTableName = indexTemplateDTO.getIndexTemplateTableName(); - if (!StringUtils.isBlank(templateTableName)) { - //统计 - Map counts = new HashMap(); - counts.put("tableName",templateTableName); - counts.put("indexLibId",indexLibDTO.getIndexLibId()); - counts.put("creator",securityComponent.getCurrentUser().getUserId()); - IndexLibCountDTO indexLibCountDTO = indexLibDao.countIndexLibAuditStatusNum(counts); - count1 += indexLibCountDTO.getCount1(); - count2 += indexLibCountDTO.getCount2(); - count3 += indexLibCountDTO.getCount3(); - count4 += indexLibCountDTO.getCount4(); - } + resultList.addAll(list); + } + return resultList; + } + + + + public IndexLibCountDTO countIndexLib(String indexLibParentId){ + Integer count1 = 0; + Integer count2 = 0; + Integer count3 = 0; + Integer count4 = 0; + for (IndexLibDTO indexLibDTO : this.getWebIndexLibId(indexLibParentId)) { + String templateId = indexLibDTO.getIndexTemplateId(); + if (!StringUtils.isBlank(templateId)) { + IndexTemplateDTO indexTemplateDTO = indexTemplateService.get(templateId); + String templateTableName = indexTemplateDTO.getIndexTemplateTableName(); + if (!StringUtils.isBlank(templateTableName)) { + //统计 + Map counts = new HashMap(); + counts.put("tableName",templateTableName); + counts.put("indexLibId",indexLibDTO.getIndexLibId()); + counts.put("creator",securityComponent.getCurrentUser().getUserId()); + IndexLibCountDTO indexLibCountDTO = indexLibDao.countIndexLibAuditStatusNum(counts); + count1 += indexLibCountDTO.getCount1(); + count2 += indexLibCountDTO.getCount2(); + count3 += indexLibCountDTO.getCount3(); + count4 += indexLibCountDTO.getCount4(); } } } @@ -195,6 +209,17 @@ public class IndexLibServiceImpl extends DefaultBaseService implements IIndexLib if(dto.getIndexLibParentId().equals("0")){ dto.setIndexLibParentName("根节点"); } + if (!StringUtils.isBlank(dto.getIndexTemplateId())){ + IndexTemplateDTO indexTemplateDTO = indexTemplateService.get(dto.getIndexTemplateId()); + if(indexTemplateDTO != null){ + dto.setIndexTemplateListPath(indexTemplateDTO.getIndexTemplateListPath()); + dto.setIndexTemplateSavePath(indexTemplateDTO.getIndexTemplateSavePath()); + dto.setIndexTemplateShowPath(indexTemplateDTO.getIndexTemplateShowPath()); + dto.setIndexTemplateUploadPath(indexTemplateDTO.getIndexTemplateUploadPath()); + } + } + + return dto; } diff --git a/src/main/resources/mybatis/mapper/basicCheckPersonInfo/basicCheckPersonInfo-mapper.xml b/src/main/resources/mybatis/mapper/basiccheckpersonInfo/basicCheckPersonInfo-mapper.xml similarity index 100% rename from src/main/resources/mybatis/mapper/basicCheckPersonInfo/basicCheckPersonInfo-mapper.xml rename to src/main/resources/mybatis/mapper/basiccheckpersonInfo/basicCheckPersonInfo-mapper.xml diff --git a/src/main/resources/mybatis/mapper/basicCheckPersonAction/basicCheckPersonAction-mapper.xml b/src/main/resources/mybatis/mapper/basiccheckpersonaction/basicCheckPersonAction-mapper.xml similarity index 100% rename from src/main/resources/mybatis/mapper/basicCheckPersonAction/basicCheckPersonAction-mapper.xml rename to src/main/resources/mybatis/mapper/basiccheckpersonaction/basicCheckPersonAction-mapper.xml diff --git a/src/main/resources/mybatis/mapper/indexauditlog/index-audit-log-mapper.xml b/src/main/resources/mybatis/mapper/indexauditlog/index-audit-log-mapper.xml new file mode 100644 index 0000000..7a8cf34 --- /dev/null +++ b/src/main/resources/mybatis/mapper/indexauditlog/index-audit-log-mapper.xml @@ -0,0 +1,333 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO duty_index_audit_log( + index_audit_log_id, + index_b_id, + index_lib_id, + index_audit_status, + index_audit_result, + index_audit_user_id, + gmt_create, + creator, + gmt_modified, + modifier, + is_delete + ) VALUES( + #{indexAuditLogId}, + #{indexBId}, + #{indexLibId}, + #{indexAuditStatus}, + #{indexAuditResult}, + #{indexAuditUserId}, + #{gmtCreate}, + #{creator}, + #{gmtModified}, + #{modifier}, + #{isDelete} + ) + + + + + UPDATE + duty_index_audit_log + SET + gmt_modified = #{gmtModified}, + modifier = #{modifier}, + is_delete = 1 + WHERE + index_audit_log_id IN + + #{indexAuditLogIds[${index}]} + + + + + + DELETE FROM + duty_index_audit_log + WHERE + index_audit_log_id IN + + #{indexAuditLogIds[${index}]} + + + + + + UPDATE + duty_index_audit_log + SET + + index_audit_status = #{indexAuditStatus}, + + + index_audit_result = #{indexAuditResult}, + + gmt_modified = #{gmtModified}, + modifier = #{modifier} + WHERE + index_audit_log_id = #{indexAuditLogId} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE + #{tableName} + SET + audit_status = #{auditStatus} + WHERE + is_delete = 0 + + AND report_id = #{indexBId} + + + AND index_general_id = #{indexBId} + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/indexGeneral/indexGeneral-mapper.xml b/src/main/resources/mybatis/mapper/indexgeneral/indexGeneral-mapper.xml similarity index 100% rename from src/main/resources/mybatis/mapper/indexGeneral/indexGeneral-mapper.xml rename to src/main/resources/mybatis/mapper/indexgeneral/indexGeneral-mapper.xml diff --git a/src/main/resources/mybatis/mapper/indexLib/indexLib-mapper.xml b/src/main/resources/mybatis/mapper/indexlib/indexLib-mapper.xml similarity index 99% rename from src/main/resources/mybatis/mapper/indexLib/indexLib-mapper.xml rename to src/main/resources/mybatis/mapper/indexlib/indexLib-mapper.xml index 3b9bfd3..8cd5c61 100644 --- a/src/main/resources/mybatis/mapper/indexLib/indexLib-mapper.xml +++ b/src/main/resources/mybatis/mapper/indexlib/indexLib-mapper.xml @@ -442,7 +442,6 @@ AND creator = #{creator} - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/indexTemplate/indexTemplate-mapper.xml b/src/main/resources/mybatis/mapper/indextemplate/indexTemplate-mapper.xml similarity index 94% rename from src/main/resources/mybatis/mapper/indexTemplate/indexTemplate-mapper.xml rename to src/main/resources/mybatis/mapper/indextemplate/indexTemplate-mapper.xml index c450379..80c3f63 100644 --- a/src/main/resources/mybatis/mapper/indexTemplate/indexTemplate-mapper.xml +++ b/src/main/resources/mybatis/mapper/indextemplate/indexTemplate-mapper.xml @@ -7,6 +7,7 @@ + @@ -18,6 +19,7 @@ + @@ -34,6 +36,7 @@ + @@ -52,6 +55,7 @@ index_template_name, index_template_save_path, index_template_upload_path, + index_template_show_path, index_template_list_path, index_template_table_name, index_template_remark, @@ -66,6 +70,7 @@ #{indexTemplateName}, #{indexTemplateSavePath}, #{indexTemplateUploadPath}, + #{indexTemplateShowPath}, #{indexTemplateListPath}, #{indexTemplateTableName} #{indexTemplateRemark}, @@ -118,6 +123,7 @@ index_template_name = #{indexTemplateName}, index_template_save_path = #{indexTemplateSavePath}, index_template_upload_path = #{indexTemplateUploadPath}, + index_template_show_path = #{indexTemplateShowPath}, index_template_list_path = #{indexTemplateListPath}, index_template_table_name = #{indexTemplateTableName}, index_template_remark = #{indexTemplateRemark}, @@ -133,6 +139,7 @@ t1.index_template_name, t1.index_template_save_path, t1.index_template_upload_path, + t1.index_template_show_path, t1.index_template_list_path, t1.index_template_table_name, t1.index_template_remark, @@ -155,6 +162,7 @@ t1.index_template_name, t1.index_template_save_path, t1.index_template_upload_path, + t1.index_template_show_path, t1.index_template_list_path, t1.index_template_table_name, t1.index_template_remark, @@ -180,6 +188,7 @@ t1.index_template_name, t1.index_template_save_path, t1.index_template_upload_path, + t1.index_template_show_path, t1.index_template_list_path, t1.index_template_table_name, t1.index_template_remark, @@ -205,6 +214,7 @@ t1.index_template_name, t1.index_template_save_path, t1.index_template_upload_path, + t1.index_template_show_path, t1.index_template_list_path, t1.index_template_table_name, t1.index_template_remark, @@ -235,6 +245,7 @@ t1.index_template_name, t1.index_template_save_path, t1.index_template_upload_path, + t1.index_template_show_path, t1.index_template_list_path, t1.index_template_table_name, t1.index_template_remark, @@ -269,6 +280,7 @@ t1.index_template_name, t1.index_template_save_path, t1.index_template_upload_path, + t1.index_template_show_path, t1.index_template_list_path, t1.index_template_table_name, t1.index_template_remark, diff --git a/src/main/resources/mybatis/mapper/partyPunishInfo/partyPunishInfo-mapper.xml b/src/main/resources/mybatis/mapper/partypunishInfo/partyPunishInfo-mapper.xml similarity index 100% rename from src/main/resources/mybatis/mapper/partyPunishInfo/partyPunishInfo-mapper.xml rename to src/main/resources/mybatis/mapper/partypunishInfo/partyPunishInfo-mapper.xml diff --git a/src/main/resources/mybatis/mapper/problemClue/problemClue-mapper.xml b/src/main/resources/mybatis/mapper/problemclue/problemClue-mapper.xml similarity index 100% rename from src/main/resources/mybatis/mapper/problemClue/problemClue-mapper.xml rename to src/main/resources/mybatis/mapper/problemclue/problemClue-mapper.xml diff --git a/src/main/resources/mybatis/mapper/superviseCheck/superviseCheck-mapper.xml b/src/main/resources/mybatis/mapper/supervisecheck/superviseCheck-mapper.xml similarity index 100% rename from src/main/resources/mybatis/mapper/superviseCheck/superviseCheck-mapper.xml rename to src/main/resources/mybatis/mapper/supervisecheck/superviseCheck-mapper.xml diff --git a/src/main/resources/static/route/basicCheckPersonAction/list.html b/src/main/resources/static/route/basiccheckpersonaction/list.html similarity index 99% rename from src/main/resources/static/route/basicCheckPersonAction/list.html rename to src/main/resources/static/route/basiccheckpersonaction/list.html index 03e732c..de22f4c 100644 --- a/src/main/resources/static/route/basicCheckPersonAction/list.html +++ b/src/main/resources/static/route/basiccheckpersonaction/list.html @@ -294,7 +294,7 @@ area: ['80%', '80%'], shadeClose: true, anim: 2, - content: top.restAjax.path('route/basicCheckPersonAction/show.html?reportId={reportId}', + content: top.restAjax.path('route/basiccheckpersonaction/show.html?reportId={reportId}', [obj.data.reportId]), end: function() { reloadTable(); diff --git a/src/main/resources/static/route/basicCheckPersonAction/save.html b/src/main/resources/static/route/basiccheckpersonaction/save.html similarity index 100% rename from src/main/resources/static/route/basicCheckPersonAction/save.html rename to src/main/resources/static/route/basiccheckpersonaction/save.html diff --git a/src/main/resources/static/route/basicCheckPersonAction/show.html b/src/main/resources/static/route/basiccheckpersonaction/show.html similarity index 100% rename from src/main/resources/static/route/basicCheckPersonAction/show.html rename to src/main/resources/static/route/basiccheckpersonaction/show.html diff --git a/src/main/resources/static/route/basicCheckPersonAction/update.html b/src/main/resources/static/route/basiccheckpersonaction/update.html similarity index 100% rename from src/main/resources/static/route/basicCheckPersonAction/update.html rename to src/main/resources/static/route/basiccheckpersonaction/update.html diff --git a/src/main/resources/static/route/basicCheckPersonInfo/list.html b/src/main/resources/static/route/basiccheckpersoninfo/list.html similarity index 99% rename from src/main/resources/static/route/basicCheckPersonInfo/list.html rename to src/main/resources/static/route/basiccheckpersoninfo/list.html index 4a5f382..3833953 100644 --- a/src/main/resources/static/route/basicCheckPersonInfo/list.html +++ b/src/main/resources/static/route/basiccheckpersoninfo/list.html @@ -356,7 +356,7 @@ area: ['80%', '80%'], shadeClose: true, anim: 2, - content: top.restAjax.path('route/basicCheckPersonInfo/show.html?reportId={reportId}', + content: top.restAjax.path('route/basiccheckpersoninfo/show.html?reportId={reportId}', [obj.data.reportId]), end: function() { reloadTable(); diff --git a/src/main/resources/static/route/basicCheckPersonInfo/save.html b/src/main/resources/static/route/basiccheckpersoninfo/save.html similarity index 100% rename from src/main/resources/static/route/basicCheckPersonInfo/save.html rename to src/main/resources/static/route/basiccheckpersoninfo/save.html diff --git a/src/main/resources/static/route/basicCheckPersonInfo/show.html b/src/main/resources/static/route/basiccheckpersoninfo/show.html similarity index 100% rename from src/main/resources/static/route/basicCheckPersonInfo/show.html rename to src/main/resources/static/route/basiccheckpersoninfo/show.html diff --git a/src/main/resources/static/route/basicCheckPersonInfo/update.html b/src/main/resources/static/route/basiccheckpersoninfo/update.html similarity index 100% rename from src/main/resources/static/route/basicCheckPersonInfo/update.html rename to src/main/resources/static/route/basiccheckpersoninfo/update.html diff --git a/src/main/resources/static/route/indexauditlog/list-audit.html b/src/main/resources/static/route/indexauditlog/list-audit.html new file mode 100644 index 0000000..9c6cdb2 --- /dev/null +++ b/src/main/resources/static/route/indexauditlog/list-audit.html @@ -0,0 +1,243 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/indexauditlog/list.html b/src/main/resources/static/route/indexauditlog/list.html new file mode 100644 index 0000000..895727a --- /dev/null +++ b/src/main/resources/static/route/indexauditlog/list.html @@ -0,0 +1,267 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/indexauditlog/save.html b/src/main/resources/static/route/indexauditlog/save.html new file mode 100644 index 0000000..2c8bd0e --- /dev/null +++ b/src/main/resources/static/route/indexauditlog/save.html @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + +
+
+
+ + 上级列表/ + 新增内容 + +
+
+
+ + +
+ +
+ +
+
+
+
+
+ + + + +
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/indexauditlog/update.html b/src/main/resources/static/route/indexauditlog/update.html new file mode 100644 index 0000000..81591af --- /dev/null +++ b/src/main/resources/static/route/indexauditlog/update.html @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + +
+
+
+ + 上级列表/ + 编辑内容 + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/indexGeneral/list.html b/src/main/resources/static/route/indexgeneral/list.html similarity index 99% rename from src/main/resources/static/route/indexGeneral/list.html rename to src/main/resources/static/route/indexgeneral/list.html index 740664b..90b1663 100644 --- a/src/main/resources/static/route/indexGeneral/list.html +++ b/src/main/resources/static/route/indexgeneral/list.html @@ -335,7 +335,7 @@ area: ['100%', '100%'], shadeClose: true, anim: 2, - content: top.restAjax.path('route/indexGeneral/show.html?indexGeneralId={indexGeneralId}', [data.indexGeneralId]), + content: top.restAjax.path('route/indexgeneral/show.html?indexGeneralId={indexGeneralId}', [data.indexGeneralId]), end: function() { reloadTable(); } diff --git a/src/main/resources/static/route/indexGeneral/save.html b/src/main/resources/static/route/indexgeneral/save.html similarity index 100% rename from src/main/resources/static/route/indexGeneral/save.html rename to src/main/resources/static/route/indexgeneral/save.html diff --git a/src/main/resources/static/route/indexGeneral/show.html b/src/main/resources/static/route/indexgeneral/show.html similarity index 100% rename from src/main/resources/static/route/indexGeneral/show.html rename to src/main/resources/static/route/indexgeneral/show.html diff --git a/src/main/resources/static/route/indexGeneral/update.html b/src/main/resources/static/route/indexgeneral/update.html similarity index 100% rename from src/main/resources/static/route/indexGeneral/update.html rename to src/main/resources/static/route/indexgeneral/update.html diff --git a/src/main/resources/static/route/indexLib/list.html b/src/main/resources/static/route/indexlib/list.html similarity index 100% rename from src/main/resources/static/route/indexLib/list.html rename to src/main/resources/static/route/indexlib/list.html diff --git a/src/main/resources/static/route/indexLib/save.html b/src/main/resources/static/route/indexlib/save.html similarity index 100% rename from src/main/resources/static/route/indexLib/save.html rename to src/main/resources/static/route/indexlib/save.html diff --git a/src/main/resources/static/route/indexLib/tree.html b/src/main/resources/static/route/indexlib/tree.html similarity index 98% rename from src/main/resources/static/route/indexLib/tree.html rename to src/main/resources/static/route/indexlib/tree.html index d6f4f48..d4d5269 100644 --- a/src/main/resources/static/route/indexLib/tree.html +++ b/src/main/resources/static/route/indexlib/tree.html @@ -49,7 +49,7 @@ // 初始化IFrame function initIFrame() { - $('#listContent').attr('src', top.restAjax.path('route/indexLib/list.html?indexLibParentId={indexLibParentId}', [indexLibParentId])); + $('#listContent').attr('src', top.restAjax.path('route/indexlib/list.html?indexLibParentId={indexLibParentId}', [indexLibParentId])); } // 初始化大小 function initSize() { diff --git a/src/main/resources/static/route/indexLib/update.html b/src/main/resources/static/route/indexlib/update.html similarity index 100% rename from src/main/resources/static/route/indexLib/update.html rename to src/main/resources/static/route/indexlib/update.html diff --git a/src/main/resources/static/route/indexTemplate/list.html b/src/main/resources/static/route/indextemplate/list.html similarity index 96% rename from src/main/resources/static/route/indexTemplate/list.html rename to src/main/resources/static/route/indextemplate/list.html index 9dc8892..cf19084 100644 --- a/src/main/resources/static/route/indexTemplate/list.html +++ b/src/main/resources/static/route/indextemplate/list.html @@ -111,6 +111,14 @@ } return rowData; } + }, {field: 'indexTemplateShowPath', width: 180, title: '显示路径', align:'center', + templet: function(row) { + var rowData = row[this.field]; + if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { + return '-'; + } + return rowData; + } }, {field: 'indexTemplateListPath', width: 180, title: '列表路径', align:'center', templet: function(row) { var rowData = row[this.field]; diff --git a/src/main/resources/static/route/indexTemplate/save.html b/src/main/resources/static/route/indextemplate/save.html similarity index 95% rename from src/main/resources/static/route/indexTemplate/save.html rename to src/main/resources/static/route/indextemplate/save.html index 930ef03..31dcaca 100644 --- a/src/main/resources/static/route/indexTemplate/save.html +++ b/src/main/resources/static/route/indextemplate/save.html @@ -40,6 +40,12 @@ +
+ +
+ +
+
diff --git a/src/main/resources/static/route/indexTemplate/update.html b/src/main/resources/static/route/indextemplate/update.html similarity index 95% rename from src/main/resources/static/route/indexTemplate/update.html rename to src/main/resources/static/route/indextemplate/update.html index b19c912..ec2ea3b 100644 --- a/src/main/resources/static/route/indexTemplate/update.html +++ b/src/main/resources/static/route/indextemplate/update.html @@ -40,6 +40,12 @@
+
+ +
+ +
+
diff --git a/src/main/resources/static/route/partyPunishInfo/list.html b/src/main/resources/static/route/partypunishinfo/list.html similarity index 99% rename from src/main/resources/static/route/partyPunishInfo/list.html rename to src/main/resources/static/route/partypunishinfo/list.html index 8c92fd2..763ce42 100644 --- a/src/main/resources/static/route/partyPunishInfo/list.html +++ b/src/main/resources/static/route/partypunishinfo/list.html @@ -293,7 +293,7 @@ area: ['80%', '80%'], shadeClose: true, anim: 2, - content: top.restAjax.path('route/partyPunishInfo/show.html?reportId={reportId}', + content: top.restAjax.path('route/partypunishinfo/show.html?reportId={reportId}', [obj.data.reportId]), end: function() { reloadTable(); diff --git a/src/main/resources/static/route/partyPunishInfo/save.html b/src/main/resources/static/route/partypunishinfo/save.html similarity index 100% rename from src/main/resources/static/route/partyPunishInfo/save.html rename to src/main/resources/static/route/partypunishinfo/save.html diff --git a/src/main/resources/static/route/partyPunishInfo/show.html b/src/main/resources/static/route/partypunishinfo/show.html similarity index 100% rename from src/main/resources/static/route/partyPunishInfo/show.html rename to src/main/resources/static/route/partypunishinfo/show.html diff --git a/src/main/resources/static/route/partyPunishInfo/update.html b/src/main/resources/static/route/partypunishinfo/update.html similarity index 100% rename from src/main/resources/static/route/partyPunishInfo/update.html rename to src/main/resources/static/route/partypunishinfo/update.html diff --git a/src/main/resources/static/route/problemClue/list.html b/src/main/resources/static/route/problemclue/list.html similarity index 99% rename from src/main/resources/static/route/problemClue/list.html rename to src/main/resources/static/route/problemclue/list.html index 346654b..f0612fd 100644 --- a/src/main/resources/static/route/problemClue/list.html +++ b/src/main/resources/static/route/problemclue/list.html @@ -391,7 +391,7 @@ area: ['80%', '80%'], shadeClose: true, anim: 2, - content: top.restAjax.path('route/problemClue/show.html?reportId={reportId}', + content: top.restAjax.path('route/problemclue/show.html?reportId={reportId}', [obj.data.reportId]), end: function() { reloadTable(); diff --git a/src/main/resources/static/route/problemClue/save.html b/src/main/resources/static/route/problemclue/save.html similarity index 100% rename from src/main/resources/static/route/problemClue/save.html rename to src/main/resources/static/route/problemclue/save.html diff --git a/src/main/resources/static/route/problemClue/show.html b/src/main/resources/static/route/problemclue/show.html similarity index 100% rename from src/main/resources/static/route/problemClue/show.html rename to src/main/resources/static/route/problemclue/show.html diff --git a/src/main/resources/static/route/problemClue/update.html b/src/main/resources/static/route/problemclue/update.html similarity index 100% rename from src/main/resources/static/route/problemClue/update.html rename to src/main/resources/static/route/problemclue/update.html diff --git a/src/main/resources/static/route/superviseCheck/list.html b/src/main/resources/static/route/supervisecheck/list.html similarity index 99% rename from src/main/resources/static/route/superviseCheck/list.html rename to src/main/resources/static/route/supervisecheck/list.html index dc9569b..4e556f8 100644 --- a/src/main/resources/static/route/superviseCheck/list.html +++ b/src/main/resources/static/route/supervisecheck/list.html @@ -293,7 +293,7 @@ area: ['80%', '80%'], shadeClose: true, anim: 2, - content: top.restAjax.path('route/superviseCheck/show.html?reportId={reportId}', + content: top.restAjax.path('route/supervisecheck/show.html?reportId={reportId}', [obj.data.reportId]), end: function() { reloadTable(); diff --git a/src/main/resources/static/route/superviseCheck/save.html b/src/main/resources/static/route/supervisecheck/save.html similarity index 100% rename from src/main/resources/static/route/superviseCheck/save.html rename to src/main/resources/static/route/supervisecheck/save.html diff --git a/src/main/resources/static/route/superviseCheck/show.html b/src/main/resources/static/route/supervisecheck/show.html similarity index 100% rename from src/main/resources/static/route/superviseCheck/show.html rename to src/main/resources/static/route/supervisecheck/show.html diff --git a/src/main/resources/static/route/superviseCheck/update.html b/src/main/resources/static/route/supervisecheck/update.html similarity index 100% rename from src/main/resources/static/route/superviseCheck/update.html rename to src/main/resources/static/route/supervisecheck/update.html diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index e91ea55..0d346cb 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -19,7 +19,7 @@
首页 -

乡镇街道综合办公平台

+

${systemTitle}