Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
7002aa56 由 张雷
选项

Merge remote-tracking branch 'origin/master' into master

2 个父辈 f3d42821 92a8a9e7
全部展开
内嵌 并排
正在显示 19 个修改的文件 包含 93 行增加 和 574 行删除
sk-module-biz/src/main/java/com/skua/modules/safe/controller/DangerInspectInfoController.java
......@@ -99,7 +99,7 @@ public class DangerInspectInfoController {
@AutoLog(value = "检查内容对象-添加")
@ApiOperation(value="检查内容对象-添加", notes="检查内容对象-添加")
@PostMapping(value = "/add")
public Result<DangerInspectInfo> add(@RequestBody DangerInspectInfoVO dangerInspectInfo) {
public Result<DangerInspectInfo> add(@RequestBody DangerInspectInfo dangerInspectInfo) {
Result<DangerInspectInfo> result = new Result<DangerInspectInfo>();
try {
dangerInspectInfoService.saveDangerInspectInfo(dangerInspectInfo);
......@@ -122,7 +122,7 @@ public class DangerInspectInfoController {
@AutoLog(value = "检查内容对象-编辑")
@ApiOperation(value="检查内容对象-编辑", notes="检查内容对象-编辑")
@PutMapping(value = "/edit")
public Result<DangerInspectInfo> edit(@RequestBody DangerInspectInfoVO dangerInspectInfo) {
public Result<DangerInspectInfo> edit(@RequestBody DangerInspectInfo dangerInspectInfo) {
Result<DangerInspectInfo> result = new Result<DangerInspectInfo>();
DangerInspectInfo dangerInspectInfoEntity = dangerInspectInfoService.getById(dangerInspectInfo.getId());
if(dangerInspectInfoEntity==null) {
......
sk-module-biz/src/main/java/com/skua/modules/safe/controller/DangerInspectionController.java deleted 100644 → 0
package com.skua.modules.safe.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.skua.core.api.vo.Result;
import com.skua.core.aspect.annotation.AutoLog;
import com.skua.core.context.BaseContextHandler;
import com.skua.core.query.QueryGenerator;
import com.skua.core.service.ISequenceService;
import com.skua.core.util.ConvertUtils;
import com.skua.modules.safe.entity.DangerInspection;
import com.skua.modules.safe.service.IDangerInspectionService;
import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/**
* <pre>
* 风险巡检
* </pre>
* @author 开发者姓名
* @version V0.1, 开发时间
*/
@Slf4j
@Api(tags="风险巡检")
@RestController("webDangerInspectionController")
@RequestMapping("/web/safe/dangerInspection")
public class DangerInspectionController {
@Autowired
private IDangerInspectionService dangerInspectionService;
/**
* <pre>
* 分页列表查询
* </pre>
* @param dangerInspection
* @param pageNo
* @param pageSize
* @param req
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "风险巡检-分页列表查询")
@ApiOperation(value="风险巡检-分页列表查询", notes="风险巡检-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<DangerInspection>> queryPageList(DangerInspection dangerInspection,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<DangerInspection>> result = new Result<IPage<DangerInspection>>();
QueryWrapper<DangerInspection> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspection, req.getParameterMap());
Page<DangerInspection> page = new Page<DangerInspection>(pageNo, pageSize);
queryWrapper.eq("danger_id",dangerInspection.getDangerId());
queryWrapper.orderByDesc("create_time");
IPage<DangerInspection> pageList = dangerInspectionService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
return result;
}
/**
* <pre>
* 添加
* </pre>
* @param dangerInspection
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "风险巡检-添加")
@ApiOperation(value="风险巡检-添加", notes="风险巡检-添加")
@PostMapping(value = "/add")
public Result<DangerInspection> add(@RequestBody DangerInspection dangerInspection) {
Result<DangerInspection> result = new Result<DangerInspection>();
try {
dangerInspectionService.save(dangerInspection);
result.success("添加成功！");
} catch (Exception e) {
log.error(e.getMessage(),e);
result.error500("操作失败");
}
return result;
}
/**
* <pre>
* 编辑
* </pre>
* @param dangerInspection
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "风险巡检-编辑")
@ApiOperation(value="风险巡检-编辑", notes="风险巡检-编辑")
@PutMapping(value = "/edit")
public Result<DangerInspection> edit(@RequestBody DangerInspection dangerInspection) {
Result<DangerInspection> result = new Result<DangerInspection>();
DangerInspection dangerInspectionEntity = dangerInspectionService.getById(dangerInspection.getId());
if(dangerInspectionEntity==null) {
result.error500("未找到对应实体");
}else {
boolean ok = dangerInspectionService.updateById(dangerInspection);
//TODO 返回false说明什么？
if(ok) {
result.success("修改成功!");
}
}
return result;
}
/**
* <pre>
* 通过id删除
* </pre>
* @param id
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "风险巡检-通过id删除")
@ApiOperation(value="风险巡检-通过id删除", notes="风险巡检-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
try {
dangerInspectionService.removeById(id);
} catch (Exception e) {
log.error("删除失败",e.getMessage());
return Result.error("删除失败!");
}
return Result.ok("删除成功!");
}
/**
* <pre>
* 批量删除
* </pre>
* @param ids
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "风险巡检-批量删除")
@ApiOperation(value="风险巡检-批量删除", notes="风险巡检-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<DangerInspection> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
Result<DangerInspection> result = new Result<DangerInspection>();
if(ids==null || "".equals(ids.trim())) {
result.error500("参数不识别！");
}else {
this.dangerInspectionService.removeByIds(Arrays.asList(ids.split(",")));
result.success("删除成功!");
}
return result;
}
/**
* <pre>
* 通过id查询
* </pre>
* @param id
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "风险巡检-通过id查询")
@ApiOperation(value="风险巡检-通过id查询", notes="风险巡检-通过id查询")
@GetMapping(value = "/queryById")
public Result<DangerInspection> queryById(@RequestParam(name="id",required=true) String id) {
Result<DangerInspection> result = new Result<DangerInspection>();
DangerInspection dangerInspection = dangerInspectionService.getById(id);
if(dangerInspection==null) {
result.error500("未找到对应实体");
}else {
result.setResult(dangerInspection);
result.setSuccess(true);
}
return result;
}
/**
* <pre>
* 导出excel
* </pre>
* @param request
* @param response
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
// Step.1 组装查询条件
QueryWrapper<DangerInspection> queryWrapper = null;
try {
String paramsStr = request.getParameter("paramsStr");
if (ConvertUtils.isNotEmpty(paramsStr)) {
String deString = URLDecoder.decode(paramsStr, "UTF-8");
DangerInspection dangerInspection = JSON.parseObject(deString, DangerInspection.class);
queryWrapper = QueryGenerator.initQueryWrapper(dangerInspection, request.getParameterMap());
}
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
//Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<DangerInspection> pageList = dangerInspectionService.list(queryWrapper);
//导出文件名称
mv.addObject(NormalExcelConstants.FILE_NAME, "风险巡检列表");
mv.addObject(NormalExcelConstants.CLASS, DangerInspection.class);
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("风险巡检列表数据", "导出人:Jeecg", "导出信息"));
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
return mv;
}
/**
* <pre>
* 通过excel导入数据
* </pre>
* @param request
* @param response
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();// 获取上传文件对象
ImportParams params = new ImportParams();
params.setTitleRows(2);
params.setHeadRows(1);
params.setNeedSave(true);
try {
List<DangerInspection> listDangerInspections = ExcelImportUtil.importExcel(file.getInputStream(), DangerInspection.class, params);
dangerInspectionService.saveBatch(listDangerInspections);
return Result.ok("文件导入成功！数据行数:" + listDangerInspections.size());
} catch (Exception e) {
log.error(e.getMessage(),e);
return Result.error("文件导入失败:"+e.getMessage());
} finally {
try {
file.getInputStream().close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return Result.ok("文件导入失败！");
}
}
sk-module-biz/src/main/java/com/skua/modules/safe/controller/SafetyOffenceRecordController.java
......@@ -123,23 +123,23 @@ public class SafetyOffenceRecordController {
Result<IPage<SafetyOffenceRecord>> result = new Result<IPage<SafetyOffenceRecord>>();
Boolean flag = false;
/* String role_ah_id = sysConfigService.queryValueByKey("ROLE_AH_ADMIN");//安环管理员角色编号
String role_ah_id = sysConfigService.queryValueByKey("ROLE_AH_ADMIN");//安环管理员角色编号
String role_cz_id = sysConfigService.queryValueByKey("ROLE_CZ");//厂长角色编号
String userRoleIds = BaseContextHandler.getRoles();
safetyOffenceRecord.setDepartId( "0" );//屏蔽数据使用；非安环管理员、与厂长角色看不到数据
safetyOffenceRecord.setReportType("1");//上报集团--默认
//安装部长角色看集团类型的违法上报
if( userRoleIds != null && userRoleIds.contains( role_ah_id ) ){//判断安环管理员
safetyOffenceRecord.setDepartId( null );
safetyOffenceRecord.setReportType("1");//上报集团--默认
flag = false;
}
if( userRoleIds != null && userRoleIds.contains( role_cz_id ) ){//判断 厂长 ,查询分管的所有长编号
safetyOffenceRecord.setDepartId( BaseContextHandler.getDeparts() );//BaseContextHandler.getRealDepartId()
safetyOffenceRecord.setReportType("2");//上报厂长
flag = true;
}*/
}
if(safetyOffenceRecord.getStatus() !=null && safetyOffenceRecord.getStatus().equals("0")){
safetyOffenceRecord.setStatus(null);//默认全部
}
......
sk-module-biz/src/main/java/com/skua/modules/safe/entity/DangerInspectInfo.java
......@@ -2,6 +2,8 @@ package com.skua.modules.safe.entity;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
......@@ -45,6 +47,8 @@ public class DangerInspectInfo {
@Excel(name = "检查方法", width = 15)
@ApiModelProperty(value = "检查方法")
private String inspectMethod;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
......@@ -81,4 +85,7 @@ public class DangerInspectInfo {
@Excel(name = "删除标识，1有效，0删除", width = 15)
@ApiModelProperty(value = "删除标识，1有效，0删除")
private Integer delFlag;
}
......
sk-module-biz/src/main/java/com/skua/modules/safe/entity/DangerInspectItem.java
......@@ -55,4 +55,9 @@ public class DangerInspectItem {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private Date createTime;
@TableField(exist=false)
@ApiModelProperty(value = "创建时间")
private String itemValue;//
}
......
sk-module-biz/src/main/java/com/skua/modules/safe/entity/DangerInspection.java deleted 100644 → 0
package com.skua.modules.safe.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 风险巡检
*/
@Data
@TableName("danger_inspection")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="danger_inspection对象", description="风险巡检")
public class DangerInspection {
/**id*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "id")
private String id;
/**厂id*/
@Excel(name = "厂id", width = 15)
@ApiModelProperty(value = "厂id")
private String departId;
/**风险等级编号*/
@Excel(name = "风险等级编号", width = 15)
@ApiModelProperty(value = "风险等级编号")
private String dangerId;
/**上报人（用户id）*/
@Excel(name = "上报人（用户id）", width = 15)
@ApiModelProperty(value = "上报人（用户id）")
private String reportUser;
/**上报时间*/
@Excel(name = "上报时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "上报时间")
private Date reportDate;
/**巡检状态(0:未开始，1:开始，2:结束，3：作废)*/
@Excel(name = "巡检状态(0:未开始，1:开始，2:结束，3：作废)", width = 15)
@ApiModelProperty(value = "巡检状态(0:未开始，1:开始，2:结束，3：作废)")
private String status;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String remark;
/**创建人Id*/
@Excel(name = "创建人Id", width = 15)
@ApiModelProperty(value = "创建人Id")
private String createBy;
/**上报时间*/
@Excel(name = "上报时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "上报时间")
private Date createTime;
/**修改人Id*/
@Excel(name = "修改人Id", width = 15)
@ApiModelProperty(value = "修改人Id")
private String updateBy;
/**修改时间*/
@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "修改时间")
private Date updateTime;
/**删除标识，1有效，0删除*/
@Excel(name = "删除标识，1有效，0删除", width = 15)
@ApiModelProperty(value = "删除标识，1有效，0删除")
private Integer delFlag;
}
sk-module-biz/src/main/java/com/skua/modules/safe/entity/DangerInspectionRecode.java deleted 100644 → 0
package com.skua.modules.safe.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 风险巡检记录
*/
@Data
@TableName("danger_inspection_recode")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="danger_inspection_recode对象", description="风险巡检记录")
public class DangerInspectionRecode {
/**id*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "id")
private String id;
/**厂id*/
@Excel(name = "厂id", width = 15)
@ApiModelProperty(value = "厂id")
private String departId;
/**风险等级对象*/
@Excel(name = "风险等级对象", width = 15)
@ApiModelProperty(value = "风险等级对象")
private String dangerId;
/**检查内容对象编号*/
@Excel(name = "检查内容对象编号", width = 15)
@ApiModelProperty(value = "检查内容对象编号")
private String inspectObjId;
/**检查内容*/
@Excel(name = "检查内容", width = 15)
@ApiModelProperty(value = "检查内容")
private String inspectContent;
/**检查方法*/
@Excel(name = "检查方法", width = 15)
@ApiModelProperty(value = "检查方法")
private String inspectMethod;
/**检查图片*/
@Excel(name = "检查图片", width = 15)
@ApiModelProperty(value = "检查图片")
private String inspectImg;
/**上报人（用户id）*/
@Excel(name = "上报人（用户id）", width = 15)
@ApiModelProperty(value = "上报人（用户id）")
private String reportUser;
/**巡检状态(0:未开始，1:开始，2:结束，3：作废)*/
@Excel(name = "巡检状态(0:未开始，1:开始，2:结束，3：作废)", width = 15)
@ApiModelProperty(value = "巡检状态(0:未开始，1:开始，2:结束，3：作废)")
private String status;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String remark;
/**创建人Id*/
@Excel(name = "创建人Id", width = 15)
@ApiModelProperty(value = "创建人Id")
private String createBy;
/**上报时间*/
@Excel(name = "上报时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "上报时间")
private Date createTime;
/**修改人Id*/
@Excel(name = "修改人Id", width = 15)
@ApiModelProperty(value = "修改人Id")
private String updateBy;
/**修改时间*/
@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "修改时间")
private Date updateTime;
/**删除标识，1有效，0删除*/
@Excel(name = "删除标识，1有效，0删除", width = 15)
@ApiModelProperty(value = "删除标识，1有效，0删除")
private Integer delFlag;
}
sk-module-biz/src/main/java/com/skua/modules/safe/entity/DangerLevelManage.java
......@@ -128,4 +128,10 @@ public class DangerLevelManage {
/**删除标识，1有效，0删除*/
@ApiModelProperty(value = "删除标识，1有效，0删除")
private Integer delFlag;
@TableField(exist=false)
@ApiModelProperty(value = "上次巡检时间")
private String lastInspectionTime;
}
......
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/DangerInspectionMapper.java deleted 100644 → 0
package com.skua.modules.safe.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.skua.modules.safe.entity.DangerInspection;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 风险巡检
*/
public interface DangerInspectionMapper extends BaseMapper<DangerInspection> {
}
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/DangerInspectionRecodeMapper.java deleted 100644 → 0
package com.skua.modules.safe.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.skua.modules.safe.entity.DangerInspectionRecode;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 风险巡检记录
*/
public interface DangerInspectionRecodeMapper extends BaseMapper<DangerInspectionRecode> {
}
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/xml/DangerInspectionMapper.xml deleted 100644 → 0
<?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.skua.modules.safe.mapper.DangerInspectionMapper">
</mapper>
\ No newline at end of file
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/xml/DangerInspectionRecodeMapper.xml deleted 100644 → 0
<?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.skua.modules.safe.mapper.DangerInspectionRecodeMapper">
</mapper>
\ No newline at end of file
sk-module-biz/src/main/java/com/skua/modules/safe/service/IDangerInspectInfoService.java
......@@ -4,12 +4,27 @@ import com.skua.modules.safe.entity.DangerInspectInfo;
import com.baomidou.mybatisplus.extension.service.IService;
import com.skua.modules.safe.vo.DangerInspectInfoVO;
import java.util.List;
/**
* 检查内容对象
*/
public interface IDangerInspectInfoService extends IService<DangerInspectInfo> {
/***
* 根据id编号获取检查内容对象、检查项集合
* @param id
* @return
*/
public DangerInspectInfo queryById(String id);
/***
* 根据检查点编号，获取检查内容对象集合
* @return
*/
public List<DangerInspectInfo> queryListByDangerId(String dangerId);
/***
* 根据id删除检查内容对象、以及检查项对象
* @param id
*/
......@@ -17,15 +32,15 @@ public interface IDangerInspectInfoService extends IService<DangerInspectInfo> {
/***
* 修改检查内容对象、以及检查项对象
* @param dangerInspectInfoVO
* @param dangerInspectInfo
* @return
*/
public boolean updateDangerInspectInfo(DangerInspectInfoVO dangerInspectInfoVO);
public boolean updateDangerInspectInfo(DangerInspectInfo dangerInspectInfo);
/***
* 新增检查内容对象、以及检查项对象
* @param dangerInspectInfoVO
* @param dangerInspectInfo
*/
public void saveDangerInspectInfo(DangerInspectInfoVO dangerInspectInfoVO);
public void saveDangerInspectInfo(DangerInspectInfo dangerInspectInfo);
}
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/IDangerInspectionRecodeService.java deleted 100644 → 0
package com.skua.modules.safe.service;
import com.skua.modules.safe.entity.DangerInspectionRecode;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* 风险巡检记录
*/
public interface IDangerInspectionRecodeService extends IService<DangerInspectionRecode> {
}
sk-module-biz/src/main/java/com/skua/modules/safe/service/IDangerInspectionService.java deleted 100644 → 0
package com.skua.modules.safe.service;
import com.skua.modules.safe.entity.DangerInspection;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* 风险巡检
*/
public interface IDangerInspectionService extends IService<DangerInspection> {
}
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/DangerInspectInfoServiceImpl.java
package com.skua.modules.safe.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.skua.modules.safe.entity.DangerInspectInfo;
import com.skua.modules.safe.entity.DangerInspectItem;
import com.skua.modules.safe.mapper.DangerInspectInfoMapper;
......@@ -13,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/**
* 检查内容对象
......@@ -22,6 +25,40 @@ public class DangerInspectInfoServiceImpl extends ServiceImpl<DangerInspectInfoM
@Resource
private DangerInspectItemMapper inspectItemMapper;
/***
* 根据id编号获取检查内容对象、检查项集合
* @param id
* @return
*/
public DangerInspectInfo queryById(String id){
DangerInspectInfo dangerInspectInfo = this.baseMapper.selectById(id);
String inspectObjId = id;
LambdaQueryWrapper<DangerInspectItem> queryWrapper = new LambdaQueryWrapper<DangerInspectItem>();
queryWrapper.eq(DangerInspectItem::getInspectObjId, inspectObjId);
queryWrapper.orderByDesc(DangerInspectItem::getCreateTime);//添加排序
List<DangerInspectItem> inspectItemList = this.inspectItemMapper.selectList(queryWrapper);
//dangerInspectInfo.setDangerInspectItemList( inspectItemList);
return dangerInspectInfo;
}
/***
* 根据检查点编号，获取检查内容对象集合
* @return
*/
public List<DangerInspectInfo> queryListByDangerId(String dangerId){
LambdaQueryWrapper<DangerInspectInfo> queryWrapper = new LambdaQueryWrapper<DangerInspectInfo>();
queryWrapper.eq(DangerInspectInfo::getDangerLevelId, dangerId);
queryWrapper.orderByDesc(DangerInspectInfo::getCreateTime);//添加排序
return this.baseMapper.selectList(queryWrapper);
}
/***
* 根据id删除检查内容对象、以及检查项对象
* @param id
......@@ -36,43 +73,40 @@ public class DangerInspectInfoServiceImpl extends ServiceImpl<DangerInspectInfoM
/***
* 修改检查内容对象、以及检查项对象
* @param dangerInspectInfoVO
* @param dangerInspectInfo
* @return
*/
@Transactional
public boolean updateDangerInspectInfo(DangerInspectInfoVO dangerInspectInfoVO){
DangerInspectInfo dangerInspectInfo = new DangerInspectInfo();
BeanUtils.copyProperties( dangerInspectInfoVO ,dangerInspectInfo );
public boolean updateDangerInspectInfo(DangerInspectInfo dangerInspectInfo){
int count = this.baseMapper.updateById( dangerInspectInfo );
//根据检查内容对象，删除检查项目集合
inspectItemMapper.deleteByInspectInfoId(dangerInspectInfoVO.getId());
if(dangerInspectInfoVO.getDangerInspectItemList() != null ){
for(DangerInspectItem dangerInspectItem : dangerInspectInfoVO.getDangerInspectItemList()){
dangerInspectItem.setInspectObjId( dangerInspectInfoVO.getId() ) ;
inspectItemMapper.deleteByInspectInfoId(dangerInspectInfo.getId());
/* if(dangerInspectInfo.getDangerInspectItemList() != null ){
for(DangerInspectItem dangerInspectItem : dangerInspectInfo.getDangerInspectItemList()){
dangerInspectItem.setInspectObjId( dangerInspectInfo.getId() ) ;
inspectItemMapper.insert(dangerInspectItem) ;
}
}
}*/
return count > 0 ?true : false;
}
/***
* 新增检查内容对象、以及检查项对象
* @param dangerInspectInfoVO
* @param dangerInspectInfo
*/
public void saveDangerInspectInfo(DangerInspectInfoVO dangerInspectInfoVO){
DangerInspectInfo dangerInspectInfo = new DangerInspectInfo();
BeanUtils.copyProperties( dangerInspectInfoVO ,dangerInspectInfo );
public void saveDangerInspectInfo(DangerInspectInfo dangerInspectInfo){
this.baseMapper.insert( dangerInspectInfo );
//根据检查内容对象，删除检查项目集合
if(dangerInspectInfoVO.getDangerInspectItemList() != null ){
for(DangerInspectItem dangerInspectItem : dangerInspectInfoVO.getDangerInspectItemList()){
dangerInspectItem.setInspectObjId( dangerInspectInfoVO.getId() ) ;
/* if(dangerInspectInfo.getDangerInspectItemList() != null ){
for(DangerInspectItem dangerInspectItem : dangerInspectInfo.getDangerInspectItemList()){
dangerInspectItem.setInspectObjId( dangerInspectInfo.getId() ) ;
inspectItemMapper.insert(dangerInspectItem) ;
}
}
}*/
}
}
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/DangerInspectionRecodeServiceImpl.java deleted 100644 → 0
package com.skua.modules.safe.service.impl;
import com.skua.modules.safe.entity.DangerInspectionRecode;
import com.skua.modules.safe.mapper.DangerInspectionRecodeMapper;
import com.skua.modules.safe.service.IDangerInspectionRecodeService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* 风险巡检记录
*/
@Service
public class DangerInspectionRecodeServiceImpl extends ServiceImpl<DangerInspectionRecodeMapper, DangerInspectionRecode> implements IDangerInspectionRecodeService {
}
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/DangerInspectionServiceImpl.java deleted 100644 → 0
package com.skua.modules.safe.service.impl;
import com.skua.modules.safe.entity.DangerInspection;
import com.skua.modules.safe.mapper.DangerInspectionMapper;
import com.skua.modules.safe.service.IDangerInspectionService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* 风险巡检
*/
@Service
public class DangerInspectionServiceImpl extends ServiceImpl<DangerInspectionMapper, DangerInspection> implements IDangerInspectionService {
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!