diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtPersonnelBlackController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtPersonnelBlackController.java index 45a14e2..793a81e 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtPersonnelBlackController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtPersonnelBlackController.java @@ -9,6 +9,7 @@ import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.security.annotation.RequiresPermissions; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; @@ -32,6 +33,7 @@ public class TtPersonnelBlackController extends BaseController { private TtPersonnelBlackService ttPersonnelBlackService; @ApiOperation(value = "查询人员黑名单列表") + @RequiresPermissions("tt:personnelBlack:list") @PostMapping("/getTtPersonnelBlackList") public TableDataInfo getTtPersonnelBlackList(@RequestBody TtPersonnelBlackReqVo ttPersonnelBlackReqVo) { try { @@ -45,6 +47,7 @@ public class TtPersonnelBlackController extends BaseController { } @ApiOperation(value = "查询人员黑名单详情") + @RequiresPermissions("tt:personnelBlack:query") @PostMapping("/getTtPersonnelBlackById") public AjaxResult getTtPersonnelBlackById(@RequestBody TtPersonnelBlackReqVo ttPersonnelBlackReqVo) { try { @@ -58,6 +61,7 @@ public class TtPersonnelBlackController extends BaseController { } @ApiOperation(value = "新增人员黑名单") + @RequiresPermissions("tt:personnelBlack:add") @PostMapping("/addTtPersonnelBlack") public AjaxResult addTtPersonnelBlack(@RequestBody TtPersonnelBlackVo ttPersonnelBlackVo) { try { @@ -71,6 +75,7 @@ public class TtPersonnelBlackController extends BaseController { } @ApiOperation(value = "修改人员黑名单") + @RequiresPermissions("tt:personnelBlack:update") @PostMapping("/updateTtPersonnelBlack") public AjaxResult updateTtPersonnelBlack(@RequestBody TtPersonnelBlackVo ttPersonnelBlackVo) { try { @@ -84,6 +89,7 @@ public class TtPersonnelBlackController extends BaseController { } @ApiOperation(value = "删除人员黑名单") + @RequiresPermissions("tt:personnelBlack:del") @PostMapping("/delTtPersonnelBlack") public AjaxResult delTtPersonnelBlack(@RequestBody TtPersonnelBlackVo ttPersonnelBlackVo) { try { @@ -97,6 +103,7 @@ public class TtPersonnelBlackController extends BaseController { } @ApiOperation(value = "人员黑名单导出") + @RequiresPermissions("tt:personnelBlack:export") @PostMapping("/ttPersonnelBlackExport") public void ttPersonnelBlackExport(HttpServletResponse response, @RequestBody TtPersonnelBlackReqVo ttPersonnelBlackReqVo) { try { diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtProjectSingleController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtProjectSingleController.java index 0d67abd..1666296 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtProjectSingleController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtProjectSingleController.java @@ -6,6 +6,7 @@ import com.bonus.base.basic.domain.TtSysTeamReqVo; import com.bonus.base.basic.domain.vo.TtProjectSingleVo; import com.bonus.base.basic.domain.vo.TtSysTeamVo; import com.bonus.base.basic.service.TtProjectSingleService; +import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -46,7 +48,7 @@ public class TtProjectSingleController extends BaseController { } @ApiOperation(value = "查询单项工程详情") - @RequiresPermissions("tt:single:attr") + @RequiresPermissions("tt:single:query") @PostMapping("/ttProjectSingleById") public AjaxResult ttProjectSingleById(@RequestBody TtProjectSingleReqVo ttProjectSingleReqVo) { try { @@ -98,4 +100,17 @@ public class TtProjectSingleController extends BaseController { } } + @ApiOperation(value = "导出单项工程") + @RequiresPermissions("tt:single:export") + @PostMapping("/ttProjectSingleExport") + public void ttProjectSingleExport(HttpServletResponse response, @RequestBody TtProjectSingleReqVo ttProjectSingleReqVo) { + try { + List ttProjectSingleList = ttProjectSingleService.ttProjectSingleList(ttProjectSingleReqVo); + ExcelUtil util = new ExcelUtil(TtProjectSingleVo.class); + util.exportExcel(response, ttProjectSingleList, "班组"); + }catch (Exception e){ + log.info("删除单项工程失败",e.getMessage()); + } + } + } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysTeamController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysTeamController.java index 8c8f559..3e10797 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysTeamController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysTeamController.java @@ -9,6 +9,7 @@ import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.security.annotation.RequiresPermissions; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -31,6 +32,7 @@ public class TtSysTeamController extends BaseController { private TtSysTeamService ttSysTeamService; @ApiOperation(value = "查询班组列表") + @RequiresPermissions("tt:sysTeam:list") @PostMapping("/getTtSysTeamList") public TableDataInfo getTtSysTeamList(@RequestBody TtSysTeamReqVo ttSysTeamReqVo) { try { @@ -44,6 +46,7 @@ public class TtSysTeamController extends BaseController { } @ApiOperation(value = "班组详情") + @RequiresPermissions("tt:sysTeam:query") @PostMapping("/getTtSysTeamById") public AjaxResult getTtSysTeamById(@RequestBody TtSysTeamReqVo ttSysTeamReqVo) { try { @@ -56,6 +59,7 @@ public class TtSysTeamController extends BaseController { } @ApiOperation(value = "新增班组") + @RequiresPermissions("tt:sysTeam:add") @PostMapping("/addTtSysTeam") public AjaxResult addTtSysTeam(@RequestBody TtSysTeamVo ttSysTeamVo) { try { @@ -69,6 +73,7 @@ public class TtSysTeamController extends BaseController { @ApiOperation(value = "班组修改") + @RequiresPermissions("tt:sysTeam:update") @PostMapping("/updateTtSysTeam") public AjaxResult updateTtSysTeam(@RequestBody TtSysTeamVo ttSysTeamVo) { try { @@ -81,6 +86,7 @@ public class TtSysTeamController extends BaseController { } @ApiOperation(value = "班组解散") + @RequiresPermissions("tt:sysTeam:del") @PostMapping("/deleteTtSysTeam") public AjaxResult deleteTtSysTeam(@RequestBody TtSysTeamVo ttSysTeamVo) { try { @@ -92,6 +98,7 @@ public class TtSysTeamController extends BaseController { } } @ApiOperation(value = "班组导出") + @RequiresPermissions("tt:personnelBlack:export") @PostMapping("/ttSysTeamExport") public void ttSysTeamExport(HttpServletResponse response, @RequestBody TtSysTeamReqVo ttSysTeamReqVo) { try { diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysUserCheckController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysUserCheckController.java index 71850b2..7a9aa1e 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysUserCheckController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysUserCheckController.java @@ -7,6 +7,7 @@ import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.security.annotation.RequiresPermissions; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; @@ -31,6 +32,7 @@ public class TtSysUserCheckController extends BaseController { private TtSysUserCheckService ttSysUserCheckService; @ApiOperation(value = "查询人员考勤列表") + @RequiresPermissions("tt:userCheck:list") @PostMapping("/getTtSysUserCheckList") public TableDataInfo getTtSysUserCheckList(@RequestBody TtSysUserCheckReqVo ttSysUserCheckReqVo) { try { @@ -44,6 +46,7 @@ public class TtSysUserCheckController extends BaseController { } @ApiOperation(value = "查询人员考勤详情") + @RequiresPermissions("tt:userCheck:query") @PostMapping("/getTtSysUserCheckById") public AjaxResult getTtSysUserCheckById(@RequestBody TtSysUserCheckReqVo ttSysUserCheckReqVo) { try { @@ -57,6 +60,7 @@ public class TtSysUserCheckController extends BaseController { } @ApiOperation(value = "新增人员考勤信息") + @RequiresPermissions("tt:userCheck:add") @PostMapping("/addTtSysUserCheck") public AjaxResult addTtSysUserCheck(@RequestBody TtSysUserCheckVo ttSysUserCheckVo) { try { @@ -70,6 +74,7 @@ public class TtSysUserCheckController extends BaseController { } @ApiOperation(value = "删除人员考勤信息") + @RequiresPermissions("tt:userCheck:del") @PostMapping("/delTtSysUserCheck") public AjaxResult delTtSysUserCheck(@RequestBody TtSysUserCheckReqVo ttSysUserCheckReqVo) { try { @@ -82,20 +87,22 @@ public class TtSysUserCheckController extends BaseController { } } - @ApiOperation(value = "删除人员考勤信息") + @ApiOperation(value = "修改人员考勤信息") + @RequiresPermissions("tt:userCheck:del") @PostMapping("/updateTtSysUserCheck") public AjaxResult updateTtSysUserCheck(@RequestBody TtSysUserCheckVo ttSysUserCheckVo) { try { ttSysUserCheckService.updateTtSysUserCheck(ttSysUserCheckVo); - return success("删除人员考勤信息成功"); + return success("修改人员考勤信息成功"); }catch (Exception e){ log.info("新增人员考勤失败",e.getMessage()); - return error("删除人员考勤失败"); + return error("修改人员考勤失败"); } } @ApiOperation(value = "人员考勤导出") + @RequiresPermissions("tt:userCheck:export") @PostMapping("/ttSysUserCheckExport") public void ttSysUserCheckExport(HttpServletResponse response, @RequestBody TtSysUserCheckReqVo ttSysUserCheckReqVo) { try { diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysUserController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysUserController.java index 821d6c2..0751d3f 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysUserController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysUserController.java @@ -10,6 +10,7 @@ import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.security.annotation.RequiresPermissions; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; @@ -33,6 +34,7 @@ public class TtSysUserController extends BaseController { private TtSysUserService ttSysUserService; @ApiOperation(value = "查询人员列表") + @RequiresPermissions("tt:sysUser:list") @PostMapping("/getTtSysUserList") public TableDataInfo getTtSysUserList(@RequestBody TtSysUserReqVo ttSysUserReqVo) { try { @@ -46,6 +48,7 @@ public class TtSysUserController extends BaseController { } @ApiOperation(value = "获取人员详情") + @RequiresPermissions("tt:sysUser:query") @PostMapping("/getTtSysUserById") public AjaxResult getTtSysUserById(@RequestBody TtSysUserReqVo ttSysUserReqVo) { try { @@ -58,6 +61,7 @@ public class TtSysUserController extends BaseController { } @ApiOperation(value = "新增人员") + @RequiresPermissions("tt:sysUser:add") @PostMapping("/addTtSysUser") public AjaxResult addTtSysUser(@RequestBody TtSysUserVo ttSysUserVo) { try { @@ -70,6 +74,7 @@ public class TtSysUserController extends BaseController { } @ApiOperation(value = "修改人员信息") + @RequiresPermissions("tt:sysUser:update") @PostMapping("/updateTtSysUser") public AjaxResult updateTtSysUser(@RequestBody TtSysUserVo ttSysUserVo) { try { @@ -82,6 +87,7 @@ public class TtSysUserController extends BaseController { } @ApiOperation(value = "修改人员状态") + @RequiresPermissions("tt:sysUser:update") @PostMapping("/updateTtSysUserStatus") public AjaxResult updateTtSysUserStatus(@RequestBody TtSysUserVo ttSysUserVo) { try { @@ -94,6 +100,7 @@ public class TtSysUserController extends BaseController { } @ApiOperation(value = "删除人员") + @RequiresPermissions("tt:sysUser:del") @PostMapping("/deleteTtSysUser") public AjaxResult deleteTtSysUser(@RequestBody TtSysUserVo ttSysUserVo) { try { @@ -106,6 +113,7 @@ public class TtSysUserController extends BaseController { } @ApiOperation(value = "人员信息导出") + @RequiresPermissions("tt:sysUser:export") @PostMapping("/ttSysUserExport") public void ttSysUserExport(HttpServletResponse response, @RequestBody TtSysUserReqVo ttSysUserReqVo) { try { diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/TtProjectSingleVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/TtProjectSingleVo.java index 7a5415f..60dfd14 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/TtProjectSingleVo.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/TtProjectSingleVo.java @@ -1,6 +1,7 @@ package com.bonus.base.basic.domain.vo; +import com.bonus.common.core.annotation.Excel; import lombok.Data; @Data @@ -14,6 +15,7 @@ public class TtProjectSingleVo { /** * 单项工程名称 */ + @Excel(name = "单项工程名称", sort = 1) private String projectSingleName; /** @@ -24,26 +26,31 @@ public class TtProjectSingleVo { /** * 单项工程编码 */ + @Excel(name = "单项工程编码", sort = 2) private String projectSingleCode; /** * 安全编码 */ + @Excel(name = "安全编码", sort = 3) private String safeCode; /** * 单项工程类型 */ + @Excel(name = "单项工程类型", sort = 4) private String projectType; /** * 单项明细类型 */ + @Excel(name = "单项明细类型", sort = 5) private String detailType; /** * 工程状态 */ + @Excel(name = "工程状态", sort = 6) private String projectStatus; /** @@ -54,11 +61,13 @@ public class TtProjectSingleVo { /** * 电压等级 */ + @Excel(name = "电压等级", sort = 7) private String voltageLevel; /** * 建设性质 */ + @Excel(name = "建设性质", sort = 8) private String constructionNature; /** @@ -69,11 +78,13 @@ public class TtProjectSingleVo { /** * 省公司名称 */ + @Excel(name = "省公司名称", sort = 9) private String provincialCompany; /** * 建管单位名称 */ + @Excel(name = "建管单位名称", sort = 10) private String constructionManagement; /** @@ -84,6 +95,7 @@ public class TtProjectSingleVo { /** * 项目地址 */ + @Excel(name = "项目地址", sort = 11) private String address; /** @@ -94,6 +106,7 @@ public class TtProjectSingleVo { /** * 线路长度 */ + @Excel(name = "线路长度", sort = 12) private String lineLength; /**