bonus
/
bns-zhgd-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
haozq 2025-04-14 09:36:01 +08:00
parent 58ee50c389 c0466eb9e7
commit c7a6bfeea3
11 changed files with 403 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/DevController.java
View File

@ -2,11 +2,13 @@ package com.bonus.base.basic.controller;
import com.bonus.base.basic.domain.vo.DeviceVo;
import com.bonus.base.basic.service.IDevService;
import com.bonus.base.common.annotation.PreventRepeatSubmit;
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.log.annotation.SysLog;
import com.bonus.common.log.enums.OperaType;
import com.bonus.common.security.annotation.RequiresPermissions;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@ -26,7 +28,7 @@ public class DevController extends BaseController {
private IDevService service;
@ApiOperation(value = "查询设备数据")
// @RequiresPermissions("basic:dev:list")
@RequiresPermissions("basic:dev:list")
@SysLog(title = "设备管理", businessType = OperaType.QUERY, logType = 1,module = "设备管理->查询设备数据")
@GetMapping("queryDevList")
public TableDataInfo queryDevList(DeviceVo vo) {
@ -37,7 +39,7 @@ public class DevController extends BaseController {
@ApiOperation(value = "新增设备")
// @PreventRepeatSubmit
// @RequiresPermissions("basic:dev:add")
@RequiresPermissions("basic:dev:add")
@SysLog(title = "设备管理", businessType = OperaType.INSERT, logType = 1,module = "设备管理->新增设备")
@PostMapping("addDev")
public AjaxResult addDev(@RequestBody DeviceVo vo) {
@ -52,7 +54,7 @@ public class DevController extends BaseController {
@ApiOperation(value = "修改设备")
// @PreventRepeatSubmit
// @RequiresPermissions("basic:dev:edit")
@RequiresPermissions("basic:dev:edit")
@SysLog(title = "设备管理", businessType = OperaType.UPDATE, logType = 1,module = "设备管理->修改设备")
@PostMapping("editDev")
public AjaxResult editDev(@RequestBody DeviceVo vo) {
@ -61,7 +63,7 @@ public class DevController extends BaseController {
@ApiOperation(value = "删除设备")
// @PreventRepeatSubmit
// @RequiresPermissions("basic:dev:del")
@RequiresPermissions("basic:dev:del")
@SysLog(title = "设备管理", businessType = OperaType.UPDATE, logType = 1,module = "设备管理->删除设备")
@PostMapping("delDev")
public AjaxResult delDev(@RequestBody DeviceVo vo) {

6
bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysTeamController.java
View File

@ -38,7 +38,7 @@ public class TtSysTeamController extends BaseController {
List<TtSysTeamVo> ttSysTeamVoList = ttSysTeamService.getTtSysTeamList(ttSysTeamReqVo);
return getDataTable(ttSysTeamVoList);
}catch (Exception e){
log.info("查询列表失败",e.getMessage());
return getDataTableError(null);
}
}
@ -50,6 +50,7 @@ public class TtSysTeamController extends BaseController {
TtSysTeamVo ttSysTeamVo = ttSysTeamService.getTtSysTeamById(ttSysTeamReqVo);
return success(ttSysTeamVo);
}catch (Exception e){
log.info("查询详情失败",e.getMessage());
return error("查询失败");
}
}
@ -61,6 +62,7 @@ public class TtSysTeamController extends BaseController {
ttSysTeamService.addTtSysTeam(ttSysTeamVo);
return success("新增班组成功");
}catch (Exception e){
log.info("新增班组失败",e.getMessage());
return error("新增班组失败");
}
}
@ -73,6 +75,7 @@ public class TtSysTeamController extends BaseController {
ttSysTeamService.updateTtSysTeam(ttSysTeamVo);
return success("修改班组成功");
}catch (Exception e){
log.info("修改班组失败",e.getMessage());
return error("修改班组失败");
}
}
@ -84,6 +87,7 @@ public class TtSysTeamController extends BaseController {
ttSysTeamService.deleteTtSysTeam(ttSysTeamVo);
return success("解散班组成功");
}catch (Exception e){
log.info("解散班组失败",e.getMessage());
return error("解散班组失败");
}
}

109
bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysUserCheckController.java Normal file
View File

@ -0,0 +1,109 @@
package com.bonus.base.basic.controller;
import com.bonus.base.basic.domain.TtSysUserCheckReqVo;
import com.bonus.base.basic.domain.vo.TtSysUserCheckVo;
import com.bonus.base.basic.service.TtSysUserCheckService;
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 io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
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;
/**
* 人员考勤
*/
@Slf4j
@RestController
@RequestMapping("/ttSysUserCheck")
public class TtSysUserCheckController extends BaseController {
@Resource
private TtSysUserCheckService ttSysUserCheckService;
@ApiOperation(value = "查询人员考勤列表")
@PostMapping("/getTtSysUserCheckList")
public TableDataInfo getTtSysUserCheckList(@RequestBody TtSysUserCheckReqVo ttSysUserCheckReqVo) {
try {
startPage();
List<TtSysUserCheckVo> ttSysUserCheckList = ttSysUserCheckService.getTtSysUserCheckList(ttSysUserCheckReqVo);
return getDataTable(ttSysUserCheckList);
}catch (Exception e){
log.info("查询人员考勤列表失败",e.getMessage());
return getDataTableError(null);
}
}
@ApiOperation(value = "查询人员考勤详情")
@PostMapping("/getTtSysUserCheckById")
public AjaxResult getTtSysUserCheckById(@RequestBody TtSysUserCheckReqVo ttSysUserCheckReqVo) {
try {
TtSysUserCheckVo ttSysUserCheck = ttSysUserCheckService.getTtSysUserCheckById(ttSysUserCheckReqVo);
return success(ttSysUserCheck);
}catch (Exception e){
log.info("查询人员考勤详情失败",e.getMessage());
return error("查询人员考勤详情失败");
}
}
@ApiOperation(value = "新增人员考勤信息")
@PostMapping("/addTtSysUserCheck")
public AjaxResult addTtSysUserCheck(@RequestBody TtSysUserCheckVo ttSysUserCheckVo) {
try {
ttSysUserCheckService.addTtSysUserCheck(ttSysUserCheckVo);
return success("新增人员考勤成功");
}catch (Exception e){
log.info("新增人员考勤失败",e.getMessage());
return error("新增人员考勤失败");
}
}
@ApiOperation(value = "删除人员考勤信息")
@PostMapping("/delTtSysUserCheck")
public AjaxResult delTtSysUserCheck(@RequestBody TtSysUserCheckReqVo ttSysUserCheckReqVo) {
try {
ttSysUserCheckService.delTtSysUserCheck(ttSysUserCheckReqVo);
return success("删除人员考勤信息成功");
}catch (Exception e){
log.info("新增人员考勤失败",e.getMessage());
return error("删除人员考勤失败");
}
}
@ApiOperation(value = "删除人员考勤信息")
@PostMapping("/updateTtSysUserCheck")
public AjaxResult updateTtSysUserCheck(@RequestBody TtSysUserCheckVo ttSysUserCheckVo) {
try {
ttSysUserCheckService.updateTtSysUserCheck(ttSysUserCheckVo);
return success("删除人员考勤信息成功");
}catch (Exception e){
log.info("新增人员考勤失败",e.getMessage());
return error("删除人员考勤失败");
}
}
@ApiOperation(value = "人员考勤导出")
@PostMapping("/ttSysUserCheckExport")
public void ttSysUserCheckExport(HttpServletResponse response, @RequestBody TtSysUserCheckReqVo ttSysUserCheckReqVo) {
try {
List<TtSysUserCheckVo> ttSysUserCheckList = ttSysUserCheckService.getTtSysUserCheckList(ttSysUserCheckReqVo);
ExcelUtil<TtSysUserCheckVo> util = new ExcelUtil<TtSysUserCheckVo>(TtSysUserCheckVo.class);
util.exportExcel(response, ttSysUserCheckList, "人员信息");
}catch (Exception e){
log.info("导出失败",e.getMessage());
}
}
}

21
bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/TtSysUserController.java
View File

@ -40,7 +40,7 @@ public class TtSysUserController extends BaseController {
List<TtSysUserVo> ttSysUserVoList = ttSysUserService.getTtSysUserList(ttSysUserReqVo);
return getDataTable(ttSysUserVoList);
}catch (Exception e){
log.info("查询人员列表失败",e.getMessage());
return getDataTableError(null);
}
}
@ -52,7 +52,8 @@ public class TtSysUserController extends BaseController {
TtSysUserVo ttSysUserVo = ttSysUserService.getTtSysUserById(ttSysUserReqVo);
return success(ttSysUserVo);
}catch (Exception e){
return error("查询失败");
log.info("获取人员详情失败",e.getMessage());
return error("获取人员详情失败");
}
}
@ -61,9 +62,10 @@ public class TtSysUserController extends BaseController {
public AjaxResult addTtSysUser(@RequestBody TtSysUserVo ttSysUserVo) {
try {
ttSysUserService.addTtSysUser(ttSysUserVo);
return success("新增成功");
return success("新增人员成功");
}catch (Exception e){
return error("新增失败");
log.info("新增人员失败",e.getMessage());
return error("新增人员失败");
}
}
@ -72,9 +74,10 @@ public class TtSysUserController extends BaseController {
public AjaxResult updateTtSysUser(@RequestBody TtSysUserVo ttSysUserVo) {
try {
ttSysUserService.updateTtSysUser(ttSysUserVo);
return success("修改成功");
return success("修改人员成功");
}catch (Exception e){
return error("修改失败");
log.info("修改人员失败",e.getMessage());
return error("修改人员失败");
}
}
@ -83,9 +86,10 @@ public class TtSysUserController extends BaseController {
public AjaxResult updateTtSysUserStatus(@RequestBody TtSysUserVo ttSysUserVo) {
try {
ttSysUserService.updateTtSysUserStatus(ttSysUserVo);
return success("修改成功");
return success("修改人员状态成功");
}catch (Exception e){
return error("修改失败");
log.info("修改人员状态失败",e.getMessage());
return error("修改人员状态失败");
}
}
@ -96,6 +100,7 @@ public class TtSysUserController extends BaseController {
ttSysUserService.deleteTtSysUser(ttSysUserVo);
return success("删除成功");
}catch (Exception e){
log.info("删除失败",e.getMessage());
return error("删除失败");
}
}

10
bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/controller/UnitController.java
View File

@ -2,11 +2,13 @@ package com.bonus.base.basic.controller;
import com.bonus.base.basic.domain.vo.UnitVo;
import com.bonus.base.basic.service.IUnitService;
import com.bonus.base.common.annotation.PreventRepeatSubmit;
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.log.annotation.SysLog;
import com.bonus.common.log.enums.OperaType;
import com.bonus.common.security.annotation.RequiresPermissions;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@ -30,7 +32,7 @@ public class UnitController extends BaseController {
private IUnitService service;
@ApiOperation(value = "查询单位数据")
// @RequiresPermissions("basic:unit:list")
@RequiresPermissions("basic:unit:list")
@SysLog(title = "单位管理", businessType = OperaType.QUERY, logType = 1,module = "单位管理->查询单位数据")
@GetMapping("queryUnitList")
public TableDataInfo queryUnitList(UnitVo vo) {
@ -41,7 +43,7 @@ public class UnitController extends BaseController {
@ApiOperation(value = "新增单位")
// @PreventRepeatSubmit
// @RequiresPermissions("basic:unit:add")
@RequiresPermissions("basic:unit:add")
@SysLog(title = "单位管理", businessType = OperaType.INSERT, logType = 1,module = "单位管理->新增单位")
@PostMapping("addUnit")
public AjaxResult addUnit(@RequestBody UnitVo vo) {
@ -56,7 +58,7 @@ public class UnitController extends BaseController {
@ApiOperation(value = "修改单位")
// @PreventRepeatSubmit
// @RequiresPermissions("basic:unit:edit")
@RequiresPermissions("basic:unit:edit")
@SysLog(title = "单位管理", businessType = OperaType.UPDATE, logType = 1,module = "单位管理->修改单位")
@PostMapping("editUnit")
public AjaxResult editUnit(@RequestBody UnitVo vo) {
@ -65,7 +67,7 @@ public class UnitController extends BaseController {
@ApiOperation(value = "删除单位")
// @PreventRepeatSubmit
// @RequiresPermissions("basic:unit:del")
@RequiresPermissions("basic:unit:del")
@SysLog(title = "单位管理", businessType = OperaType.UPDATE, logType = 1,module = "单位管理->删除单位")
@PostMapping("delUnit")
public AjaxResult delUnit(@RequestBody UnitVo vo) {

33
bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/TtSysUserCheckReqVo.java Normal file
View File

@ -0,0 +1,33 @@
package com.bonus.base.basic.domain;
import lombok.Data;
@Data
public class TtSysUserCheckReqVo {
/**
*id
*/
private String id;
/**
*名称
*/
private String name;
/**
*照片
*/
private String photo;
/**
*单位
*/
private String unitName;
/**
*单位
*/
private String keyWord;
}

54
bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/vo/TtSysUserCheckVo.java Normal file
View File

@ -0,0 +1,54 @@
package com.bonus.base.basic.domain.vo;
import com.bonus.common.core.annotation.Excel;
import lombok.Data;
@Data
public class TtSysUserCheckVo {
/**
*id
*/
private String id;
/**
*名称
*/
@Excel(name = "名称", sort = 1)
private String name;
/**
*照片
*/
private String photo;
/**
*单位
*/
@Excel(name = "单位", sort = 2)
private String unitName;
/**
*打卡时间
*/
@Excel(name = "打卡时间", sort = 3)
private String createTime;
/**
*班组
*/
@Excel(name = "班组", sort = 4)
private String workTeam;
/**
*设备序列表
*/
@Excel(name = "设备序列表", sort = 5)
private String devCode;
/**
*删除状态
*/
private Integer delFlag;
}

16
bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/mapper/TtSysUserCheckMapper.java Normal file
View File

@ -0,0 +1,16 @@
package com.bonus.base.basic.mapper;
import com.bonus.base.basic.domain.TtSysUserCheckReqVo;
import com.bonus.base.basic.domain.vo.TtSysUserCheckVo;
import java.util.List;
public interface TtSysUserCheckMapper {
List<TtSysUserCheckVo> getTtSysUserCheckList(TtSysUserCheckReqVo ttSysUserCheckReqVo);
void addTtSysUserCheck(TtSysUserCheckVo ttSysUserCheckVo);
void delTtSysUserCheck(TtSysUserCheckReqVo ttSysUserCheckReqVo);
void updateTtSysUserCheck(TtSysUserCheckVo ttSysUserCheckVo);
}

40
bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/TtSysUserCheckService.java Normal file
View File

@ -0,0 +1,40 @@
package com.bonus.base.basic.service;
import com.bonus.base.basic.domain.TtSysUserCheckReqVo;
import com.bonus.base.basic.domain.vo.TtSysUserCheckVo;
import java.util.List;
public interface TtSysUserCheckService {
/**
* 查询人员考勤列表
* @param ttSysUserCheckReqVo
* @return
*/
List<TtSysUserCheckVo> getTtSysUserCheckList(TtSysUserCheckReqVo ttSysUserCheckReqVo);
/**
* 查询人员考勤详情
* @param ttSysUserCheckReqVo
* @return
*/
TtSysUserCheckVo getTtSysUserCheckById(TtSysUserCheckReqVo ttSysUserCheckReqVo);
/**
* 新增考勤信息
* @param ttSysUserCheckVo
*/
void addTtSysUserCheck(TtSysUserCheckVo ttSysUserCheckVo);
/**
* 删除考勤信息
* @param ttSysUserCheckReqVo
*/
void delTtSysUserCheck(TtSysUserCheckReqVo ttSysUserCheckReqVo);
/**
* 修改考勤信息
* @param ttSysUserCheckVo
*/
void updateTtSysUserCheck(TtSysUserCheckVo ttSysUserCheckVo);
}

67
bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/service/impl/TtSysUserCheckServiceImpl.java Normal file
View File

@ -0,0 +1,67 @@
package com.bonus.base.basic.service.impl;
import com.bonus.base.basic.domain.TtSysUserCheckReqVo;
import com.bonus.base.basic.domain.vo.TtSysUserCheckVo;
import com.bonus.base.basic.mapper.TtSysUserCheckMapper;
import com.bonus.base.basic.service.TtSysUserCheckService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@Slf4j
@Service
public class TtSysUserCheckServiceImpl implements TtSysUserCheckService {
@Resource
private TtSysUserCheckMapper ttSysUserCheckMapper;
/**
* 查询人员考勤列表
* @param ttSysUserCheckReqVo
* @return
*/
@Override
public List<TtSysUserCheckVo> getTtSysUserCheckList(TtSysUserCheckReqVo ttSysUserCheckReqVo) {
return ttSysUserCheckMapper.getTtSysUserCheckList(ttSysUserCheckReqVo);
}
/**
* 查询人员考勤详情
* @param ttSysUserCheckReqVo
* @return
*/
@Override
public TtSysUserCheckVo getTtSysUserCheckById(TtSysUserCheckReqVo ttSysUserCheckReqVo) {
return ttSysUserCheckMapper.getTtSysUserCheckList(ttSysUserCheckReqVo).get(0);
}
/**
* 新增考勤信息
* @param ttSysUserCheckVo
*/
@Override
public void addTtSysUserCheck(TtSysUserCheckVo ttSysUserCheckVo) {
ttSysUserCheckMapper.addTtSysUserCheck(ttSysUserCheckVo);
}
/**
* 删除考勤信息
* @param ttSysUserCheckReqVo
*/
@Override
public void delTtSysUserCheck(TtSysUserCheckReqVo ttSysUserCheckReqVo) {
ttSysUserCheckMapper.delTtSysUserCheck(ttSysUserCheckReqVo);
}
/**
* 修改考勤信息
* @param ttSysUserCheckVo
*/
@Override
public void updateTtSysUserCheck(TtSysUserCheckVo ttSysUserCheckVo) {
ttSysUserCheckMapper.updateTtSysUserCheck(ttSysUserCheckVo);
}
}

54
bonus-modules/bonus-base/src/main/resources/mapper/smartsite/basic/TtSysUserCheckMapper.xml Normal file
View File

@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.base.basic.mapper.TtSysUserCheckMapper">
<insert id="addTtSysUserCheck" useGeneratedKeys="true" keyProperty="id">
insert into tt_sys_user_check
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="name != null and name != ''">name,</if>
<if test="photo != null">photo,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="createTime != null">create_time,</if>
<if test="workTeam != null and workTeam != ''">work_team,</if>
<if test="devCode != null and devCode != ''">dev_code,</if>
del_flag
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null and name != ''">#{name},</if>
<if test="photo != null">#{photo},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="createTime != null">#{createTime},</if>
<if test="workTeam != null and workTeam != ''">#{workTeam},</if>
<if test="devCode != null and devCode != ''">#{devCode},</if>
1
</trim>
</insert>
<update id="updateTtSysUserCheck">
update tt_sys_user_check
<trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if>
<if test="photo != null">photo = #{photo},</if>
<if test="unitName != null">unit_name = #{unitName},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="workTeam != null">work_team = #{workTeam},</if>
<if test="devCode != null">dev_code = #{devCode},</if>
</trim>
where id = #{id}
</update>
<delete id="delTtSysUserCheck">
update tt_sys_user_check set del_flag = 0
where id = #{id}
</delete>
<select id="getTtSysUserCheckList" resultType="com.bonus.base.basic.domain.vo.TtSysUserCheckVo">
select id as id,name as name,photo as photo,unit_name as unitName,create_time as createTime,
work_team as workTeam,dev_code as devCode
from tt_sys_user_check where del_flag = 1
<if test="id != '' and id != null"> and id = #{id}</if>
<if test="name != '' and name != null"> and name = #{name}</if>
<if test="unitName != '' and unitName != null"> and unit_name = #{unitName}</if>
<if test="workTeam != '' and workTeam != null"> and work_team = #{workTeam}</if>
</select>
</mapper>