隐患初始化

platform-dao/src/main/java/com/platform/dao/dto/hidden/HiddenDangerDTO.java

@@ -0,0 +1,134 @@
+package com.platform.dao.dto.hidden;
+
+import com.platform.common.bean.BaseDTO;
+import com.platform.common.validation.group.UpdateGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+/**
+ * @Description 隐患管理表DTO
+ * @Author lsq
+ * @Date 2022-12-14 16:19:10
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class HiddenDangerDTO extends BaseDTO implements Serializable {
+
+    /**
+     * 主键ID
+     */
+    private String id;
+    /**
+     * 设备
+     */
+    private String sbId;
+    /**
+     * 设备位号
+     */
+    private String positionNo;
+    /**
+     * 检查区域
+     */
+    private String positionId;
+    /**
+     * 存在问题
+     */
+    private String existsQuestion;
+    /**
+     * 可能风险
+     */
+    private String hiddenRisk;
+    /**
+     * 整改建议
+     */
+    private String opition;
+    /**
+     * 整改责任人
+     */
+    private String dutyUser;
+    /**
+     * 属地负责人
+     */
+    private String areaUser;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 添加人ID
+     */
+    private String createdUserId;
+    /**
+     * 添加人
+     */
+    private String createdUserName;
+    /**
+     * 修改人ID
+     */
+    private String updateUserId;
+    /**
+     * 修改人
+     */
+    private String updateUserName;
+    /**
+     * 完成状态 closed,delay,on going
+     */
+    private Integer status;
+    /**
+     * 专业类型 仪表 电气 机械
+     */
+    private Integer professorType;
+    /**
+     * 检查级别  公司级-部门组织-专业自查
+     */
+    private Integer checkLevel;
+    /**
+     * 整改时限
+     */
+    private LocalDateTime requireTime;
+    /**
+     * 整改时限开始
+     */
+    private LocalDateTime requireTimeStart;
+    /**
+     * 整改时限结束
+     */
+    private LocalDateTime requireTimeEnd;
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+    /**
+     * 修改时间开始
+     */
+    private LocalDateTime updateTimeStart;
+    /**
+     * 修改时间结束
+     */
+    private LocalDateTime updateTimeEnd;
+    /**
+     * 添加时间
+     */
+    private LocalDateTime createdTime;
+    /**
+     * 添加时间开始
+     */
+    private LocalDateTime createdTimeStart;
+    /**
+     * 添加时间结束
+     */
+    private LocalDateTime createdTimeEnd;
+    /**
+     * 关键字
+     */
+    private String keyword;
+
+}

platform-dao/src/main/java/com/platform/dao/entity/hidden/HiddenDanger.java

@@ -0,0 +1,115 @@
+package com.platform.dao.entity.hidden;
+
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+import lombok.experimental.Accessors;
+import com.platform.common.bean.DataScope;
+
+import javax.persistence.Transient;
+
+/**
+ * @Description 隐患管理表实体类
+ * @Author lsq
+ * @Date 2022-12-14 16:19:10
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@Table(name = "t_hidden_danger")
+public class HiddenDanger implements Serializable {
+
+    /**
+     * 主键ID
+     */
+    @Id
+    private String id;
+    /**
+     * 设备
+     */
+    private String sbId;
+    /**
+     * 设备位号
+     */
+    private String positionNo;
+    /**
+     * 检查区域
+     */
+    private String positionId;
+    /**
+     * 存在问题
+     */
+    private String existsQuestion;
+    /**
+     * 可能风险
+     */
+    private String hiddenRisk;
+    /**
+     * 整改建议
+     */
+    private String opition;
+    /**
+     * 整改责任人
+     */
+    private String dutyUser;
+    /**
+     * 属地负责人
+     */
+    private String areaUser;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 添加人ID
+     */
+    private String createdUserId;
+    /**
+     * 添加人
+     */
+    private String createdUserName;
+    /**
+     * 修改人ID
+     */
+    private String updateUserId;
+    /**
+     * 修改人
+     */
+    private String updateUserName;
+    /**
+     * 完成状态 closed,delay,on going
+     */
+    private Integer status;
+    /**
+     * 专业类型 仪表 电气 机械
+     */
+    private Integer professorType;
+    /**
+     * 检查级别  公司级-部门组织-专业自查
+     */
+    private Integer checkLevel;
+    /**
+     * 整改时限
+     */
+    private LocalDateTime requireTime;
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+    /**
+     * 添加时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 数据权限
+     */
+    @Transient
+    private DataScope dataScope;
+
+}

platform-dao/src/main/java/com/platform/dao/mapper/hidden/HiddenDangerMapper.java

@@ -0,0 +1,26 @@
+package com.platform.dao.mapper.hidden;
+
+import com.platform.dao.dto.hidden.HiddenDangerDTO;
+import com.platform.dao.config.MyMapper;
+import com.platform.dao.entity.hidden.HiddenDanger;
+import com.platform.dao.vo.query.hidden.HiddenDangerVO;
+import org.springframework.stereotype.Component;
+import java.util.List;
+
+
+/**
+ * @Description 隐患管理表 mapper
+ * @Author lsq
+ * @Date 2022-12-14 16:19:10
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Component
+public interface HiddenDangerMapper extends MyMapper<HiddenDanger> {
+    /**
+     * 分页查询
+     * @param dto
+     * @return
+     */
+    List<HiddenDangerVO> selectList(HiddenDangerDTO dto);
+
+}

platform-dao/src/main/java/com/platform/dao/vo/export/hidden/ExportHiddenDangerVO.java

@@ -0,0 +1,142 @@
+package com.platform.dao.vo.export.hidden;
+
+import com.platform.office.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+/**
+ * @Description 隐患管理表导出VO
+ * @Author lsq
+ * @Date 2022-12-14 16:19:10
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+public class ExportHiddenDangerVO implements Serializable {
+
+    /**
+     * 主键ID
+     */
+    @Excel(name = "主键ID", orderNum = "1")
+    private String id;
+
+    /**
+     * 设备
+     */
+    @Excel(name = "设备", orderNum = "2")
+    private String sbId;
+
+    /**
+     * 设备位号
+     */
+    @Excel(name = "设备位号", orderNum = "3")
+    private String positionNo;
+
+    /**
+     * 检查区域
+     */
+    @Excel(name = "检查区域", orderNum = "4")
+    private String positionId;
+
+    /**
+     * 存在问题
+     */
+    @Excel(name = "存在问题", orderNum = "5")
+    private String existsQuestion;
+
+    /**
+     * 可能风险
+     */
+    @Excel(name = "可能风险", orderNum = "6")
+    private String hiddenRisk;
+
+    /**
+     * 整改建议
+     */
+    @Excel(name = "整改建议", orderNum = "7")
+    private String opition;
+
+    /**
+     * 整改责任人
+     */
+    @Excel(name = "整改责任人", orderNum = "8")
+    private String dutyUser;
+
+    /**
+     * 属地负责人
+     */
+    @Excel(name = "属地负责人", orderNum = "9")
+    private String areaUser;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", orderNum = "10")
+    private String remark;
+
+    /**
+     * 添加人ID
+     */
+    @Excel(name = "添加人ID", orderNum = "11")
+    private String createdUserId;
+
+    /**
+     * 添加人
+     */
+    @Excel(name = "添加人", orderNum = "12")
+    private String createdUserName;
+
+    /**
+     * 修改人ID
+     */
+    @Excel(name = "修改人ID", orderNum = "13")
+    private String updateUserId;
+
+    /**
+     * 修改人
+     */
+    @Excel(name = "修改人", orderNum = "14")
+    private String updateUserName;
+
+    /**
+     * 完成状态 closed,delay,on going
+     */
+    @Excel(name = "完成状态 closed,delay,on going", orderNum = "15")
+    private Integer status;
+
+    /**
+     * 专业类型 仪表 电气 机械
+     */
+    @Excel(name = "专业类型 仪表 电气 机械", orderNum = "16")
+    private Integer professorType;
+
+    /**
+     * 检查级别  公司级-部门组织-专业自查
+     */
+    @Excel(name = "检查级别  公司级-部门组织-专业自查", orderNum = "17")
+    private Integer checkLevel;
+
+    /**
+     * 整改时限
+     */
+    @Excel(name = "整改时限", orderNum = "18")
+    private LocalDateTime requireTime;
+
+    /**
+     * 修改时间
+     */
+    @Excel(name = "修改时间", orderNum = "19")
+    private LocalDateTime updateTime;
+
+    /**
+     * 添加时间
+     */
+    @Excel(name = "添加时间", orderNum = "20")
+    private LocalDateTime createdTime;
+
+
+}

platform-dao/src/main/java/com/platform/dao/vo/query/hidden/HiddenDangerVO.java

@@ -0,0 +1,108 @@
+package com.platform.dao.vo.query.hidden;
+
+import lombok.Data;
+import com.platform.common.bean.BaseVO;
+import com.platform.common.bean.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+/**
+ * @Description 隐患管理表VO结果类
+ * @Author lsq
+ * @Date 2022-12-14 16:19:10
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class HiddenDangerVO extends BaseVO implements Serializable {
+
+    /**
+     * 主键ID
+     */
+    private String id;
+    /**
+     * 设备
+     */
+    private String sbId;
+    /**
+     * 设备位号
+     */
+    private String positionNo;
+    /**
+     * 检查区域
+     */
+    private String positionId;
+    /**
+     * 存在问题
+     */
+    private String existsQuestion;
+    /**
+     * 可能风险
+     */
+    private String hiddenRisk;
+    /**
+     * 整改建议
+     */
+    private String opition;
+    /**
+     * 整改责任人
+     */
+    private String dutyUser;
+    /**
+     * 属地负责人
+     */
+    private String areaUser;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 添加人ID
+     */
+    private String createdUserId;
+    /**
+     * 添加人
+     */
+    private String createdUserName;
+    /**
+     * 修改人ID
+     */
+    private String updateUserId;
+    /**
+     * 修改人
+     */
+    private String updateUserName;
+    /**
+     * 完成状态 closed,delay,on going
+     */
+    private Integer status;
+    /**
+     * 专业类型 仪表 电气 机械
+     */
+    private Integer professorType;
+    /**
+     * 检查级别  公司级-部门组织-专业自查
+     */
+    private Integer checkLevel;
+    /**
+     * 整改时限
+     */
+    private LocalDateTime requireTime;
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+    /**
+     * 添加时间
+     */
+    private LocalDateTime createdTime;
+
+
+}

platform-rest/src/main/java/com/platform/rest/controller/hidden/HiddenDangerController.java

@@ -0,0 +1,141 @@
+package com.platform.rest.controller.hidden;
+
+import com.platform.common.util.R;
+import com.platform.dao.dto.hidden.HiddenDangerDTO;
+import com.platform.dao.entity.hidden.HiddenDanger;
+import com.platform.service.hidden.HiddenDangerService;
+import com.platform.dao.util.ExcelUtil;
+import com.platform.dao.vo.export.hidden.ExportHiddenDangerVO;
+import com.platform.dao.vo.query.hidden.HiddenDangerVO;
+import com.platform.common.util.BeanConverterUtil;
+import com.platform.common.validation.group.AddGroup;
+import com.platform.common.validation.group.UpdateGroup;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import lombok.AllArgsConstructor;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.rest.log.annotation.SysLog;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @Description 隐患管理表 控制器
+ * @Author lsq
+ * @Date 2022-12-14 16:19:10
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/hidden/dangers")
+public class HiddenDangerController {
+
+  private final  HiddenDangerService hiddenDangerService;
+
+  /**
+   * 通过id查询单条记录
+   *
+   * @param id 主键
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R<HiddenDanger> getById(@PathVariable("id") String id){
+      return new R<>(hiddenDangerService.getModelById(id));
+  }
+
+  /**
+   * 新增记录
+   *
+   * @param hiddenDangerDTO 隐患管理表DTO
+   * @return R
+   */
+  @SysLog("新增隐患管理表")
+  @PostMapping
+  @PreAuthorize("@pms.hasPermission('hidden-dangers-add')")
+  public R save(@Validated({AddGroup.class}) @RequestBody HiddenDangerDTO hiddenDangerDTO) {
+      return new R<>(hiddenDangerService.saveModelByDTO(hiddenDangerDTO));
+  }
+
+  /**
+   * 修改记录
+   *
+   * @param hiddenDangerDTO 隐患管理表DTO
+   * @return R
+   */
+  @SysLog("修改隐患管理表")
+  @PutMapping("/{id}")
+  @PreAuthorize("@pms.hasPermission('hidden-dangers-edit')")
+  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody HiddenDangerDTO hiddenDangerDTO) {
+      hiddenDangerService.modModelByDTO(hiddenDangerDTO);
+      return new R<>();
+  }
+
+
+                                                                                                                          
+  /**
+   * 通过id删除一条记录
+   *
+   * @param id 主键
+   * @return R
+   */
+  @SysLog("删除隐患管理表")
+  @DeleteMapping("/{id}")
+  @PreAuthorize("@pms.hasPermission('hidden-dangers-del')")
+  public R removeById(@PathVariable String id){
+    hiddenDangerService.deleteByPrimaryKey(id);
+    return new R<>();
+  }
+
+    /**
+     * 批量记录
+     *
+     * @param ids 主键
+     * @return R
+     */
+    @SysLog("批量删除隐患管理表")
+    @DeleteMapping("")
+    @PreAuthorize("@pms.hasPermission('hidden-dangers-del')")
+    public R removeIds(@RequestBody List<String> ids){
+        hiddenDangerService.batchDelete(ids);
+        return new R<>();
+    }
+
+  /**
+   * 获取分页
+   *
+   * @param pageNum 当前页码
+   * @param pageSize 每页条数
+   * @param hiddenDangerDTO 隐患管理表DTO
+   * @return R
+   */
+  @GetMapping("/page")
+  public R<AbstractPageResultBean<HiddenDangerVO>> query(HiddenDangerDTO hiddenDangerDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+      return new R<>(hiddenDangerService.selectPageList(hiddenDangerDTO, pageNum, pageSize));
+  }
+
+  /**
+   * 获取列表
+   *
+   * @param hiddenDangerDTO 隐患管理表DTO
+   * @return R
+   */
+  @GetMapping("")
+  public R query(HiddenDangerDTO hiddenDangerDTO) {
+      return new R<>(hiddenDangerService.getModelListByDTO(hiddenDangerDTO));
+  }
+
+  /**
+     * 隐患管理表导出
+     *
+     * @param hiddenDangerDTO 隐患管理表DTO
+     * @return R
+     */
+  @GetMapping("/export")
+  @SysLog("隐患管理表导出")
+  @PreAuthorize("@pms.hasPermission('hidden-dangers-export')")
+  public void export(HttpServletResponse response, HiddenDangerDTO hiddenDangerDTO) {
+    List<HiddenDanger> list = hiddenDangerService.getModelListByDTO(hiddenDangerDTO);
+    ExcelUtil.exportResponseDict(response, ExportHiddenDangerVO.class, BeanConverterUtil.copyListProperties(list, ExportHiddenDangerVO.class), "隐患管理表");
+  }
+
+}

platform-service/src/main/java/com/platform/service/hidden/HiddenDangerService.java

@@ -0,0 +1,35 @@
+package com.platform.service.hidden;
+
+import com.platform.dao.vo.query.hidden.HiddenDangerVO;
+import com.platform.dao.dto.hidden.HiddenDangerDTO;
+import com.platform.dao.entity.hidden.HiddenDanger;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.service.base.IBaseService;
+import java.util.List;
+
+/**
+ * @Description 隐患管理表 service
+ * @Author lsq
+ * @Date 2022-12-14 16:19:10
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+public interface HiddenDangerService extends IBaseService<HiddenDanger, HiddenDangerDTO> {
+
+   /**
+    * 批量删除
+    *
+    * @param ids ：
+    * @return ：
+    */
+    int batchDelete(List<String> ids);
+
+    /**
+     * 分页查询
+     * @param record
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    AbstractPageResultBean<HiddenDangerVO> selectPageList(HiddenDangerDTO record, int pageNum, int pageSize);
+
+                                                                                                                                                                                                                                                    }

platform-service/src/main/java/com/platform/service/hidden/impl/HiddenDangerServiceImpl.java

@@ -0,0 +1,50 @@
+package com.platform.service.hidden.impl;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.dao.bean.MyPage;
+import com.github.pagehelper.PageHelper;
+import com.platform.dao.vo.query.hidden.HiddenDangerVO;
+import com.platform.dao.dto.hidden.HiddenDangerDTO;
+import com.platform.dao.entity.hidden.HiddenDanger;
+import com.platform.dao.mapper.hidden.HiddenDangerMapper;
+import com.platform.service.hidden.HiddenDangerService;
+import org.springframework.stereotype.Service;
+import com.platform.service.base.impl.BaseServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.weekend.Weekend;
+import tk.mybatis.mapper.weekend.WeekendCriteria;
+import lombok.AllArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description 隐患管理表 service 实现类
+ * @Author lsq
+ * @Date 2022-12-14 16:19:10
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@AllArgsConstructor
+@Service("hiddenDangerService")
+public class HiddenDangerServiceImpl extends BaseServiceImpl<HiddenDangerMapper, HiddenDanger, HiddenDangerDTO> implements HiddenDangerService {
+
+    @Override
+    public int batchDelete(List<String> ids) {
+        Weekend<HiddenDanger> weekend = new Weekend<>(HiddenDanger.class);
+        WeekendCriteria<HiddenDanger, Object> weekendCriteria = weekend.weekendCriteria();
+        weekendCriteria.andIn(HiddenDanger::getId, ids);
+        mapper.deleteByExample(weekend);
+        return 1;
+    }
+
+    @Override
+    public AbstractPageResultBean<HiddenDangerVO> selectPageList(HiddenDangerDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyPage(mapper.selectList(record));
+    }
+
+    @Override
+    public AbstractPageResultBean<HiddenDanger> selectPageInfo(HiddenDangerDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyPage(mapper.selectList(record));
+    }
+
+                                                                                                                                                                                                                                                    }