Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
92a8a9e7 由 康伟
选项

kangwei: 删除巡检部分代码

1 个父辈 bdc3634d
全部展开
内嵌 并排
正在显示 16 个修改的文件 包含 13 行增加 和 751 行删除
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/app/APPDangerInspectionController.java deleted 100644 → 0
package com.skua.modules.safe.controller.app;
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.DangerInspectInfo;
import com.skua.modules.safe.entity.DangerInspection;
import com.skua.modules.safe.entity.DangerLevelManage;
import com.skua.modules.safe.service.IDangerInspectInfoService;
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 com.skua.modules.safe.service.IDangerLevelManageService;
import lombok.extern.slf4j.Slf4j;
import org.bytedeco.javacpp.annotation.AsUtf16;
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("APPDangerInspectionController")
@RequestMapping("/app/safe/dangerInspection")
public class APPDangerInspectionController {
@Autowired
private IDangerLevelManageService dangerLevelManageService;//风险点Service
@Autowired
private IDangerInspectionService inspectionService;//巡检service
@Autowired
private IDangerInspectInfoService inspectInfoService;//风险点---检查内容对象
/**
* <pre>
* 扫描二维码进入：风险点详情
* </pre>
* @param id
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "扫描二维码进入：风险点详情")
@ApiOperation(value="扫描二维码进入：风险点详情", notes="扫描二维码进入：风险点详情")
@GetMapping(value = "/queryDangerById")
public Result<DangerLevelManage> queryById(@RequestParam(name="id",required=true) String id) {
Result<DangerLevelManage> result = new Result<DangerLevelManage>();
DangerLevelManage dangerInspection = dangerLevelManageService.getById(id);
//查询：上次巡检时间
DangerInspection inspection = inspectionService.queryOneByDangerId( id );//根据分线点编号，获取巡检最后一条记录
if(inspection != null ){
dangerInspection.setLastInspectionTime( inspection.getReportDate() );
}else{
dangerInspection.setLastInspectionTime("");
}
if(dangerInspection==null) {
result.error500("未找到对应实体");
}else {
result.setResult(dangerInspection);
result.setSuccess(true);
}
return result;
}
/**
* <pre>
* 开始巡检-->获取风险点，检查对象集合
* </pre>
* @param dangerId
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "开始巡检-->获取风险点，检查对象集合")
@ApiOperation(value="开始巡检-->获取风险点，检查对象集合", notes="开始巡检-->获取风险点，检查对象集合")
@GetMapping(value = "/queryInspectInfoByDangerId")
public Result< List<DangerInspectInfo> > queryInspectInfoByDangerId(@RequestParam(name="dangerId",required=true) String dangerId) {
Result< List<DangerInspectInfo> > result = new Result< List<DangerInspectInfo> >();
List<DangerInspectInfo > dangerInspectInfoList = inspectInfoService.queryListByDangerId(dangerId);
if(dangerInspectInfoList==null) {
result.error500("未找到对应实体");
}else {
result.setResult(dangerInspectInfoList);
result.setSuccess(true);
}
return result;
}
/**
* <pre>
* 开始巡检-->根据id获取检查内容对象
* </pre>
* @param id
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "开始巡检-->根据id获取检查内容对象")
@ApiOperation(value="开始巡检-->根据id获取检查内容对象", notes="开始巡检-->根据id获取检查内容对象")
@GetMapping(value = "/queryInspectInfoById")
public Result< DangerInspectInfo > queryInspectInfoById(@RequestParam(name="id",required=true) String id) {
Result< DangerInspectInfo > result = new Result< DangerInspectInfo >();
DangerInspectInfo dangerInspectInfo = inspectInfoService.getById(id);
if(dangerInspectInfo==null) {
result.error500("未找到对应实体");
}else {
result.setResult(dangerInspectInfo);
result.setSuccess(true);
}
return result;
}
/**
* <pre>
* 开始巡检-->
* </pre>
* @param id
* @return
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
/* @AutoLog(value = "开始巡检-->获取风险点，检查对象集合")
@ApiOperation(value="开始巡检-->获取风险点，检查对象集合", notes="开始巡检-->获取风险点，检查对象集合")
@GetMapping(value = "/queryInspectInfoById")
public Result< DangerInspectInfo > queryByDangerId(@RequestParam(name="id",required=true) String id) {
Result< DangerInspectInfo > result = new Result< DangerInspectInfo >();
DangerInspectInfo dangerInspectInfo = inspectInfoService.getById(id);
if(dangerInspectInfo==null) {
result.error500("未找到对应实体");
}else {
result.setResult(dangerInspectInfo);
result.setSuccess(true);
}
return result;
}*/
}
sk-module-biz/src/main/java/com/skua/modules/safe/entity/DangerInspectInfo.java
......@@ -47,6 +47,8 @@ public class DangerInspectInfo {
@Excel(name = "检查方法", width = 15)
@ApiModelProperty(value = "检查方法")
private String inspectMethod;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
......@@ -85,7 +87,5 @@ public class DangerInspectInfo {
private Integer delFlag;
@TableField(exist=false)
@ApiModelProperty(value = "检查项集合")
private List<DangerInspectItem> dangerInspectItemList ;
}
......
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 String 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/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/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> {
/**
* 根据分线点编号dangerId，获取最新的巡检记录
* @param dangerId
* @return
*/
public DangerInspection queryOneByDangerId(String dangerId);
}
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/DangerInspectInfoServiceImpl.java
......@@ -41,7 +41,7 @@ public class DangerInspectInfoServiceImpl extends ServiceImpl<DangerInspectInfoM
queryWrapper.orderByDesc(DangerInspectItem::getCreateTime);//添加排序
List<DangerInspectItem> inspectItemList = this.inspectItemMapper.selectList(queryWrapper);
dangerInspectInfo.setDangerInspectItemList( inspectItemList);
//dangerInspectInfo.setDangerInspectItemList( inspectItemList);
return dangerInspectInfo;
}
......@@ -83,12 +83,12 @@ public class DangerInspectInfoServiceImpl extends ServiceImpl<DangerInspectInfoM
//根据检查内容对象，删除检查项目集合
inspectItemMapper.deleteByInspectInfoId(dangerInspectInfo.getId());
if(dangerInspectInfo.getDangerInspectItemList() != null ){
/* if(dangerInspectInfo.getDangerInspectItemList() != null ){
for(DangerInspectItem dangerInspectItem : dangerInspectInfo.getDangerInspectItemList()){
dangerInspectItem.setInspectObjId( dangerInspectInfo.getId() ) ;
inspectItemMapper.insert(dangerInspectItem) ;
}
}
}*/
return count > 0 ?true : false;
}
......@@ -101,12 +101,12 @@ public class DangerInspectInfoServiceImpl extends ServiceImpl<DangerInspectInfoM
this.baseMapper.insert( dangerInspectInfo );
//根据检查内容对象，删除检查项目集合
if(dangerInspectInfo.getDangerInspectItemList() != null ){
/* 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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.skua.modules.safe.entity.DangerInspection;
import com.skua.modules.safe.mapper.DangerInspectionMapper;
import com.skua.modules.safe.service.IDangerInspectionService;
import com.skua.modules.system.entity.SysUserDepart;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* 风险巡检
*/
@Service
public class DangerInspectionServiceImpl extends ServiceImpl<DangerInspectionMapper, DangerInspection> implements IDangerInspectionService {
/**
* 根据分线点编号dangerId，获取最新的巡检记录
* @param dangerId
* @return
*/
public DangerInspection queryOneByDangerId(String dangerId){
LambdaQueryWrapper<DangerInspection> queryWrapper = new LambdaQueryWrapper<DangerInspection>();
queryWrapper.eq(DangerInspection::getDangerId, dangerId);
queryWrapper.orderByDesc(DangerInspection::getCreateTime);//添加排序
return this.baseMapper.selectOne(queryWrapper);
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!