Skip to content

张雷 / skboot-zhongye

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

kangwei: 风险分级管控相关代码提交

1 个父辈 fd924f0c
内嵌 并排
正在显示 14 个修改的文件 包含 224 行增加 和 12 行删除
sk-module-biz/src/main/java/com/skua/modules/edu/controller/PaperController.java
...@@ -20,6 +20,7 @@ import java.util.Date; ...@@ -20,6 +20,7 @@ import java.util.Date;
20 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 20 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
21 import com.baomidou.mybatisplus.core.metadata.IPage; 21 import com.baomidou.mybatisplus.core.metadata.IPage;
22 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 22 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
23 import com.skua.modules.edu.vo.PaperVO;
23 import lombok.extern.slf4j.Slf4j; 24 import lombok.extern.slf4j.Slf4j;
24 25
25 import org.jeecgframework.poi.excel.ExcelImportUtil; 26 import org.jeecgframework.poi.excel.ExcelImportUtil;
...@@ -84,7 +85,7 @@ public class PaperController { ...@@ -84,7 +85,7 @@ public class PaperController {
84 * <pre> 85 * <pre>
85 * 添加 86 * 添加
86 * </pre> 87 * </pre>
87 * @param paper 88 * @param paperVO
88 * @return 89 * @return
89 * @author 开发者姓名, 开发时间 90 * @author 开发者姓名, 开发时间
90 * @Description: TODO(这里描述这个方法的需求变更情况) 91 * @Description: TODO(这里描述这个方法的需求变更情况)
...@@ -92,10 +93,10 @@ public class PaperController { ...@@ -92,10 +93,10 @@ public class PaperController {
92 @AutoLog(value = "在线考试-试卷-添加") 93 @AutoLog(value = "在线考试-试卷-添加")
93 @ApiOperation(value="在线考试-试卷-添加", notes="在线考试-试卷-添加") 94 @ApiOperation(value="在线考试-试卷-添加", notes="在线考试-试卷-添加")
94 @PostMapping(value = "/add") 95 @PostMapping(value = "/add")
95 public Result<Paper> add(@RequestBody Paper paper) { 96 public Result<Paper> add(@RequestBody PaperVO paperVO) throws Exception{
96 Result<Paper> result = new Result<Paper>(); 97 Result<Paper> result = new Result<Paper>();
97 try { 98 try {
98 paperService.save(paper); 99 paperService.savePaper(paperVO);
99 result.success("添加成功！"); 100 result.success("添加成功！");
100 } catch (Exception e) { 101 } catch (Exception e) {
101 log.error(e.getMessage(),e); 102 log.error(e.getMessage(),e);
...@@ -107,7 +108,7 @@ public class PaperController { ...@@ -107,7 +108,7 @@ public class PaperController {
107 * <pre> 108 * <pre>
108 * 编辑 109 * 编辑
109 * </pre> 110 * </pre>
110 * @param paper 111 * @param paperVO
111 * @return 112 * @return
112 * @author 开发者姓名, 开发时间 113 * @author 开发者姓名, 开发时间
113 * @Description: TODO(这里描述这个方法的需求变更情况) 114 * @Description: TODO(这里描述这个方法的需求变更情况)
...@@ -115,7 +116,27 @@ public class PaperController { ...@@ -115,7 +116,27 @@ public class PaperController {
115 @AutoLog(value = "在线考试-试卷-编辑") 116 @AutoLog(value = "在线考试-试卷-编辑")
116 @ApiOperation(value="在线考试-试卷-编辑", notes="在线考试-试卷-编辑") 117 @ApiOperation(value="在线考试-试卷-编辑", notes="在线考试-试卷-编辑")
117 @PutMapping(value = "/edit") 118 @PutMapping(value = "/edit")
118 public Result<Paper> edit(@RequestBody Paper paper) { 119 public Result<Paper> edit(@RequestBody PaperVO paperVO) throws Exception{
120 Result<Paper> result = new Result<Paper>();
121 Paper paperEntity = paperService.getById(paperVO.getId());
122 if(paperEntity==null) {
123 result.error500("未找到对应实体");
124 }else {
125 boolean ok = paperService.updatePaper(paperVO);
126 //TODO 返回false说明什么？
127 if(ok) {
128 result.success("修改成功!");
129 }
130 }
131 return result;
132 }
133
134
135
136 @AutoLog(value = "在线考试-发布试卷")
137 @ApiOperation(value="在线考试-发布试卷", notes="在线考试-发布试卷")
138 @PutMapping(value = "/publish")
139 public Result<Paper> publish(@RequestBody Paper paper) {
119 Result<Paper> result = new Result<Paper>(); 140 Result<Paper> result = new Result<Paper>();
120 Paper paperEntity = paperService.getById(paper.getId()); 141 Paper paperEntity = paperService.getById(paper.getId());
121 if(paperEntity==null) { 142 if(paperEntity==null) {
...@@ -127,7 +148,6 @@ public class PaperController { ...@@ -127,7 +148,6 @@ public class PaperController {
127 result.success("修改成功!"); 148 result.success("修改成功!");
128 } 149 }
129 } 150 }
130
131 return result; 151 return result;
132 } 152 }
133 /** 153 /**
......
sk-module-biz/src/main/java/com/skua/modules/edu/service/IPaperService.java
...@@ -2,10 +2,28 @@ package com.skua.modules.edu.service; ...@@ -2,10 +2,28 @@ package com.skua.modules.edu.service;
2 2
3 import com.skua.modules.edu.entity.Paper; 3 import com.skua.modules.edu.entity.Paper;
4 import com.baomidou.mybatisplus.extension.service.IService; 4 import com.baomidou.mybatisplus.extension.service.IService;
5 import com.skua.modules.edu.vo.PaperVO;
6
7 import javax.transaction.Transactional;
5 8
6 /** 9 /**
7 * 在线考试-试卷 10 * 在线考试-试卷
8 */ 11 */
9 public interface IPaperService extends IService<Paper> { 12 public interface IPaperService extends IService<Paper> {
10 13
14 /***
15 * 添加试卷、试卷试题表
16 * @param paperVO
17 * @return
18 */
19 public int savePaper(PaperVO paperVO)throws Exception;
20
21 /**
22 * 修改试卷、试卷试题表
23 * @param paperVO
24 * @return
25 * @throws Exception
26 */
27 public boolean updatePaper(PaperVO paperVO) throws Exception ;
28
11 } 29 }
......
sk-module-biz/src/main/java/com/skua/modules/edu/service/impl/PaperServiceImpl.java
...@@ -78,6 +78,8 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, Paper> implements ...@@ -78,6 +78,8 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, Paper> implements
78 paperQuestionMapper.insert( paperQuestion ) ; 78 paperQuestionMapper.insert( paperQuestion ) ;
79 } 79 }
80 } 80 }
81
82
81 return true; 83 return true;
82 } 84 }
83 85
......
sk-module-biz/src/main/java/com/skua/modules/edu/service/impl/QuestionServiceImpl.java
1 package com.skua.modules.edu.service.impl; 1 package com.skua.modules.edu.service.impl;
2 2
3 import com.google.gson.Gson;
3 import com.skua.modules.edu.entity.Question; 4 import com.skua.modules.edu.entity.Question;
4 import com.skua.modules.edu.entity.QuestionOption; 5 import com.skua.modules.edu.entity.QuestionOption;
5 import com.skua.modules.edu.mapper.QuestionMapper; 6 import com.skua.modules.edu.mapper.QuestionMapper;
...@@ -40,7 +41,14 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i ...@@ -40,7 +41,14 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
40 option.setQuestionId( questionVO.getId() ) ; 41 option.setQuestionId( questionVO.getId() ) ;
41 optionMapper.insert( option ); 42 optionMapper.insert( option );
42 } 43 }
44 // 创建Gson实例
45 Gson gson = new Gson();
46 // 将List转换为Json字符串
47 String questionData = gson.toJson( questionVO.getOptionVOList() ) ;
48 question.setQuestionData( questionData ) ;
49 this.baseMapper.updateById( question ) ;
43 } 50 }
51
44 return count; 52 return count;
45 } 53 }
46 54
...@@ -56,7 +64,6 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i ...@@ -56,7 +64,6 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
56 Question question = new Question(); 64 Question question = new Question();
57 //将questionVO的属性 赋值给 question 65 //将questionVO的属性 赋值给 question
58 BeanUtils.copyProperties(questionVO, question); 66 BeanUtils.copyProperties(questionVO, question);
59 this.baseMapper.updateById( question );
60 67
61 // 步骤2：根据试题编号删除，试题选项集合 68 // 步骤2：根据试题编号删除，试题选项集合
62 optionMapper.delByQuestionId( questionVO.getId() ) ; 69 optionMapper.delByQuestionId( questionVO.getId() ) ;
...@@ -66,7 +73,14 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i ...@@ -66,7 +73,14 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
66 option.setQuestionId( questionVO.getId() ) ; 73 option.setQuestionId( questionVO.getId() ) ;
67 optionMapper.insert( option ); 74 optionMapper.insert( option );
68 } 75 }
76 // 创建Gson实例
77 Gson gson = new Gson();
78 // 将List转换为Json字符串
79 String questionData = gson.toJson( questionVO.getOptionVOList() ) ;
80 question.setQuestionData( questionData ) ;
69 } 81 }
82 //保存
83 this.baseMapper.updateById( question );
70 84
71 return true; 85 return true;
72 } 86 }
......
sk-module-biz/src/main/java/com/skua/modules/safe/controller/DangerInspectInfoController.java
...@@ -20,6 +20,7 @@ import java.util.Date; ...@@ -20,6 +20,7 @@ import java.util.Date;
20 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 20 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
21 import com.baomidou.mybatisplus.core.metadata.IPage; 21 import com.baomidou.mybatisplus.core.metadata.IPage;
22 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 22 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
23 import com.skua.modules.safe.vo.DangerInspectInfoVO;
23 import lombok.extern.slf4j.Slf4j; 24 import lombok.extern.slf4j.Slf4j;
24 25
25 import org.jeecgframework.poi.excel.ExcelImportUtil; 26 import org.jeecgframework.poi.excel.ExcelImportUtil;
...@@ -75,7 +76,12 @@ public class DangerInspectInfoController { ...@@ -75,7 +76,12 @@ public class DangerInspectInfoController {
75 Result<IPage<DangerInspectInfo>> result = new Result<IPage<DangerInspectInfo>>(); 76 Result<IPage<DangerInspectInfo>> result = new Result<IPage<DangerInspectInfo>>();
76 QueryWrapper<DangerInspectInfo> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspectInfo, req.getParameterMap()); 77 QueryWrapper<DangerInspectInfo> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspectInfo, req.getParameterMap());
77 Page<DangerInspectInfo> page = new Page<DangerInspectInfo>(pageNo, pageSize); 78 Page<DangerInspectInfo> page = new Page<DangerInspectInfo>(pageNo, pageSize);
79 queryWrapper.eq("danger_level_id",dangerInspectInfo.getDangerLevelId());
80 queryWrapper.orderByDesc("create_time");
81
78 IPage<DangerInspectInfo> pageList = dangerInspectInfoService.page(page, queryWrapper); 82 IPage<DangerInspectInfo> pageList = dangerInspectInfoService.page(page, queryWrapper);
83
84
79 result.setSuccess(true); 85 result.setSuccess(true);
80 result.setResult(pageList); 86 result.setResult(pageList);
81 return result; 87 return result;
...@@ -93,10 +99,10 @@ public class DangerInspectInfoController { ...@@ -93,10 +99,10 @@ public class DangerInspectInfoController {
93 @AutoLog(value = "检查内容对象-添加") 99 @AutoLog(value = "检查内容对象-添加")
94 @ApiOperation(value="检查内容对象-添加", notes="检查内容对象-添加") 100 @ApiOperation(value="检查内容对象-添加", notes="检查内容对象-添加")
95 @PostMapping(value = "/add") 101 @PostMapping(value = "/add")
96 public Result<DangerInspectInfo> add(@RequestBody DangerInspectInfo dangerInspectInfo) { 102 public Result<DangerInspectInfo> add(@RequestBody DangerInspectInfoVO dangerInspectInfo) {
97 Result<DangerInspectInfo> result = new Result<DangerInspectInfo>(); 103 Result<DangerInspectInfo> result = new Result<DangerInspectInfo>();
98 try { 104 try {
99 dangerInspectInfoService.save(dangerInspectInfo); 105 dangerInspectInfoService.saveDangerInspectInfo(dangerInspectInfo);
100 result.success("添加成功！"); 106 result.success("添加成功！");
101 } catch (Exception e) { 107 } catch (Exception e) {
102 log.error(e.getMessage(),e); 108 log.error(e.getMessage(),e);
...@@ -116,13 +122,13 @@ public class DangerInspectInfoController { ...@@ -116,13 +122,13 @@ public class DangerInspectInfoController {
116 @AutoLog(value = "检查内容对象-编辑") 122 @AutoLog(value = "检查内容对象-编辑")
117 @ApiOperation(value="检查内容对象-编辑", notes="检查内容对象-编辑") 123 @ApiOperation(value="检查内容对象-编辑", notes="检查内容对象-编辑")
118 @PutMapping(value = "/edit") 124 @PutMapping(value = "/edit")
119 public Result<DangerInspectInfo> edit(@RequestBody DangerInspectInfo dangerInspectInfo) { 125 public Result<DangerInspectInfo> edit(@RequestBody DangerInspectInfoVO dangerInspectInfo) {
120 Result<DangerInspectInfo> result = new Result<DangerInspectInfo>(); 126 Result<DangerInspectInfo> result = new Result<DangerInspectInfo>();
121 DangerInspectInfo dangerInspectInfoEntity = dangerInspectInfoService.getById(dangerInspectInfo.getId()); 127 DangerInspectInfo dangerInspectInfoEntity = dangerInspectInfoService.getById(dangerInspectInfo.getId());
122 if(dangerInspectInfoEntity==null) { 128 if(dangerInspectInfoEntity==null) {
123 result.error500("未找到对应实体"); 129 result.error500("未找到对应实体");
124 }else { 130 }else {
125 boolean ok = dangerInspectInfoService.updateById(dangerInspectInfo); 131 boolean ok = dangerInspectInfoService.updateDangerInspectInfo(dangerInspectInfo);
126 //TODO 返回false说明什么？ 132 //TODO 返回false说明什么？
127 if(ok) { 133 if(ok) {
128 result.success("修改成功!"); 134 result.success("修改成功!");
...@@ -145,7 +151,7 @@ public class DangerInspectInfoController { ...@@ -145,7 +151,7 @@ public class DangerInspectInfoController {
145 @DeleteMapping(value = "/delete") 151 @DeleteMapping(value = "/delete")
146 public Result<?> delete(@RequestParam(name="id",required=true) String id) { 152 public Result<?> delete(@RequestParam(name="id",required=true) String id) {
147 try { 153 try {
148 dangerInspectInfoService.removeById(id); 154 dangerInspectInfoService.delById(id);
149 } catch (Exception e) { 155 } catch (Exception e) {
150 log.error("删除失败",e.getMessage()); 156 log.error("删除失败",e.getMessage());
151 return Result.error("删除失败!"); 157 return Result.error("删除失败!");
......
sk-module-biz/src/main/java/com/skua/modules/safe/controller/DangerInspectItemController.java
...@@ -76,6 +76,7 @@ public class DangerInspectItemController { ...@@ -76,6 +76,7 @@ public class DangerInspectItemController {
76 QueryWrapper<DangerInspectItem> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspectItem, req.getParameterMap()); 76 QueryWrapper<DangerInspectItem> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspectItem, req.getParameterMap());
77 Page<DangerInspectItem> page = new Page<DangerInspectItem>(pageNo, pageSize); 77 Page<DangerInspectItem> page = new Page<DangerInspectItem>(pageNo, pageSize);
78 IPage<DangerInspectItem> pageList = dangerInspectItemService.page(page, queryWrapper); 78 IPage<DangerInspectItem> pageList = dangerInspectItemService.page(page, queryWrapper);
79 queryWrapper.eq("inspect_obj_id", dangerInspectItem.getInspectObjId());
79 result.setSuccess(true); 80 result.setSuccess(true);
80 result.setResult(pageList); 81 result.setResult(pageList);
81 return result; 82 return result;
......
sk-module-biz/src/main/java/com/skua/modules/safe/controller/DangerInspectionController.java
...@@ -75,7 +75,12 @@ public class DangerInspectionController { ...@@ -75,7 +75,12 @@ public class DangerInspectionController {
75 Result<IPage<DangerInspection>> result = new Result<IPage<DangerInspection>>(); 75 Result<IPage<DangerInspection>> result = new Result<IPage<DangerInspection>>();
76 QueryWrapper<DangerInspection> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspection, req.getParameterMap()); 76 QueryWrapper<DangerInspection> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspection, req.getParameterMap());
77 Page<DangerInspection> page = new Page<DangerInspection>(pageNo, pageSize); 77 Page<DangerInspection> page = new Page<DangerInspection>(pageNo, pageSize);
78 queryWrapper.eq("danger_id",dangerInspection.getDangerId());
79 queryWrapper.orderByDesc("create_time");
80
78 IPage<DangerInspection> pageList = dangerInspectionService.page(page, queryWrapper); 81 IPage<DangerInspection> pageList = dangerInspectionService.page(page, queryWrapper);
82
83
79 result.setSuccess(true); 84 result.setSuccess(true);
80 result.setResult(pageList); 85 result.setResult(pageList);
81 return result; 86 return result;
......
sk-module-biz/src/main/java/com/skua/modules/safe/controller/DangerInspectionItemController.java
...@@ -75,6 +75,9 @@ public class DangerInspectionItemController { ...@@ -75,6 +75,9 @@ public class DangerInspectionItemController {
75 Result<IPage<DangerInspectionItem>> result = new Result<IPage<DangerInspectionItem>>(); 75 Result<IPage<DangerInspectionItem>> result = new Result<IPage<DangerInspectionItem>>();
76 QueryWrapper<DangerInspectionItem> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspectionItem, req.getParameterMap()); 76 QueryWrapper<DangerInspectionItem> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspectionItem, req.getParameterMap());
77 Page<DangerInspectionItem> page = new Page<DangerInspectionItem>(pageNo, pageSize); 77 Page<DangerInspectionItem> page = new Page<DangerInspectionItem>(pageNo, pageSize);
78 queryWrapper.eq("inspect_obj_id",dangerInspectionItem.getInspectObjId());
79 queryWrapper.orderByDesc("create_time");
80
78 IPage<DangerInspectionItem> pageList = dangerInspectionItemService.page(page, queryWrapper); 81 IPage<DangerInspectionItem> pageList = dangerInspectionItemService.page(page, queryWrapper);
79 result.setSuccess(true); 82 result.setSuccess(true);
80 result.setResult(pageList); 83 result.setResult(pageList);
......
sk-module-biz/src/main/java/com/skua/modules/safe/controller/DangerInspectionRecodeController.java
...@@ -75,6 +75,8 @@ public class DangerInspectionRecodeController { ...@@ -75,6 +75,8 @@ public class DangerInspectionRecodeController {
75 Result<IPage<DangerInspectionRecode>> result = new Result<IPage<DangerInspectionRecode>>(); 75 Result<IPage<DangerInspectionRecode>> result = new Result<IPage<DangerInspectionRecode>>();
76 QueryWrapper<DangerInspectionRecode> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspectionRecode, req.getParameterMap()); 76 QueryWrapper<DangerInspectionRecode> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspectionRecode, req.getParameterMap());
77 Page<DangerInspectionRecode> page = new Page<DangerInspectionRecode>(pageNo, pageSize); 77 Page<DangerInspectionRecode> page = new Page<DangerInspectionRecode>(pageNo, pageSize);
78 queryWrapper.eq("danger_id",dangerInspectionRecode.getDangerId());
79 queryWrapper.orderByDesc("create_time");
78 IPage<DangerInspectionRecode> pageList = dangerInspectionRecodeService.page(page, queryWrapper); 80 IPage<DangerInspectionRecode> pageList = dangerInspectionRecodeService.page(page, queryWrapper);
79 result.setSuccess(true); 81 result.setSuccess(true);
80 result.setResult(pageList); 82 result.setResult(pageList);
......
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/DangerInspectItemMapper.java
...@@ -11,4 +11,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -11,4 +11,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
11 */ 11 */
12 public interface DangerInspectItemMapper extends BaseMapper<DangerInspectItem> { 12 public interface DangerInspectItemMapper extends BaseMapper<DangerInspectItem> {
13 13
14 /**
15 * 根据inspectObjId删除记录集合
16 * @param inspectObjId
17 */
18 public void deleteByInspectInfoId(@Param("inspectObjId") String inspectObjId);
14 } 19 }
......
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/xml/DangerInspectItemMapper.xml
...@@ -2,4 +2,8 @@ ...@@ -2,4 +2,8 @@
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 <mapper namespace="com.skua.modules.safe.mapper.DangerInspectItemMapper"> 3 <mapper namespace="com.skua.modules.safe.mapper.DangerInspectItemMapper">
4 4
5 <!-- 根据inspectObjId删除记录集合-->
6 <delete id="deleteByInspectInfoId">
7 delete from danger_inspect_item where inspect_obj_id =#{inspectObjId}
8 </delete>
5 </mapper> 9 </mapper>
...\ No newline at end of file ...\ No newline at end of file
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/IDangerInspectInfoService.java
...@@ -2,10 +2,30 @@ package com.skua.modules.safe.service; ...@@ -2,10 +2,30 @@ package com.skua.modules.safe.service;
2 2
3 import com.skua.modules.safe.entity.DangerInspectInfo; 3 import com.skua.modules.safe.entity.DangerInspectInfo;
4 import com.baomidou.mybatisplus.extension.service.IService; 4 import com.baomidou.mybatisplus.extension.service.IService;
5 import com.skua.modules.safe.vo.DangerInspectInfoVO;
5 6
6 /** 7 /**
7 * 检查内容对象 8 * 检查内容对象
8 */ 9 */
9 public interface IDangerInspectInfoService extends IService<DangerInspectInfo> { 10 public interface IDangerInspectInfoService extends IService<DangerInspectInfo> {
10 11
12 /***
13 * 根据id删除检查内容对象、以及检查项对象
14 * @param id
15 */
16 public void delById(String id);
17
18 /***
19 * 修改检查内容对象、以及检查项对象
20 * @param dangerInspectInfoVO
21 * @return
22 */
23 public boolean updateDangerInspectInfo(DangerInspectInfoVO dangerInspectInfoVO);
24
25
26 /***
27 * 新增检查内容对象、以及检查项对象
28 * @param dangerInspectInfoVO
29 */
30 public void saveDangerInspectInfo(DangerInspectInfoVO dangerInspectInfoVO);
11 } 31 }
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/DangerInspectInfoServiceImpl.java
1 package com.skua.modules.safe.service.impl; 1 package com.skua.modules.safe.service.impl;
2 2
3 import com.skua.modules.safe.entity.DangerInspectInfo; 3 import com.skua.modules.safe.entity.DangerInspectInfo;
4 import com.skua.modules.safe.entity.DangerInspectItem;
4 import com.skua.modules.safe.mapper.DangerInspectInfoMapper; 5 import com.skua.modules.safe.mapper.DangerInspectInfoMapper;
6 import com.skua.modules.safe.mapper.DangerInspectItemMapper;
5 import com.skua.modules.safe.service.IDangerInspectInfoService; 7 import com.skua.modules.safe.service.IDangerInspectInfoService;
8 import com.skua.modules.safe.vo.DangerInspectInfoVO;
9 import org.springframework.beans.BeanUtils;
6 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
7 11
8 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 12 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
13 import org.springframework.transaction.annotation.Transactional;
14
15 import javax.annotation.Resource;
9 16
10 /** 17 /**
11 * 检查内容对象 18 * 检查内容对象
...@@ -13,4 +20,59 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -13,4 +20,59 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
13 @Service 20 @Service
14 public class DangerInspectInfoServiceImpl extends ServiceImpl<DangerInspectInfoMapper, DangerInspectInfo> implements IDangerInspectInfoService { 21 public class DangerInspectInfoServiceImpl extends ServiceImpl<DangerInspectInfoMapper, DangerInspectInfo> implements IDangerInspectInfoService {
15 22
23 @Resource
24 private DangerInspectItemMapper inspectItemMapper;
25 /***
26 * 根据id删除检查内容对象、以及检查项对象
27 * @param id
28 */
29 @Transactional
30 public void delById(String id){
31 //根据DangerInspectInfoID删除检查项对象
32 inspectItemMapper.deleteByInspectInfoId(id);
33 this.baseMapper.deleteById(id);
34
35 }
36
37 /***
38 * 修改检查内容对象、以及检查项对象
39 * @param dangerInspectInfoVO
40 * @return
41 */
42 @Transactional
43 public boolean updateDangerInspectInfo(DangerInspectInfoVO dangerInspectInfoVO){
44 DangerInspectInfo dangerInspectInfo = new DangerInspectInfo();
45 BeanUtils.copyProperties( dangerInspectInfoVO ,dangerInspectInfo );
46 int count = this.baseMapper.updateById( dangerInspectInfo );
47
48 //根据检查内容对象，删除检查项目集合
49 inspectItemMapper.deleteByInspectInfoId(dangerInspectInfoVO.getId());
50 if(dangerInspectInfoVO.getDangerInspectItemList() != null ){
51 for(DangerInspectItem dangerInspectItem : dangerInspectInfoVO.getDangerInspectItemList()){
52 dangerInspectItem.setInspectObjId( dangerInspectInfoVO.getId() ) ;
53 inspectItemMapper.insert(dangerInspectItem) ;
54 }
55 }
56 return count > 0 ?true : false;
57 }
58
59
60 /***
61 * 新增检查内容对象、以及检查项对象
62 * @param dangerInspectInfoVO
63 */
64 public void saveDangerInspectInfo(DangerInspectInfoVO dangerInspectInfoVO){
65 DangerInspectInfo dangerInspectInfo = new DangerInspectInfo();
66 BeanUtils.copyProperties( dangerInspectInfoVO ,dangerInspectInfo );
67 this.baseMapper.insert( dangerInspectInfo );
68
69 //根据检查内容对象，删除检查项目集合
70 if(dangerInspectInfoVO.getDangerInspectItemList() != null ){
71 for(DangerInspectItem dangerInspectItem : dangerInspectInfoVO.getDangerInspectItemList()){
72 dangerInspectItem.setInspectObjId( dangerInspectInfoVO.getId() ) ;
73 inspectItemMapper.insert(dangerInspectItem) ;
74 }
75 }
76
77 }
16 } 78 }
......
sk-module-biz/src/main/java/com/skua/modules/safe/vo/DangerInspectInfoVO.java 0 → 100644
1 package com.skua.modules.safe.vo;
2
3 import com.baomidou.mybatisplus.annotation.IdType;
4 import com.baomidou.mybatisplus.annotation.TableId;
5 import com.baomidou.mybatisplus.annotation.TableName;
6 import com.skua.modules.safe.entity.DangerInspectItem;
7 import io.swagger.annotations.ApiModel;
8 import io.swagger.annotations.ApiModelProperty;
9 import lombok.Data;
10 import lombok.EqualsAndHashCode;
11 import lombok.experimental.Accessors;
12 import org.jeecgframework.poi.excel.annotation.Excel;
13
14 import java.util.List;
15
16 /**
17 * 检查内容对象
18 */
19 @Data
20 @EqualsAndHashCode(callSuper = false)
21 @Accessors(chain = true)
22 @ApiModel(value="danger_inspect_info对象", description="检查内容对象")
23 public class DangerInspectInfoVO {
24
25 /**id*/
26 @TableId(type = IdType.ID_WORKER_STR)
27 @ApiModelProperty(value = "id")
28 private String id;
29 /**风险点编号*/
30 @Excel(name = "风险点编号", width = 15)
31 @ApiModelProperty(value = "风险点编号")
32 private String dangerLevelId;
33 /**检查内容*/
34 @Excel(name = "检查内容", width = 15)
35 @ApiModelProperty(value = "检查内容")
36 private String inspectName;
37 /**检查标准*/
38 @Excel(name = "检查标准", width = 15)
39 @ApiModelProperty(value = "检查标准")
40 private String inspectStandard;
41 /**检查方法*/
42 @Excel(name = "检查方法", width = 15)
43 @ApiModelProperty(value = "检查方法")
44 private String inspectMethod;
45
46
47 @Excel(name = "检查项集合", width = 15)
48 @ApiModelProperty(value = "检查项集合")
49 private List<DangerInspectItem> dangerInspectItemList ;
50 }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!