diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/DeviceClockRecordController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/DeviceClockRecordController.java new file mode 100644 index 0000000..e42ca96 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/DeviceClockRecordController.java @@ -0,0 +1,104 @@ +package com.zteits.urbanops.module.garden.controller.admin.device; + +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zteits.urbanops.framework.common.pojo.PageParam; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.pojo.CommonResult; +import com.zteits.urbanops.framework.common.util.object.BeanUtils; +import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; + +import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; + +import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog; +import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*; + +import com.zteits.urbanops.module.garden.controller.admin.device.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.device.DeviceClockRecordDO; +import com.zteits.urbanops.module.garden.service.device.DeviceClockRecordService; + +@Tag(name = "管理后台 - 员工打卡记录") +@RestController +@RequestMapping("/garden/device-clock-record") +@Validated +public class DeviceClockRecordController { + + @Resource + private DeviceClockRecordService deviceClockRecordService; + + @PostMapping("/create") + @Operation(summary = "创建员工打卡记录") + @PreAuthorize("@ss.hasPermission('garden:device-clock-record:create')") + public CommonResult createDeviceClockRecord(@Valid @RequestBody DeviceClockRecordSaveReqVO createReqVO) { + return success(deviceClockRecordService.createDeviceClockRecord(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新员工打卡记录") + @PreAuthorize("@ss.hasPermission('garden:device-clock-record:update')") + public CommonResult updateDeviceClockRecord(@Valid @RequestBody DeviceClockRecordSaveReqVO updateReqVO) { + deviceClockRecordService.updateDeviceClockRecord(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除员工打卡记录") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('garden:device-clock-record:delete')") + public CommonResult deleteDeviceClockRecord(@RequestParam("id") Integer id) { + deviceClockRecordService.deleteDeviceClockRecord(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除员工打卡记录") + @PreAuthorize("@ss.hasPermission('garden:device-clock-record:delete')") + public CommonResult deleteDeviceClockRecordList(@RequestParam("ids") List ids) { + deviceClockRecordService.deleteDeviceClockRecordListByIds(ids); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得员工打卡记录") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('garden:device-clock-record:query')") + public CommonResult getDeviceClockRecord(@RequestParam("id") Integer id) { + DeviceClockRecordDO deviceClockRecord = deviceClockRecordService.getDeviceClockRecord(id); + return success(BeanUtils.toBean(deviceClockRecord, DeviceClockRecordRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得员工打卡记录分页") + @PreAuthorize("@ss.hasPermission('garden:device-clock-record:query')") + public CommonResult> getDeviceClockRecordPage(@Valid DeviceClockRecordPageReqVO pageReqVO) { + PageResult pageResult = deviceClockRecordService.getDeviceClockRecordPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, DeviceClockRecordRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出员工打卡记录 Excel") + @PreAuthorize("@ss.hasPermission('garden:device-clock-record:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportDeviceClockRecordExcel(@Valid DeviceClockRecordPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = deviceClockRecordService.getDeviceClockRecordPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "员工打卡记录.xls", "数据", DeviceClockRecordRespVO.class, + BeanUtils.toBean(list, DeviceClockRecordRespVO.class)); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/vo/DeviceClockRecordPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/vo/DeviceClockRecordPageReqVO.java new file mode 100644 index 0000000..b0124b3 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/vo/DeviceClockRecordPageReqVO.java @@ -0,0 +1,66 @@ +package com.zteits.urbanops.module.garden.controller.admin.device.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.zteits.urbanops.framework.common.pojo.PageParam; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 员工打卡记录分页 Request VO") +@Data +public class DeviceClockRecordPageReqVO extends PageParam { + + @Schema(description = "设备编码") + private String deviceCode; + + @Schema(description = "设备名称", example = "李四") + private String deviceName; + + @Schema(description = "打卡类型：上班/下班", example = "2") + private String punchType; + + @Schema(description = "高德GCJ02坐标系纬度") + private BigDecimal latGcj02; + + @Schema(description = "高德GCJ02坐标系经度") + private BigDecimal lngGcj02; + + @Schema(description = "详细地址") + private String address; + + @Schema(description = "84坐标经度") + private BigDecimal lng; + + @Schema(description = "84坐标纬度") + private BigDecimal lat; + + @Schema(description = "状态位") + private Integer statusBit; + + @Schema(description = "警告位") + private Integer warnBit; + + @Schema(description = "提交人用户ID", example = "20708") + private Long userId; + + @Schema(description = "用户昵称", example = "张三") + private String nickname; + + @Schema(description = "归属(一级部门id)", example = "10917") + private Long companyId; + + @Schema(description = "部门ID", example = "126") + private Long deptId; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政;例如：yl,wy") + private String busiLine; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/vo/DeviceClockRecordRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/vo/DeviceClockRecordRespVO.java new file mode 100644 index 0000000..a01eae2 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/vo/DeviceClockRecordRespVO.java @@ -0,0 +1,84 @@ +package com.zteits.urbanops.module.garden.controller.admin.device.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import cn.idev.excel.annotation.*; + +@Schema(description = "管理后台 - 员工打卡记录 Response VO") +@Data +@ExcelIgnoreUnannotated +public class DeviceClockRecordRespVO { + + @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10971") + @ExcelProperty("主键ID") + private Integer id; + + @Schema(description = "设备编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("设备编码") + private String deviceCode; + + @Schema(description = "设备名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") + @ExcelProperty("设备名称") + private String deviceName; + + @Schema(description = "打卡类型：上班/下班", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @ExcelProperty("打卡类型：上班/下班") + private String punchType; + + @Schema(description = "高德GCJ02坐标系纬度") + @ExcelProperty("高德GCJ02坐标系纬度") + private BigDecimal latGcj02; + + @Schema(description = "高德GCJ02坐标系经度") + @ExcelProperty("高德GCJ02坐标系经度") + private BigDecimal lngGcj02; + + @Schema(description = "详细地址") + @ExcelProperty("详细地址") + private String address; + + @Schema(description = "84坐标经度") + @ExcelProperty("84坐标经度") + private BigDecimal lng; + + @Schema(description = "84坐标纬度") + @ExcelProperty("84坐标纬度") + private BigDecimal lat; + + @Schema(description = "状态位") + @ExcelProperty("状态位") + private Integer statusBit; + + @Schema(description = "警告位") + @ExcelProperty("警告位") + private Integer warnBit; + + @Schema(description = "提交人用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20708") + @ExcelProperty("提交人用户ID") + private Long userId; + + @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") + @ExcelProperty("用户昵称") + private String nickname; + + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "10917") + @ExcelProperty("归属(一级部门id)") + private Long companyId; + + @Schema(description = "部门ID", example = "126") + @ExcelProperty("部门ID") + private Long deptId; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政;例如：yl,wy", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("业务线: yl-园林；wy-物业：sz-市政;例如：yl,wy") + private String busiLine; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/vo/DeviceClockRecordSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/vo/DeviceClockRecordSaveReqVO.java new file mode 100644 index 0000000..909bdb7 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/vo/DeviceClockRecordSaveReqVO.java @@ -0,0 +1,68 @@ +package com.zteits.urbanops.module.garden.controller.admin.device.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import jakarta.validation.constraints.*; +import java.math.BigDecimal; + +@Schema(description = "管理后台 - 员工打卡记录新增/修改 Request VO") +@Data +public class DeviceClockRecordSaveReqVO { + + @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10971") + private Integer id; + + @Schema(description = "设备编码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "设备编码不能为空") + private String deviceCode; + + @Schema(description = "设备名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") + @NotEmpty(message = "设备名称不能为空") + private String deviceName; + + @Schema(description = "打卡类型：上班/下班", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotEmpty(message = "打卡类型：上班/下班不能为空") + private String punchType; + + @Schema(description = "高德GCJ02坐标系纬度") + private BigDecimal latGcj02; + + @Schema(description = "高德GCJ02坐标系经度") + private BigDecimal lngGcj02; + + @Schema(description = "详细地址") + private String address; + + @Schema(description = "84坐标经度") + private BigDecimal lng; + + @Schema(description = "84坐标纬度") + private BigDecimal lat; + + @Schema(description = "状态位") + private Integer statusBit; + + @Schema(description = "警告位") + private Integer warnBit; + + @Schema(description = "提交人用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20708") + @NotNull(message = "提交人用户ID不能为空") + private Long userId; + + @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") + @NotEmpty(message = "用户昵称不能为空") + private String nickname; + + @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "10917") + @NotNull(message = "归属(一级部门id)不能为空") + private Long companyId; + + @Schema(description = "部门ID", example = "126") + private Long deptId; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政;例如：yl,wy", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "业务线: yl-园林；wy-物业：sz-市政;例如：yl,wy不能为空") + private String busiLine; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java index ce25441..f2b0464 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java @@ -139,7 +139,7 @@ public class RoadController { reqVO.setRoadName(roadName); // 处理deptCode为空的情况 if (deptCode != null && !deptCode.isEmpty()) { - reqVO.setCompanyId(Long.valueOf(deptCode)); + reqVO.setDeptId(Long.valueOf(deptCode)); } reqVO.setBusiLine(companyCode); List roadList = roadService.getRoadList(reqVO); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadListReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadListReqVO.java index b6ce26f..6587982 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadListReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadListReqVO.java @@ -26,8 +26,11 @@ public class RoadListReqVO { @NotNull(message = "归属(一级部门id)不能为空") private Long companyId; + @Schema(description = "部门ID", example = "126") + private Long deptId; + @Schema(description = "业务看", example = "yl") @NotEmpty(message = "创建者不能为空") private String busiLine; -} \ No newline at end of file +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/device/DeviceClockRecordDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/device/DeviceClockRecordDO.java new file mode 100644 index 0000000..d25349b --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/device/DeviceClockRecordDO.java @@ -0,0 +1,96 @@ +package com.zteits.urbanops.module.garden.dal.dataobject.device; + +import lombok.*; +import java.util.*; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO; + +/** + * 员工打卡记录 DO + * + * @author 超级管理员 + */ +@TableName("garden_device_clock_record") +@KeySequence("garden_device_clock_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DeviceClockRecordDO extends BaseDO { + + /** + * 主键ID + */ + @TableId + private Integer id; + /** + * 设备编码 + */ + private String deviceCode; + /** + * 设备名称 + */ + private String deviceName; + /** + * 打卡类型：上班/下班 + */ + private String punchType; + /** + * 高德GCJ02坐标系纬度 + */ + private BigDecimal latGcj02; + /** + * 高德GCJ02坐标系经度 + */ + private BigDecimal lngGcj02; + /** + * 详细地址 + */ + private String address; + /** + * 84坐标经度 + */ + private BigDecimal lng; + /** + * 84坐标纬度 + */ + private BigDecimal lat; + /** + * 状态位 + */ + private Integer statusBit; + /** + * 警告位 + */ + private Integer warnBit; + /** + * 提交人用户ID + */ + private Long userId; + /** + * 用户昵称 + */ + private String nickname; + /** + * 归属(一级部门id) + */ + private Long companyId; + /** + * 部门ID + */ + private Long deptId; + /** + * 业务线: yl-园林；wy-物业：sz-市政;例如：yl,wy + */ + private String busiLine; + + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/device/DeviceClockRecordMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/device/DeviceClockRecordMapper.java new file mode 100644 index 0000000..9ac9972 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/device/DeviceClockRecordMapper.java @@ -0,0 +1,41 @@ +package com.zteits.urbanops.module.garden.dal.mysql.device; + +import java.util.*; + +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX; +import com.zteits.urbanops.module.garden.dal.dataobject.device.DeviceClockRecordDO; +import org.apache.ibatis.annotations.Mapper; +import com.zteits.urbanops.module.garden.controller.admin.device.vo.*; + +/** + * 员工打卡记录 Mapper + * + * @author 超级管理员 + */ +@Mapper +public interface DeviceClockRecordMapper extends BaseMapperX { + + default PageResult selectPage(DeviceClockRecordPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(DeviceClockRecordDO::getDeviceCode, reqVO.getDeviceCode()) + .likeIfPresent(DeviceClockRecordDO::getDeviceName, reqVO.getDeviceName()) + .eqIfPresent(DeviceClockRecordDO::getPunchType, reqVO.getPunchType()) + .eqIfPresent(DeviceClockRecordDO::getLatGcj02, reqVO.getLatGcj02()) + .eqIfPresent(DeviceClockRecordDO::getLngGcj02, reqVO.getLngGcj02()) + .eqIfPresent(DeviceClockRecordDO::getAddress, reqVO.getAddress()) + .eqIfPresent(DeviceClockRecordDO::getLng, reqVO.getLng()) + .eqIfPresent(DeviceClockRecordDO::getLat, reqVO.getLat()) + .eqIfPresent(DeviceClockRecordDO::getStatusBit, reqVO.getStatusBit()) + .eqIfPresent(DeviceClockRecordDO::getWarnBit, reqVO.getWarnBit()) + .eqIfPresent(DeviceClockRecordDO::getUserId, reqVO.getUserId()) + .likeIfPresent(DeviceClockRecordDO::getNickname, reqVO.getNickname()) + .eqIfPresent(DeviceClockRecordDO::getCompanyId, reqVO.getCompanyId()) + .eqIfPresent(DeviceClockRecordDO::getDeptId, reqVO.getDeptId()) + .eqIfPresent(DeviceClockRecordDO::getBusiLine, reqVO.getBusiLine()) + .betweenIfPresent(DeviceClockRecordDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(DeviceClockRecordDO::getId)); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/device/DeviceClockRecordService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/device/DeviceClockRecordService.java new file mode 100644 index 0000000..90f78fb --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/device/DeviceClockRecordService.java @@ -0,0 +1,62 @@ +package com.zteits.urbanops.module.garden.service.device; + +import java.util.*; +import jakarta.validation.*; +import com.zteits.urbanops.module.garden.controller.admin.device.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.device.DeviceClockRecordDO; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.pojo.PageParam; + +/** + * 员工打卡记录 Service 接口 + * + * @author 超级管理员 + */ +public interface DeviceClockRecordService { + + /** + * 创建员工打卡记录 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Integer createDeviceClockRecord(@Valid DeviceClockRecordSaveReqVO createReqVO); + + /** + * 更新员工打卡记录 + * + * @param updateReqVO 更新信息 + */ + void updateDeviceClockRecord(@Valid DeviceClockRecordSaveReqVO updateReqVO); + + /** + * 删除员工打卡记录 + * + * @param id 编号 + */ + void deleteDeviceClockRecord(Integer id); + + /** + * 批量删除员工打卡记录 + * + * @param ids 编号 + */ + void deleteDeviceClockRecordListByIds(List ids); + + /** + * 获得员工打卡记录 + * + * @param id 编号 + * @return 员工打卡记录 + */ + DeviceClockRecordDO getDeviceClockRecord(Integer id); + + /** + * 获得员工打卡记录分页 + * + * @param pageReqVO 分页查询 + * @return 员工打卡记录分页 + */ + PageResult getDeviceClockRecordPage(DeviceClockRecordPageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/device/DeviceClockRecordServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/device/DeviceClockRecordServiceImpl.java new file mode 100644 index 0000000..4fd4d26 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/device/DeviceClockRecordServiceImpl.java @@ -0,0 +1,85 @@ +package com.zteits.urbanops.module.garden.service.device; + +import cn.hutool.core.collection.CollUtil; +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import com.zteits.urbanops.module.garden.controller.admin.device.vo.*; +import com.zteits.urbanops.module.garden.dal.dataobject.device.DeviceClockRecordDO; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.pojo.PageParam; +import com.zteits.urbanops.framework.common.util.object.BeanUtils; + +import com.zteits.urbanops.module.garden.dal.mysql.device.DeviceClockRecordMapper; + +import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList; +import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.diffList; +import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*; + +/** + * 员工打卡记录 Service 实现类 + * + * @author 超级管理员 + */ +@Service +@Validated +public class DeviceClockRecordServiceImpl implements DeviceClockRecordService { + + @Resource + private DeviceClockRecordMapper deviceClockRecordMapper; + + @Override + public Integer createDeviceClockRecord(DeviceClockRecordSaveReqVO createReqVO) { + // 插入 + DeviceClockRecordDO deviceClockRecord = BeanUtils.toBean(createReqVO, DeviceClockRecordDO.class); + deviceClockRecordMapper.insert(deviceClockRecord); + + // 返回 + return deviceClockRecord.getId(); + } + + @Override + public void updateDeviceClockRecord(DeviceClockRecordSaveReqVO updateReqVO) { + // 校验存在 + validateDeviceClockRecordExists(updateReqVO.getId()); + // 更新 + DeviceClockRecordDO updateObj = BeanUtils.toBean(updateReqVO, DeviceClockRecordDO.class); + deviceClockRecordMapper.updateById(updateObj); + } + + @Override + public void deleteDeviceClockRecord(Integer id) { + // 校验存在 + validateDeviceClockRecordExists(id); + // 删除 + deviceClockRecordMapper.deleteById(id); + } + + @Override + public void deleteDeviceClockRecordListByIds(List ids) { + // 删除 + deviceClockRecordMapper.deleteByIds(ids); + } + + + private void validateDeviceClockRecordExists(Integer id) { + if (deviceClockRecordMapper.selectById(id) == null) { + throw exception(DEVICE_CLOCK_RECORD_NOT_EXISTS); + } + } + + @Override + public DeviceClockRecordDO getDeviceClockRecord(Integer id) { + return deviceClockRecordMapper.selectById(id); + } + + @Override + public PageResult getDeviceClockRecordPage(DeviceClockRecordPageReqVO pageReqVO) { + return deviceClockRecordMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java index 73703e3..f5d27ec 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java @@ -162,6 +162,9 @@ public class RoadServiceImpl implements RoadService { if (reqVO.getCompanyId() != null) { sql.lambda().eq(RoadDO::getCompanyId, reqVO.getCompanyId()); } + if (reqVO.getDeptId() != null) { + sql.lambda().eq(RoadDO::getDeptId, reqVO.getDeptId()); + } if (reqVO.getLevelId() != null) { sql.lambda().eq(RoadDO::getLevelId, reqVO.getLevelId()); } @@ -176,4 +179,4 @@ public class RoadServiceImpl implements RoadService { -} \ No newline at end of file +} diff --git a/urbanops-module-garden/src/main/resources/mapper/device/DeviceClockRecordMapper.xml b/urbanops-module-garden/src/main/resources/mapper/device/DeviceClockRecordMapper.xml new file mode 100644 index 0000000..a16b475 --- /dev/null +++ b/urbanops-module-garden/src/main/resources/mapper/device/DeviceClockRecordMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file