1.添加权限码

This commit is contained in:
方亮 2025-08-19 15:04:59 +08:00
parent a6dd3fa008
commit 23a62f8992
8 changed files with 72 additions and 94 deletions

View File

@ -41,9 +41,9 @@ public class BmWorkerAttController extends BaseController {
* 查询列表-分公司
* @param o
* @return
* , requiresPermissions = @RequiresPermissions("system:workerLight:list")
*
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false))
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:att:list"))
@GetMapping("/getSubComAttList")
@SysLog(title = "考勤统计", businessType = OperaType.QUERY, logType = 0, module = "施工人员->考勤管理->考勤统计", details = "分公司考勤统计")
public TableDataInfo getSubComAttList(BmWorkerAtt o) {
@ -62,9 +62,8 @@ public class BmWorkerAttController extends BaseController {
* 查询列表-工程
* @param o
* @return
* , requiresPermissions = @RequiresPermissions("system:workerLight:list")
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false))
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:att:list"))
@GetMapping("/getProAttList")
@SysLog(title = "工程考勤统计", businessType = OperaType.QUERY, logType = 0, module = "施工人员->考勤管理->考勤统计", details = "工程考勤统计")
public TableDataInfo getProAttList(BmWorkerAtt o) {
@ -82,9 +81,8 @@ public class BmWorkerAttController extends BaseController {
* 班组考勤统计-工程
* @param o
* @return
* , requiresPermissions = @RequiresPermissions("system:workerLight:list")
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false))
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:att:list"))
@GetMapping("/getTeamAttList")
@SysLog(title = "班组考勤统计", businessType = OperaType.QUERY, logType = 0, module = "施工人员->考勤管理->考勤统计", details = "班组考勤统计")
public TableDataInfo getTeamAttList(BmWorkerAtt o) {
@ -102,9 +100,8 @@ public class BmWorkerAttController extends BaseController {
* 七日未打卡统计班组
* @param o
* @return
* , requiresPermissions = @RequiresPermissions("system:workerLight:list")
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false))
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:att:list"))
@GetMapping("/getSevenNotAttListByTeam")
@SysLog(title = "七日未打卡统计(班组)", businessType = OperaType.QUERY, logType = 0, module = "施工人员->考勤管理->考勤统计", details = "七日未打卡统计(班组)")
public TableDataInfo getSevenNotAttListByTeam(BmWorkerAtt o) {
@ -122,9 +119,8 @@ public class BmWorkerAttController extends BaseController {
* 查询列表-班组下人员列表
* @param o
* @return
* , requiresPermissions = @RequiresPermissions("system:workerLight:list")
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false))
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:att:list"))
@GetMapping("/getWorkerAttList")
@SysLog(title = "班组人员考勤统计", businessType = OperaType.QUERY, logType = 0, module = "施工人员->考勤管理->考勤统计", details = "班组人员考勤统计")
public TableDataInfo getWorkerAttList(BmWorkerAtt o) {
@ -142,9 +138,8 @@ public class BmWorkerAttController extends BaseController {
* 考勤统计列表-人员考勤明细
* @param o
* @return
* , requiresPermissions = @RequiresPermissions("system:workerLight:list")
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false))
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:att:list"))
@GetMapping("/getWorkerAttListById")
@SysLog(title = "单人人员考勤统计", businessType = OperaType.QUERY, logType = 0, module = "施工人员->考勤管理->考勤统计", details = "单人人员考勤统计")
public TableDataInfo getWorkerAttListById(BmWorkerAtt o) {
@ -161,7 +156,7 @@ public class BmWorkerAttController extends BaseController {
/**
* 考勤导出-工程维度
*/
@RequiresPermissions("att:pro:export")
@RequiresPermissions("worker:att:export")
@PostMapping("/attExportByPro")
@SysLog(title = "考勤导出-工程维度", businessType = OperaType.EXPORT, logType = 0, module = "施工人员->红绿灯管理->合同管理", details = "考勤导出-工程维度")
public void attExportByPro(HttpServletResponse response, BmWorkerAtt o) {
@ -182,9 +177,9 @@ public class BmWorkerAttController extends BaseController {
}
/**
* 考勤导出-工程维度
* 考勤导出-班组维度
*/
@RequiresPermissions("att:team:export")
@RequiresPermissions("worker:att:export")
@PostMapping("/attExportByTeam")
@SysLog(title = "考勤导出-班组维度", businessType = OperaType.EXPORT, logType = 0, module = "施工人员->考勤管理->考勤统计", details = "考勤导出-班组维度")
public void attExportByTeam(HttpServletResponse response, BmWorkerAtt o) {
@ -207,7 +202,7 @@ public class BmWorkerAttController extends BaseController {
/**
* 考勤导出-人员统计维度
*/
@RequiresPermissions("att:worker:export")
@RequiresPermissions("worker:att:export")
@PostMapping("/attExportByWorker")
@SysLog(title = "考勤导出-人员统计维度", businessType = OperaType.EXPORT, logType = 0, module = "施工人员->考勤管理->考勤统计", details = "考勤导出-人员统计维度")
public void attExportByWorker(HttpServletResponse response, BmWorkerAtt o) {
@ -230,7 +225,7 @@ public class BmWorkerAttController extends BaseController {
/**
* 考勤导出-人员统计维度
*/
@RequiresPermissions("att:worker:export")
@RequiresPermissions("worker:att:export")
@PostMapping("/attExportByWorkerMsg")
@SysLog(title = "考勤导出-人员详情维度", businessType = OperaType.EXPORT, logType = 0, module = "施工人员->考勤管理->考勤统计", details = "考勤导出-人员详情维度")
public void attExportByWorkerMsg(HttpServletResponse response, BmWorkerAtt o) {
@ -253,7 +248,7 @@ public class BmWorkerAttController extends BaseController {
/**
* 考勤导出-连续七天未打卡
*/
@RequiresPermissions("att:worker:export")
@RequiresPermissions("worker:att:export")
@PostMapping("/attExportBySevenNotAtt")
@SysLog(title = "考勤导出-连续七天未打卡", businessType = OperaType.EXPORT, logType = 0, module = "施工人员->考勤管理->考勤统计", details = "考勤导出-连续七天未打卡")
public void attExportBySevenNotAtt(HttpServletResponse response, BmWorkerAtt o) {

View File

@ -9,6 +9,7 @@ import com.bonus.common.core.web.page.TableDataInfo;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.log.enums.OperaType;
import com.bonus.common.security.annotation.InnerAuth;
import com.bonus.common.security.annotation.RequiresPermissions;
import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth;
import com.bonus.common.security.utils.SecurityUtils;
import org.springframework.validation.annotation.Validated;
@ -22,7 +23,7 @@ import java.util.ArrayList;
import java.util.List;
/**
* 人员黑名单失信人员
* 失信人员
*
* @author fly
*/
@ -39,9 +40,8 @@ public class BmWorkerBlackController extends BaseController {
* 查询列表-黑名单人员
* @param o
* @return
* , requiresPermissions = @RequiresPermissions("system:workerLight:list")
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false))
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:black:list"))
@GetMapping("/getWorkerBlackList")
@SysLog(title = "人员黑名单", businessType = OperaType.QUERY, logType = 0, module = "施工人员->红绿灯管理->红绿灯统计", details = "黑名单人员列表")
public TableDataInfo getWorkerBlackList(BmWorkerBlack o) {
@ -60,7 +60,7 @@ public class BmWorkerBlackController extends BaseController {
* @param o
* @return
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:black:insert"))
@PostMapping("/insert")
@SysLog(title = "人员入场管理", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员入场管理", details = "黑名单人员添加")
public AjaxResult insert(@Validated @RequestBody BmWorkerBlack o) {
@ -77,8 +77,7 @@ public class BmWorkerBlackController extends BaseController {
* @param o
* @return
*/
//, requiresPermissions = @RequiresPermissions("system:workerBlack:edit")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:black:query"))
@PostMapping("/remove/{id}")
@SysLog(title = "人员黑名单", businessType = OperaType.QUERY, logType = 0, module = "施工人员->红绿灯管理->人员黑名单", details = "黑名单人员解除")
public AjaxResult edit(@PathVariable("id") String idNumber) {
@ -94,7 +93,7 @@ public class BmWorkerBlackController extends BaseController {
/**
* 失信人员导出
*/
// @RequiresPermissions("system:user:export")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:black:export"))
@PostMapping("/workerBlackExport")
@SysLog(title = "失信人员导出", businessType = OperaType.EXPORT, logType = 0, module = "施工人员->红绿灯管理->失信人员管理", details = "失信人员导出")
public void export(HttpServletResponse response, BmWorkerBlack o) {
@ -110,6 +109,7 @@ public class BmWorkerBlackController extends BaseController {
/**
* 导入数据
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:black:import"))
@PostMapping("/workerBlackImport")
@SysLog(title = "失信人员导入", businessType = OperaType.IMPORT, logType = 0, module = "施工人员->红绿灯管理->失信人员管理", details = "失信人员导入")
public AjaxResult workerEinImport(MultipartFile file, boolean updateSupport) throws Exception {

View File

@ -31,7 +31,7 @@ import java.util.List;
import java.util.stream.Collectors;
/**
* 人员合同信息表(bm_worker_contract)表控制层
* 人员合同
*
* @author fly
*/
@ -48,9 +48,8 @@ public class BmWorkerContractController extends BaseController {
* 查询列表
* @param o
* @return
* , requiresPermissions = @RequiresPermissions("system:contract:list")
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false))
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:contract:list"))
@GetMapping("/list")
@SysLog(title = "合同管理", businessType = OperaType.QUERY, logType = 0, module = "施工人员->红绿灯管理->合同管理", details = "查询合同列表")
public TableDataInfo list(BmWorkerContract o) {
@ -68,9 +67,9 @@ public class BmWorkerContractController extends BaseController {
* 查询单人列表
* @param o
* @return
* , requiresPermissions = @RequiresPermissions("system:contract:list")
*
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false))
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:contract:list"))
@GetMapping("/workerList")
@SysLog(title = "合同管理", businessType = OperaType.QUERY, logType = 0, module = "施工人员->红绿灯管理->合同管理", details = "查询单人合同列表")
public TableDataInfo workerList(BmWorkerContract o) {
@ -87,8 +86,7 @@ public class BmWorkerContractController extends BaseController {
/**
* 合同获取详细信息
*/
//, requiresPermissions = @RequiresPermissions("system:contract:query")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:contract:query"))
@GetMapping({ "/{id}"})
public AjaxResult getInfo(@PathVariable(value = "id") Integer id) {
try {
@ -108,8 +106,7 @@ public class BmWorkerContractController extends BaseController {
/**
* 修改合同信息
*/
//, requiresPermissions = @RequiresPermissions("system:contract:edit")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:contract:edit"))
@PostMapping("/edit")
@SysLog(title = "合同管理", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->红绿灯管理->合同管理", details = "修改合同")
public AjaxResult edit(@RequestParam(value = "files") MultipartFile[] files,@RequestParam(value = "fileMsg") String fileMsg, @RequestParam(value = "params")String params) {
@ -130,8 +127,7 @@ public class BmWorkerContractController extends BaseController {
/**
* 删除合同信息
*/
//, requiresPermissions = @RequiresPermissions("system:contract:remove")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:contract:del"))
@PostMapping("/delete/{id}")
@SysLog(title = "合同管理", businessType = OperaType.DELETE, logType = 0, module = "施工人员->红绿灯管理->合同管理", details = "删除合同")
public AjaxResult remove(@PathVariable("id") Integer id) {
@ -146,8 +142,7 @@ public class BmWorkerContractController extends BaseController {
/**
* 单独查看文件
*/
//, requiresPermissions = @RequiresPermissions("system:contract:remove")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:contract:lookFile"))
@PostMapping("/lookFile/{id}")
@SysLog(title = "合同管理", businessType = OperaType.QUERY, logType = 0, module = "施工人员->红绿灯管理->合同管理", details = "单独查看文件")
public AjaxResult lookFile(@PathVariable("id") Integer id) {
@ -164,7 +159,7 @@ public class BmWorkerContractController extends BaseController {
/**
* 合同信息导出
*/
// @RequiresPermissions("system:user:export")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:contract:export"))
@PostMapping("/contractExport")
@SysLog(title = "合同信息导出", businessType = OperaType.EXPORT, logType = 0, module = "施工人员->红绿灯管理->合同管理", details = "合同信息导出")
public void export(HttpServletResponse response, BmWorkerContract o) {

View File

@ -9,6 +9,7 @@ import com.bonus.common.core.web.page.TableDataInfo;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.log.enums.OperaType;
import com.bonus.common.security.annotation.InnerAuth;
import com.bonus.common.security.annotation.RequiresPermissions;
import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth;
import org.springframework.web.bind.annotation.*;
@ -35,9 +36,9 @@ public class BmWorkerLightController extends BaseController {
* 查询列表-分公司
* @param o
* @return
* , requiresPermissions = @RequiresPermissions("system:workerLight:list")
*
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false))
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:light:list"))
@GetMapping("/getSubComLightList")
@SysLog(title = "红绿灯统计", businessType = OperaType.QUERY, logType = 0, module = "施工人员->红绿灯管理->红绿灯统计", details = "分公司红绿灯统计")
public TableDataInfo getSubComLightList(BmWorkerLight o) {
@ -56,9 +57,8 @@ public class BmWorkerLightController extends BaseController {
* 查询列表-工程
* @param o
* @return
* , requiresPermissions = @RequiresPermissions("system:workerLight:list")
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false))
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:light:list"))
@GetMapping("/getProLightList")
@SysLog(title = "红绿灯统计", businessType = OperaType.QUERY, logType = 0, module = "施工人员->红绿灯管理->红绿灯统计", details = "工程红绿灯统计")
public TableDataInfo getProLightList(BmWorkerLight o) {
@ -76,9 +76,8 @@ public class BmWorkerLightController extends BaseController {
* 查询列表-人员
* @param o
* @return
* , requiresPermissions = @RequiresPermissions("system:workerLight:list")
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false))
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:light:list"))
@GetMapping("/getWorkerLightList")
@SysLog(title = "红绿灯统计", businessType = OperaType.QUERY, logType = 0, module = "施工人员->红绿灯管理->红绿灯统计", details = "人员红绿灯统计")
public TableDataInfo getWorkerLightList(BmWorkerLight o) {

View File

@ -1,10 +1,7 @@
package com.bonus.bmw.controller;
import com.bonus.bmw.domain.dto.FileBasicMsgDto;
import com.bonus.bmw.domain.dto.WebFileDto;
import com.bonus.bmw.domain.vo.BmWorkerContract;
import com.bonus.bmw.domain.vo.BmWorkerWageCard;
import com.bonus.bmw.domain.vo.PmWorker;
import com.bonus.bmw.service.BmWorkerWageCardService;
import com.bonus.common.core.utils.json.FastJsonHelper;
import com.bonus.common.core.utils.poi.ExcelUtil;
@ -14,6 +11,7 @@ import com.bonus.common.core.web.page.TableDataInfo;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.log.enums.OperaType;
import com.bonus.common.security.annotation.InnerAuth;
import com.bonus.common.security.annotation.RequiresPermissions;
import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -24,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
/**
* 人员工资卡信息表(bm_worker_wage_card)表控制层
* 人员工资卡
*
* @author fly
*/
@ -42,9 +40,9 @@ public class BmWorkerWageCardController extends BaseController {
* 查询列表
* @param o
* @return
* , requiresPermissions = @RequiresPermissions("system:wageCard:list")
*
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false))
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:wageCard:list"))
@GetMapping("/list")
@SysLog(title = "工资卡管理", businessType = OperaType.QUERY, logType = 0, module = "施工人员->红绿灯管理->工资卡管理", details = "查询工资卡列表")
public TableDataInfo list(BmWorkerWageCard o) {
@ -58,8 +56,7 @@ public class BmWorkerWageCardController extends BaseController {
return getDataTableError(new ArrayList<>());
}
//, requiresPermissions = @RequiresPermissions("system:wageCard:edit")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:wageCard:query"))
@PostMapping("/select/{id}")
@SysLog(title = "工资卡管理", businessType = OperaType.QUERY, logType = 0, module = "施工人员->红绿灯管理->工资卡管理", details = "查看工资卡")
public AjaxResult select(@PathVariable("id") Integer id) {
@ -74,8 +71,7 @@ public class BmWorkerWageCardController extends BaseController {
return error("系统异常,请联系管理员");
}
//, requiresPermissions = @RequiresPermissions("system:wageCard:edit")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:wageCard:edit"))
@PostMapping("/edit")
@SysLog(title = "工资卡管理", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->红绿灯管理->工资卡管理", details = "修改工资卡")
public AjaxResult edit(@RequestParam(value = "files",required = false) MultipartFile[] files, @RequestParam(value = "fileMsg",required = false) String fileMsg, @RequestParam(value = "params")String params) {
@ -97,8 +93,7 @@ public class BmWorkerWageCardController extends BaseController {
/**
* 单独查看文件
*/
//, requiresPermissions = @RequiresPermissions("system:contract:remove")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:wageCard:lookFile"))
@PostMapping("/lookFile/{id}")
@SysLog(title = "工资卡管理", businessType = OperaType.QUERY, logType = 0, module = "施工人员->红绿灯管理->工资卡管理", details = "单独查看文件")
public AjaxResult lookFile(@PathVariable("id") Integer id) {
@ -110,8 +105,7 @@ public class BmWorkerWageCardController extends BaseController {
return error("系统异常,请联系管理员");
}
//, requiresPermissions = @RequiresPermissions("system:wageCard:remove")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:wageCard:del"))
@PostMapping("/delete/{id}")
@SysLog(title = "工资卡管理", businessType = OperaType.DELETE, logType = 0, module = "施工人员->红绿灯管理->工资卡管理", details = "删除工资卡")
public AjaxResult remove(@PathVariable("id") Integer id) {
@ -128,8 +122,6 @@ public class BmWorkerWageCardController extends BaseController {
* @param id
* @return
*/
//, requiresPermissions = @RequiresPermissions("system:wageCard:remove")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@PostMapping("/light/{id}")
@SysLog(title = "工资卡管理", businessType = OperaType.DELETE, logType = 0, module = "施工人员->红绿灯管理->工资卡管理", details = "更新人员红绿灯")
public void light(@PathVariable("id") Integer id) {
@ -143,7 +135,7 @@ public class BmWorkerWageCardController extends BaseController {
/**
* 工资卡导出
*/
// @RequiresPermissions("system:user:export")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:wageCard:export"))
@PostMapping("/wageCardExport")
@SysLog(title = "工资卡导出", businessType = OperaType.EXPORT, logType = 0, module = "施工人员->红绿灯管理->合同管理", details = "工资卡导出")
public void export(HttpServletResponse response, BmWorkerWageCard o) {
@ -156,5 +148,4 @@ public class BmWorkerWageCardController extends BaseController {
}
}
}

View File

@ -17,6 +17,7 @@ import com.bonus.common.core.web.page.TableDataInfo;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.log.enums.OperaType;
import com.bonus.common.security.annotation.InnerAuth;
import com.bonus.common.security.annotation.RequiresPermissions;
import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth;
import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.system.api.domain.SysUser;
@ -34,9 +35,9 @@ import java.util.ArrayList;
import java.util.List;
/**
* 人员基础信息表(pm_worker)表控制层
* 人员入场
*
* @author xxxxx
* @author fly
*/
@RestController
@RequestMapping("/worker")
@ -51,9 +52,9 @@ public class PmWorkerController extends BaseController {
* 查询列表
* @param o
* @return
* , requiresPermissions = @RequiresPermissions("system:workerEin:list")
*
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false))
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:ein:list"))
@GetMapping("/list")
@SysLog(title = "人员入场管理", businessType = OperaType.QUERY, logType = 0, module = "施工人员->出入场管理->人员入场管理", details = "查询人员入场列表")
public TableDataInfo list(PmWorkerDto o) {
@ -67,9 +68,9 @@ public class PmWorkerController extends BaseController {
return getDataTableError(new ArrayList<>());
}
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:ein:insert"))
@PostMapping("/insert")
@SysLog(title = "人员入场管理", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员入场管理", details = "新增人员入场")
@SysLog(title = "新增人员入场", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员入场管理", details = "新增人员入场")
public AjaxResult insert(@RequestParam(value = "files") MultipartFile[] files,@RequestParam(value = "fileMsg") String fileMsg, @RequestParam(value = "params")String params) {
try {
List<WebFileDto> listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class);
@ -89,10 +90,10 @@ public class PmWorkerController extends BaseController {
return error("系统异常,请联系管理员");
}
//, requiresPermissions = @RequiresPermissions("system:wageCard:edit")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
//
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:ein:query"))
@PostMapping("/select/{id}")
@SysLog(title = "人员入场管理", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员入场管理", details = "修改人员入场")
@SysLog(title = "人员入场管理", businessType = OperaType.QUERY, logType = 0, module = "施工人员->出入场管理->人员入场管理", details = "修改人员入场")
public AjaxResult select(@PathVariable("id") Integer id) {
try {
AjaxResult ajax = AjaxResult.success();
@ -105,8 +106,8 @@ public class PmWorkerController extends BaseController {
return error("系统异常,请联系管理员");
}
//, requiresPermissions = @RequiresPermissions("system:wageCard:edit")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:ein:edit"))
@PostMapping("/edit")
@SysLog(title = "人员入场管理", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员入场管理", details = "修改人员入场")
public AjaxResult edit(@RequestParam(value = "files",required = false) MultipartFile[] files,@RequestParam(value = "fileMsg",required = false) String fileMsg, @RequestParam(value = "params")String params) {
@ -131,8 +132,7 @@ public class PmWorkerController extends BaseController {
return error("系统异常,请联系管理员");
}
//, requiresPermissions = @RequiresPermissions("system:contract:remove")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:ein:del"))
@PostMapping("/delete/{id}")
@SysLog(title = "人员入场管理", businessType = OperaType.DELETE, logType = 0, module = "施工人员->出入场管理->人员入场管理", details = "删除人员")
public AjaxResult remove(@PathVariable("id") Integer id) {
@ -149,7 +149,7 @@ public class PmWorkerController extends BaseController {
* @param file
* @return
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:ein:face"))
@PostMapping("/faceDetection")
@SysLog(title = "人脸照片合格检测", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员入场管理", details = "人脸照片合格检测")
public AjaxResult faceDetection(@RequestParam(value = "file") MultipartFile file) {
@ -184,7 +184,7 @@ public class PmWorkerController extends BaseController {
/**
* 人员信息导出
*/
// @RequiresPermissions("system:user:export")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:ein:export"))
@PostMapping("/workerEinExport")
@SysLog(title = "人员信息导出", businessType = OperaType.EXPORT, logType = 0, module = "施工人员->红绿灯管理->入场管理", details = "人员信息导出")
public void export(HttpServletResponse response, PmWorkerDto o) {
@ -200,6 +200,7 @@ public class PmWorkerController extends BaseController {
/**
* 导入数据
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:ein:import"))
@PostMapping("/workerEinImport")
@SysLog(title = "人员信息导入", businessType = OperaType.IMPORT, logType = 0, module = "施工人员->红绿灯管理->入场管理", details = "人员信息导入")
public AjaxResult workerEinImport(MultipartFile file, boolean updateSupport) throws Exception {

View File

@ -15,6 +15,7 @@ import com.bonus.common.core.web.page.TableDataInfo;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.log.enums.OperaType;
import com.bonus.common.security.annotation.InnerAuth;
import com.bonus.common.security.annotation.RequiresPermissions;
import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -28,7 +29,7 @@ import java.util.List;
import java.util.stream.Collectors;
/**
* 人员基础信息表(pm_worker)表控制层
* 人员离场
*
* @author xxxxx
*/
@ -45,9 +46,8 @@ public class PmWorkerExitController extends BaseController {
* 查询列表
* @param o
* @return
* , requiresPermissions = @RequiresPermissions("system:workerEin:list")
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false))
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:exit:list"))
@GetMapping("/list")
@SysLog(title = "人员出场管理", businessType = OperaType.QUERY, logType = 0, module = "施工人员->出入场管理->人员出场管理", details = "查询人员出场列表")
public TableDataInfo list(PmWorkerDto o) {
@ -61,10 +61,9 @@ public class PmWorkerExitController extends BaseController {
return getDataTableError(new ArrayList<>());
}
//, requiresPermissions = @RequiresPermissions("system:workerExit:exit")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:exit:exit"))
@PostMapping("/exit")
@SysLog(title = "人员出场管理", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员出场管理", details = "人员出场")
@SysLog(title = "人员出场", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员出场管理", details = "人员出场")
public AjaxResult exit(@RequestParam(value = "files",required = false) MultipartFile[] files, @RequestParam(value = "fileMsg", required = false) String fileMsg, @RequestParam(value = "params")String params) {
try {
List<WebFileDto> listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class);
@ -84,9 +83,9 @@ public class PmWorkerExitController extends BaseController {
return error("系统异常,请联系管理员");
}
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:exit:batchExit"))
@PostMapping("/exit/batchExit")
@SysLog(title = "人员出场管理", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员出场管理", details = "批量人员出场")
@SysLog(title = "批量人员出场", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员出场管理", details = "批量人员出场")
public AjaxResult batchExit(@RequestBody List<PmWorkerDto> list) {
try {
return toAjax(service.updateWorkerBatchExit(list));
@ -100,11 +99,10 @@ public class PmWorkerExitController extends BaseController {
* 人员补文件
* @param
* @return
* , requiresPermissions = @RequiresPermissions("system:workerExit:batchExit")
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:exit:exit"))
@PostMapping("/exitFile")
@SysLog(title = "人员出场管理", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员出场管理", details = "人员出场")
@SysLog(title = "人员出场-补文件", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员出场管理", details = "人员出场-补文件")
public AjaxResult exitFile(@RequestParam(value = "files",required = false) MultipartFile[] files, @RequestParam(value = "fileMsg", required = false) String fileMsg, @RequestParam(value = "params")String params) {
try {
List<WebFileDto> listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class);
@ -123,8 +121,7 @@ public class PmWorkerExitController extends BaseController {
/**
* 单独查看文件
*/
//, requiresPermissions = @RequiresPermissions("system:contract:remove")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth)
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:exit:lookFile"))
@PostMapping("/lookFile/{id}")
@SysLog(title = "出场管理", businessType = OperaType.QUERY, logType = 0, module = "施工人员->红绿灯管理->出场管理", details = "单独查看文件")
public AjaxResult lookFile(@PathVariable("id") Integer id) {
@ -140,9 +137,8 @@ public class PmWorkerExitController extends BaseController {
* 查询单人历史列表
* @param o
* @return
* , requiresPermissions = @RequiresPermissions("system:workerExit:list")
*/
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false))
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:exit:list"))
@GetMapping("/workerList")
@SysLog(title = "人员出场管理", businessType = OperaType.QUERY, logType = 0, module = "施工人员->出入场管理->人员出场管理", details = "查询单人出场列表")
public TableDataInfo workerList(PmWorkerDto o) {
@ -159,7 +155,7 @@ public class PmWorkerExitController extends BaseController {
/**
* 人员离场信息导出
*/
// @RequiresPermissions("system:user:export")
@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:exit:export"))
@PostMapping("/workerExitExport")
@SysLog(title = "人员离场信息导出", businessType = OperaType.EXPORT, logType = 0, module = "施工人员->红绿灯管理->离场管理", details = "人员离场信息导出")
public void export(HttpServletResponse response, PmWorkerDto o) {

View File

@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.List;
/**
* 下拉选公用类
* @author fly
* @date 2025/8/19
*/