Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-api-cloud

2025-03-20 20:06:11 +08:00
commit a6c7ff821e
@@ -0,0 +1,124 @@
+package com.bsd.pjcloud.integrated.controller;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.common.security.util.SecurityUtils;
+import com.bsd.pjcloud.integrated.entity.LostAndFoundEntity;
+import com.bsd.pjcloud.integrated.service.LostAndFoundService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 失物招领
+ *
+ * @author zjf
+ * @date 2025-03-20 16:22:27
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/lostAndFound" )
+@Tag(description = "lostAndFound" , name = "失物招领管理" )
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class LostAndFoundController {
+
+    private final  LostAndFoundService lostAndFoundService;
+
+    /**
+     * 分页查询
+     * @param page 分页对象
+     * @param lostAndFound 失物招领
+     * @return
+     */
+    @Operation(summary = "分页查询" , description = "分页查询" )
+    @GetMapping("/page" )
+    @PreAuthorize("@pms.hasPermission('integrated_lostAndFound_view')" )
+    public R getLostAndFoundPage(@ParameterObject Page page, @ParameterObject LostAndFoundEntity lostAndFound) {
+        lostAndFound.setDeptId(SecurityUtils.getUser().getDeptId());
+        LambdaQueryWrapper<LostAndFoundEntity> wrapper = Wrappers.lambdaQuery();
+		wrapper.like(StrUtil.isNotBlank(lostAndFound.getTitle()),LostAndFoundEntity::getTitle,lostAndFound.getTitle());
+		wrapper.eq(StrUtil.isNotBlank(lostAndFound.getStatus()),LostAndFoundEntity::getStatus,lostAndFound.getStatus());
+        return R.ok(lostAndFoundService.page(page, wrapper));
+    }
+
+
+    /**
+     * 通过id查询失物招领
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id查询" , description = "通过id查询" )
+    @GetMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('integrated_lostAndFound_view')" )
+    public R getById(@PathVariable("id" ) Long id) {
+        return R.ok(lostAndFoundService.getById(id));
+    }
+
+    /**
+     * 新增失物招领
+     * @param lostAndFound 失物招领
+     * @return R
+     */
+    @Operation(summary = "新增失物招领" , description = "新增失物招领" )
+    @SysLog("新增失物招领" )
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('integrated_lostAndFound_add')" )
+    public R save(@RequestBody LostAndFoundEntity lostAndFound) {
+        return R.ok(lostAndFoundService.save(lostAndFound));
+    }
+
+    /**
+     * 修改失物招领
+     * @param lostAndFound 失物招领
+     * @return R
+     */
+    @Operation(summary = "修改失物招领" , description = "修改失物招领" )
+    @SysLog("修改失物招领" )
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('integrated_lostAndFound_edit')" )
+    public R updateById(@RequestBody LostAndFoundEntity lostAndFound) {
+        return R.ok(lostAndFoundService.updateById(lostAndFound));
+    }
+
+    /**
+     * 通过id删除失物招领
+     * @param ids id列表
+     * @return R
+     */
+    @Operation(summary = "通过id删除失物招领" , description = "通过id删除失物招领" )
+    @SysLog("通过id删除失物招领" )
+    @DeleteMapping
+    @PreAuthorize("@pms.hasPermission('integrated_lostAndFound_del')" )
+    public R removeById(@RequestBody Long[] ids) {
+        return R.ok(lostAndFoundService.removeBatchByIds(CollUtil.toList(ids)));
+    }
+
+
+    /**
+     * 导出excel 表格
+     * @param lostAndFound 查询条件
+   	 * @param ids 导出指定ID
+     * @return excel 文件流
+     */
+    @ResponseExcel
+    @GetMapping("/export")
+    @PreAuthorize("@pms.hasPermission('integrated_lostAndFound_export')" )
+    public List<LostAndFoundEntity> export(LostAndFoundEntity lostAndFound,Long[] ids) {
+        return lostAndFoundService.list(Wrappers.lambdaQuery(lostAndFound).in(ArrayUtil.isNotEmpty(ids), LostAndFoundEntity::getId, ids));
+    }
+}
@@ -0,0 +1,121 @@
+package com.bsd.pjcloud.integrated.controller;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.integrated.entity.MaintenanceOrderEntity;
+import com.bsd.pjcloud.integrated.service.MaintenanceOrderService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 维修工单主表
+ *
+ * @author zjf
+ * @date 2025-03-20 16:46:52
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/maintenanceOrder" )
+@Tag(description = "maintenanceOrder" , name = "维修工单主表管理" )
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class MaintenanceOrderController {
+
+    private final  MaintenanceOrderService maintenanceOrderService;
+
+    /**
+     * 分页查询
+     * @param page 分页对象
+     * @param maintenanceOrder 维修工单主表
+     * @return
+     */
+    @Operation(summary = "分页查询" , description = "分页查询" )
+    @GetMapping("/page" )
+    @PreAuthorize("@pms.hasPermission('integrated_maintenanceOrder_view')" )
+    public R getMaintenanceOrderPage(@ParameterObject Page page, @ParameterObject MaintenanceOrderEntity maintenanceOrder) {
+        LambdaQueryWrapper<MaintenanceOrderEntity> wrapper = Wrappers.lambdaQuery();
+		wrapper.eq(StrUtil.isNotBlank(maintenanceOrder.getTitle()),MaintenanceOrderEntity::getTitle,maintenanceOrder.getTitle());
+        return R.ok(maintenanceOrderService.page(page, wrapper));
+    }
+
+
+    /**
+     * 通过id查询维修工单主表
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id查询" , description = "通过id查询" )
+    @GetMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('integrated_maintenanceOrder_view')" )
+    public R getById(@PathVariable("id" ) Long id) {
+        return R.ok(maintenanceOrderService.getById(id));
+    }
+
+    /**
+     * 新增维修工单主表
+     * @param maintenanceOrder 维修工单主表
+     * @return R
+     */
+    @Operation(summary = "新增维修工单主表" , description = "新增维修工单主表" )
+    @SysLog("新增维修工单主表" )
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('integrated_maintenanceOrder_add')" )
+    public R save(@RequestBody MaintenanceOrderEntity maintenanceOrder) {
+        return R.ok(maintenanceOrderService.save(maintenanceOrder));
+    }
+
+    /**
+     * 修改维修工单主表
+     * @param maintenanceOrder 维修工单主表
+     * @return R
+     */
+    @Operation(summary = "修改维修工单主表" , description = "修改维修工单主表" )
+    @SysLog("修改维修工单主表" )
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('integrated_maintenanceOrder_edit')" )
+    public R updateById(@RequestBody MaintenanceOrderEntity maintenanceOrder) {
+        return R.ok(maintenanceOrderService.updateById(maintenanceOrder));
+    }
+
+    /**
+     * 通过id删除维修工单主表
+     * @param ids id列表
+     * @return R
+     */
+    @Operation(summary = "通过id删除维修工单主表" , description = "通过id删除维修工单主表" )
+    @SysLog("通过id删除维修工单主表" )
+    @DeleteMapping
+    @PreAuthorize("@pms.hasPermission('integrated_maintenanceOrder_del')" )
+    public R removeById(@RequestBody Long[] ids) {
+        return R.ok(maintenanceOrderService.removeBatchByIds(CollUtil.toList(ids)));
+    }
+
+
+    /**
+     * 导出excel 表格
+     * @param maintenanceOrder 查询条件
+   	 * @param ids 导出指定ID
+     * @return excel 文件流
+     */
+    @ResponseExcel
+    @GetMapping("/export")
+    @PreAuthorize("@pms.hasPermission('integrated_maintenanceOrder_export')" )
+    public List<MaintenanceOrderEntity> export(MaintenanceOrderEntity maintenanceOrder,Long[] ids) {
+        return maintenanceOrderService.list(Wrappers.lambdaQuery(maintenanceOrder).in(ArrayUtil.isNotEmpty(ids), MaintenanceOrderEntity::getId, ids));
+    }
+}
@@ -0,0 +1,123 @@
+package com.bsd.pjcloud.integrated.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.bsd.pjcloud.common.core.util.TenantTable;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 失物招领
+ *
+ * @author zjf
+ * @date 2025-03-20 16:22:27
+ */
+@Data
+@TenantTable
+@TableName("lost_and_found")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "失物招领")
+public class LostAndFoundEntity extends Model<LostAndFoundEntity> {
+
+
+	/**
+	* id
+	*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description="id")
+    private Long id;
+
+	/**
+	* 标题
+	*/
+    @Schema(description="标题")
+    private String title;
+
+	/**
+	* 图片
+	*/
+    @Schema(description="图片")
+    private String picUrl;
+
+	/**
+	* 排序
+	*/
+    @Schema(description="排序")
+    private Integer sort;
+
+	/**
+	* 描述
+	*/
+    @Schema(description="描述")
+    private String description;
+
+	/**
+	* 状态
+	*/
+    @Schema(description="状态")
+    private String status;
+
+	/**
+	* 发现日期
+	*/
+    @Schema(description="发现日期")
+    private LocalDate dateFound;
+
+	/**
+	* 部门id
+	*/
+    @Schema(description="部门id")
+    private Long deptId;
+
+	/**
+	* 发现地点
+	*/
+    @Schema(description="发现地点")
+    private String location;
+
+	/**
+	* 创建者
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建者")
+    private String createBy;
+
+	/**
+	* 创建时间
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建时间")
+    private LocalDateTime createTime;
+
+	/**
+	* 更新者
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="更新者")
+    private String updateBy;
+
+	/**
+	* 更新时间
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="更新时间")
+    private LocalDateTime updateTime;
+
+	/**
+	* 是否删除
+	*/
+    @TableLogic
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="是否删除")
+    private String delFlag;
+
+	/**
+	* 租户编号
+	*/
+    @Schema(description="租户编号")
+    private Long tenantId;
+}
@@ -0,0 +1,133 @@
+package com.bsd.pjcloud.integrated.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.bsd.pjcloud.common.core.util.TenantTable;
+import java.time.LocalDateTime;
+
+/**
+ * 维修工单主表
+ *
+ * @author zjf
+ * @date 2025-03-20 16:46:52
+ */
+@Data
+@TenantTable
+@TableName("maintenance_order")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "维修工单主表")
+public class MaintenanceOrderEntity extends Model<MaintenanceOrderEntity> {
+
+
+	/**
+	* id
+	*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description="id")
+    private Long id;
+
+	/**
+	* 标题
+	*/
+    @Schema(description="标题")
+    private String title;
+
+	/**
+	* 图片
+	*/
+    @Schema(description="图片")
+    private String picUrl;
+
+	/**
+	* 排序
+	*/
+    @Schema(description="排序")
+    private Integer sort;
+
+	/**
+	* 描述
+	*/
+    @Schema(description="描述")
+    private String description;
+
+	/**
+	* 状态
+	*/
+    @Schema(description="状态")
+    private String status;
+
+	/**
+	* 发现日期
+	*/
+    @Schema(description="发现日期")
+    private LocalDateTime dateFound;
+
+	/**
+	* 部门id
+	*/
+    @Schema(description="部门id")
+    private Long deptId;
+
+	/**
+	* 发现地点
+	*/
+    @Schema(description="发现地点")
+    private String location;
+
+	/**
+	* 工单紧急层度'high', 'medium', 'low'
+	*/
+    @Schema(description="工单紧急层度'high', 'medium', 'low'")
+    private String urgency;
+
+	/**
+	* 上报人
+	*/
+    @Schema(description="上报人")
+    private Long userId;
+
+	/**
+	* 创建者
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建者")
+    private String createBy;
+
+	/**
+	* 创建时间
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建时间")
+    private LocalDateTime createTime;
+
+	/**
+	* 更新者
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="更新者")
+    private String updateBy;
+
+	/**
+	* 更新时间
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="更新时间")
+    private LocalDateTime updateTime;
+
+	/**
+	* 是否删除
+	*/
+    @TableLogic
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="是否删除")
+    private String delFlag;
+
+	/**
+	* 租户编号
+	*/
+    @Schema(description="租户编号")
+    private Long tenantId;
+}
@@ -0,0 +1,11 @@
+package com.bsd.pjcloud.integrated.mapper;
+
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import com.bsd.pjcloud.integrated.entity.LostAndFoundEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface LostAndFoundMapper extends PjcloudBaseMapper<LostAndFoundEntity> {
+
+
+}
@@ -0,0 +1,11 @@
+package com.bsd.pjcloud.integrated.mapper;
+
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import com.bsd.pjcloud.integrated.entity.MaintenanceOrderEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MaintenanceOrderMapper extends PjcloudBaseMapper<MaintenanceOrderEntity> {
+
+
+}
@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.integrated.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.integrated.entity.LostAndFoundEntity;
+
+public interface LostAndFoundService extends IService<LostAndFoundEntity> {
+
+}
@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.integrated.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.integrated.entity.MaintenanceOrderEntity;
+
+public interface MaintenanceOrderService extends IService<MaintenanceOrderEntity> {
+
+}
@@ -0,0 +1,16 @@
+package com.bsd.pjcloud.integrated.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.integrated.entity.LostAndFoundEntity;
+import com.bsd.pjcloud.integrated.mapper.LostAndFoundMapper;
+import com.bsd.pjcloud.integrated.service.LostAndFoundService;
+import org.springframework.stereotype.Service;
+/**
+ * 失物招领
+ *
+ * @author zjf
+ * @date 2025-03-20 16:22:27
+ */
+@Service
+public class LostAndFoundServiceImpl extends ServiceImpl<LostAndFoundMapper, LostAndFoundEntity> implements LostAndFoundService {
+}
@@ -0,0 +1,16 @@
+package com.bsd.pjcloud.integrated.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.integrated.entity.MaintenanceOrderEntity;
+import com.bsd.pjcloud.integrated.mapper.MaintenanceOrderMapper;
+import com.bsd.pjcloud.integrated.service.MaintenanceOrderService;
+import org.springframework.stereotype.Service;
+/**
+ * 维修工单主表
+ *
+ * @author zjf
+ * @date 2025-03-20 16:46:52
+ */
+@Service
+public class MaintenanceOrderServiceImpl extends ServiceImpl<MaintenanceOrderMapper, MaintenanceOrderEntity> implements MaintenanceOrderService {
+}
@@ -22,4 +22,4 @@ spring:
 #      driver-class-name: com.mysql.cj.jdbc.Driver
 #      username: root
 #      password: root
-#      url: jdbc:mysql://pjcloud-mysql:3306/pjcloudx_supermarket_erp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true
+#      url: jdbc:mysql://pjcloud-mysql:3306/pjcloudx_integrated?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true
@@ -0,0 +1,23 @@
+<?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.bsd.pjcloud.integrated.mapper.LostAndFoundMapper">
+
+  <resultMap id="lostAndFoundMap" type="com.bsd.pjcloud.integrated.entity.LostAndFoundEntity">
+        <id property="id" column="id"/>
+        <result property="title" column="title"/>
+        <result property="picUrl" column="pic_url"/>
+        <result property="sort" column="sort"/>
+        <result property="description" column="description"/>
+        <result property="status" column="status"/>
+        <result property="dateFound" column="date_found"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="location" column="location"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="tenantId" column="tenant_id"/>
+  </resultMap>
+</mapper>
@@ -0,0 +1,25 @@
+<?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.bsd.pjcloud.integrated.mapper.MaintenanceOrderMapper">
+
+  <resultMap id="maintenanceOrderMap" type="com.bsd.pjcloud.integrated.entity.MaintenanceOrderEntity">
+        <id property="id" column="id"/>
+        <result property="title" column="title"/>
+        <result property="picUrl" column="pic_url"/>
+        <result property="sort" column="sort"/>
+        <result property="description" column="description"/>
+        <result property="status" column="status"/>
+        <result property="dateFound" column="date_found"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="location" column="location"/>
+        <result property="urgency" column="urgency"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="tenantId" column="tenant_id"/>
+  </resultMap>
+</mapper>