diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerFieldController.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerFieldController.java index 735d8c3af..271432823 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerFieldController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerFieldController.java @@ -10,7 +10,6 @@ import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityDangerField; import com.zhgd.xmgl.modules.xz.security.entity.dto.SaveAllXzSecurityDangerFieldDto; import com.zhgd.xmgl.modules.xz.security.entity.dto.XzSecurityDangerFieldDto; import com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityDangerFieldVo; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityDangerFieldConfigService; import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityDangerFieldService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -48,9 +47,6 @@ public class XzSecurityDangerFieldController { @Lazy @Autowired private IXzSecurityDangerFieldService xzSecurityDangerFieldService; - @Lazy - @Autowired - private IXzSecurityDangerFieldConfigService xzSecurityDangerFieldConfigService; /** * 分页列表查询 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityDangerFieldConfig.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityDangerFieldConfig.java deleted file mode 100644 index 91d3e65b2..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityDangerFieldConfig.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.zhgd.xmgl.modules.xz.security.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; - -/** - * @Description: 安全隐患检查字段设置配置 - * @author： pds - * @date： 2025-08-06 - * @version： V1.0 - */ -@Data -@TableName("xz_security_danger_field_config") -@ApiModel(value = "XzSecurityDangerFieldConfig实体类", description = "XzSecurityDangerFieldConfig") -@Deprecated -public class XzSecurityDangerFieldConfig implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键id") - private java.lang.Long id; - /** - * 类型，1质量问题，2排查记录 - */ - @ApiModelProperty(value = "类型，1质量问题，2排查记录") - private java.lang.Integer recordType; - /** - * 项目SN - */ - @ApiModelProperty(value = "项目SN") - private java.lang.String projectSn; - /** - * 项目端是否开启，1开启，0不开启 - */ - @ApiModelProperty(value = "项目端是否开启，1开启，0不开启") - private java.lang.Integer enableProject; - /** - * 创建时间 - */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") - private java.util.Date createTime; - /** - * 更新时间 - */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间") - private java.util.Date updateTime; -} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/dto/XzSecurityDangerFieldConfigDto.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/dto/XzSecurityDangerFieldConfigDto.java deleted file mode 100644 index fcd3b8883..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/dto/XzSecurityDangerFieldConfigDto.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.zhgd.xmgl.modules.xz.security.entity.dto; - -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityDangerFieldConfig; -import io.swagger.annotations.ApiModel; -import lombok.Data; - -@Data -@ApiModel(value = "XzSecurityDangerFieldConfigDto实体类", description = "XzSecurityDangerFieldConfigDto实体类") -public class XzSecurityDangerFieldConfigDto extends XzSecurityDangerFieldConfig { - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityDangerFieldConfigVo.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityDangerFieldConfigVo.java deleted file mode 100644 index 3d58cdd54..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityDangerFieldConfigVo.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.zhgd.xmgl.modules.xz.security.entity.vo; - -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityDangerFieldConfig; -import io.swagger.annotations.ApiModel; -import lombok.Data; - -@Data -@ApiModel(value = "XzSecurityDangerFieldConfigVo实体类", description = "XzSecurityDangerFieldConfigVo实体类") -public class XzSecurityDangerFieldConfigVo extends XzSecurityDangerFieldConfig { - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityDangerFieldConfigMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityDangerFieldConfigMapper.java deleted file mode 100644 index 55fb57a6c..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityDangerFieldConfigMapper.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.zhgd.xmgl.modules.xz.security.mapper; - -import java.util.List; -import java.util.HashMap; - -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityDangerFieldConfig; -import com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityDangerFieldConfigVo; -import com.zhgd.xmgl.modules.xz.security.entity.dto.XzSecurityDangerFieldConfigDto; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 安全隐患检查字段设置配置 - * @author： pds - * @date： 2025-08-06 - * @version： V1.0 - */ -@Mapper -public interface XzSecurityDangerFieldConfigMapper extends BaseMapper { - - /** - * 分页列表查询安全隐患检查字段设置配置信息 - * - * @param page - * @param queryWrapper - * @param param - * @return - */ - IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap param); - - /** - * 列表查询安全隐患检查字段设置配置信息 - * - * @param queryWrapper - * @param param - * @return - */ - List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap param); - - - /** - * 通过id查询安全隐患检查字段设置配置信息 - * - * @param id - * @return - */ - XzSecurityDangerFieldConfigVo queryById(String id); -} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityDangerFieldConfigService.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityDangerFieldConfigService.java deleted file mode 100644 index 635645a8c..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityDangerFieldConfigService.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.zhgd.xmgl.modules.xz.security.service; - -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityDangerFieldConfig; -import com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityDangerFieldConfigVo; -import com.zhgd.xmgl.modules.xz.security.entity.dto.XzSecurityDangerFieldConfigDto; -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.core.metadata.IPage; - -import java.util.HashMap; -import java.util.List; - -/** - * @Description: 安全隐患检查字段设置配置 - * @author： pds - * @date： 2025-08-06 - * @version： V1.0 - */ -public interface IXzSecurityDangerFieldConfigService extends IService { - /** - * 分页列表查询安全隐患检查字段设置配置信息 - * - * @param param 参数map - * @return - */ - IPage queryPageList(HashMap param); - - /** - * 列表查询安全隐患检查字段设置配置信息 - * - * @param param 参数map - * @return - */ - List queryList(HashMap param); - - /** - * 添加安全隐患检查字段设置配置信息 - * - * @param xzSecurityDangerFieldConfigDto 安全隐患检查字段设置配置 - * @return - */ - void add(XzSecurityDangerFieldConfigDto xzSecurityDangerFieldConfigDto); - - /** - * 编辑安全隐患检查字段设置配置信息 - * - * @param xzSecurityDangerFieldConfigDto 安全隐患检查字段设置配置 - * @return - */ - void edit(XzSecurityDangerFieldConfigDto xzSecurityDangerFieldConfigDto); - - /** - * 根据id删除安全隐患检查字段设置配置信息 - * - * @param id 安全隐患检查字段设置配置的id - * @return - */ - void delete(String id); - - /** - * 根据id查询安全隐患检查字段设置配置信息 - * - * @param id 安全隐患检查字段设置配置的id - * @return - */ - XzSecurityDangerFieldConfigVo queryById(String id); - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityDangerFieldConfigServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityDangerFieldConfigServiceImpl.java deleted file mode 100644 index 1fccf1aa5..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityDangerFieldConfigServiceImpl.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.zhgd.xmgl.modules.xz.security.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityDangerFieldConfig; -import com.zhgd.xmgl.modules.xz.security.entity.dto.XzSecurityDangerFieldConfigDto; -import com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityDangerFieldConfigVo; -import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityDangerFieldConfigMapper; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityDangerFieldConfigService; -import com.zhgd.xmgl.util.PageUtil; -import com.zhgd.xmgl.util.RefUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.List; - -/** - * @Description: 安全隐患检查字段设置配置 - * @author： pds - * @date： 2025-08-06 - * @version： V1.0 - */ -@Service -public class XzSecurityDangerFieldConfigServiceImpl extends ServiceImpl implements IXzSecurityDangerFieldConfigService { - @Autowired - private XzSecurityDangerFieldConfigMapper xzSecurityDangerFieldConfigMapper; - - @Override - public IPage queryPageList(HashMap param) { - QueryWrapper queryWrapper = this.getQueryWrapper(param); - Page page = PageUtil.getPage(param); - IPage pageList = baseMapper.queryList(page, queryWrapper, param); - pageList.setRecords(this.dealList(pageList.getRecords())); - return pageList; - } - - @Override - public List queryList(HashMap param) { - QueryWrapper queryWrapper = getQueryWrapper(param); - return dealList(baseMapper.queryList(queryWrapper, param)); - } - - private QueryWrapper getQueryWrapper(HashMap param) { - QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzSecurityDangerFieldConfigVo.class, param, true); - queryWrapper.orderByDesc(RefUtil.fieldNameUlc(XzSecurityDangerFieldConfigVo::getId)); - return queryWrapper; - } - - private List dealList(List list) { - return list; - } - - @Override - public void add(XzSecurityDangerFieldConfigDto xzSecurityDangerFieldConfigDto) { - xzSecurityDangerFieldConfigDto.setId(null); - baseMapper.insert(xzSecurityDangerFieldConfigDto); - } - - @Override - public void edit(XzSecurityDangerFieldConfigDto xzSecurityDangerFieldConfigDto) { - XzSecurityDangerFieldConfig oldXzSecurityDangerFieldConfig = baseMapper.selectById(xzSecurityDangerFieldConfigDto.getId()); - if (oldXzSecurityDangerFieldConfig == null) { - throw new OpenAlertException("未找到对应实体"); - } - baseMapper.updateById(xzSecurityDangerFieldConfigDto); - } - - @Override - public void delete(String id) { - XzSecurityDangerFieldConfig xzSecurityDangerFieldConfig = baseMapper.selectById(id); - if (xzSecurityDangerFieldConfig == null) { - throw new OpenAlertException("未找到对应实体"); - } - baseMapper.deleteById(id); - } - - @Override - public XzSecurityDangerFieldConfigVo queryById(String id) { - XzSecurityDangerFieldConfigVo entity = baseMapper.queryById(id); - if (entity == null) { - throw new OpenAlertException("未找到对应实体"); - } - return entity; - } - - -}