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

@@ -20,6 +20,7 @@ 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.edu.vo.PaperVO;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -84,7 +85,7 @@ public class PaperController {
 	 * <pre>
 	 * 	添加
 	 * </pre>
-	 * @param paper
+	 * @param paperVO
 	 * @return
 	 * @author 开发者姓名, 开发时间
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
@@ -92,10 +93,10 @@ public class PaperController {
 	@AutoLog(value = "在线考试-试卷-添加")
 	@ApiOperation(value="在线考试-试卷-添加", notes="在线考试-试卷-添加")
 	@PostMapping(value = "/add")
-	public Result<Paper> add(@RequestBody Paper paper) {
+	public Result<Paper> add(@RequestBody PaperVO paperVO) throws Exception{
 		Result<Paper> result = new Result<Paper>();
 		try {
-			paperService.save(paper);
+			paperService.savePaper(paperVO);
 			result.success("添加成功！");
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
@@ -107,7 +108,7 @@ public class PaperController {
 	 * <pre>
 	 * 	 编辑
 	 * </pre>
-	 * @param paper
+	 * @param paperVO
 	 * @return
 	 * @author 开发者姓名, 开发时间
 	 * @Description: TODO(这里描述这个方法的需求变更情况)
@@ -115,7 +116,27 @@ public class PaperController {
 	@AutoLog(value = "在线考试-试卷-编辑")
 	@ApiOperation(value="在线考试-试卷-编辑", notes="在线考试-试卷-编辑")
 	@PutMapping(value = "/edit")
-	public Result<Paper> edit(@RequestBody Paper paper) {
+	public Result<Paper> edit(@RequestBody PaperVO paperVO)  throws Exception{
+		Result<Paper> result = new Result<Paper>();
+		Paper paperEntity = paperService.getById(paperVO.getId());
+		if(paperEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = paperService.updatePaper(paperVO);
+			//TODO 返回false说明什么？
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		return result;
+	}
+
+
+
+	@AutoLog(value = "在线考试-发布试卷")
+	@ApiOperation(value="在线考试-发布试卷", notes="在线考试-发布试卷")
+	@PutMapping(value = "/publish")
+	public Result<Paper> publish(@RequestBody Paper paper) {
 		Result<Paper> result = new Result<Paper>();
 		Paper paperEntity = paperService.getById(paper.getId());
 		if(paperEntity==null) {
@@ -127,7 +148,6 @@ public class PaperController {
 				result.success("修改成功!");
 			}
 		}
-
 		return result;
 	}
 	/**

@@ -2,10 +2,28 @@ package com.skua.modules.edu.service;
 
 import com.skua.modules.edu.entity.Paper;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.skua.modules.edu.vo.PaperVO;
+
+import javax.transaction.Transactional;
 
 /**
  * 在线考试-试卷
  */
 public interface IPaperService extends IService<Paper> {
 
+    /***
+     * 添加试卷、试卷试题表
+     * @param paperVO
+     * @return
+     */
+    public  int savePaper(PaperVO paperVO)throws Exception;
+
+    /**
+     * 修改试卷、试卷试题表
+     * @param paperVO
+     * @return
+     * @throws Exception
+     */
+    public boolean updatePaper(PaperVO paperVO) throws Exception ;
+
 }

@@ -78,6 +78,8 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, Paper> implements
                 paperQuestionMapper.insert(  paperQuestion  ) ;
             }
         }
+
+
         return true;
     }
 

 package com.skua.modules.edu.service.impl;
 
+import com.google.gson.Gson;
 import com.skua.modules.edu.entity.Question;
 import com.skua.modules.edu.entity.QuestionOption;
 import com.skua.modules.edu.mapper.QuestionMapper;
@@ -40,7 +41,14 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                 option.setQuestionId( questionVO.getId() ) ;
                 optionMapper.insert( option );
             }
+            // 创建Gson实例
+            Gson gson = new Gson();
+            // 将List转换为Json字符串
+            String questionData = gson.toJson( questionVO.getOptionVOList() ) ;
+            question.setQuestionData( questionData ) ;
+            this.baseMapper.updateById( question ) ;
         }
+
         return count;
     }
 
@@ -56,7 +64,6 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         Question question = new Question();
         //将questionVO的属性 赋值给  question
         BeanUtils.copyProperties(questionVO, question);
-        this.baseMapper.updateById( question  );
 
         // 步骤2：根据试题编号删除，试题选项集合
         optionMapper.delByQuestionId( questionVO.getId() ) ;
@@ -66,7 +73,14 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                 option.setQuestionId( questionVO.getId() ) ;
                 optionMapper.insert( option );
             }
+            // 创建Gson实例
+            Gson gson = new Gson();
+            // 将List转换为Json字符串
+            String questionData = gson.toJson( questionVO.getOptionVOList() ) ;
+            question.setQuestionData( questionData ) ;
         }
+        //保存
+        this.baseMapper.updateById( question  );
 
         return true;
     }

@@ -20,6 +20,7 @@ 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.vo.DangerInspectInfoVO;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -75,7 +76,12 @@ public class DangerInspectInfoController {
 		Result<IPage<DangerInspectInfo>> result = new Result<IPage<DangerInspectInfo>>();
 		QueryWrapper<DangerInspectInfo> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspectInfo, req.getParameterMap());
 		Page<DangerInspectInfo> page = new Page<DangerInspectInfo>(pageNo, pageSize);
+		queryWrapper.eq("danger_level_id",dangerInspectInfo.getDangerLevelId());
+		queryWrapper.orderByDesc("create_time");
+
 		IPage<DangerInspectInfo> pageList = dangerInspectInfoService.page(page, queryWrapper);
+
+
 		result.setSuccess(true);
 		result.setResult(pageList);
 		return result;
@@ -93,10 +99,10 @@ public class DangerInspectInfoController {
 	@AutoLog(value = "检查内容对象-添加")
 	@ApiOperation(value="检查内容对象-添加", notes="检查内容对象-添加")
 	@PostMapping(value = "/add")
-	public Result<DangerInspectInfo> add(@RequestBody DangerInspectInfo dangerInspectInfo) {
+	public Result<DangerInspectInfo> add(@RequestBody DangerInspectInfoVO dangerInspectInfo) {
 		Result<DangerInspectInfo> result = new Result<DangerInspectInfo>();
 		try {
-			dangerInspectInfoService.save(dangerInspectInfo);
+			dangerInspectInfoService.saveDangerInspectInfo(dangerInspectInfo);
 			result.success("添加成功！");
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
@@ -116,13 +122,13 @@ public class DangerInspectInfoController {
 	@AutoLog(value = "检查内容对象-编辑")
 	@ApiOperation(value="检查内容对象-编辑", notes="检查内容对象-编辑")
 	@PutMapping(value = "/edit")
-	public Result<DangerInspectInfo> edit(@RequestBody DangerInspectInfo dangerInspectInfo) {
+	public Result<DangerInspectInfo> edit(@RequestBody DangerInspectInfoVO dangerInspectInfo) {
 		Result<DangerInspectInfo> result = new Result<DangerInspectInfo>();
 		DangerInspectInfo dangerInspectInfoEntity = dangerInspectInfoService.getById(dangerInspectInfo.getId());
 		if(dangerInspectInfoEntity==null) {
 			result.error500("未找到对应实体");
 		}else {
-			boolean ok = dangerInspectInfoService.updateById(dangerInspectInfo);
+			boolean ok = dangerInspectInfoService.updateDangerInspectInfo(dangerInspectInfo);
 			//TODO 返回false说明什么？
 			if(ok) {
 				result.success("修改成功!");
@@ -145,7 +151,7 @@ public class DangerInspectInfoController {
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		try {
-			dangerInspectInfoService.removeById(id);
+			dangerInspectInfoService.delById(id);
 		} catch (Exception e) {
 			log.error("删除失败",e.getMessage());
 			return Result.error("删除失败!");

@@ -76,6 +76,7 @@ public class DangerInspectItemController {
 		QueryWrapper<DangerInspectItem> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspectItem, req.getParameterMap());
 		Page<DangerInspectItem> page = new Page<DangerInspectItem>(pageNo, pageSize);
 		IPage<DangerInspectItem> pageList = dangerInspectItemService.page(page, queryWrapper);
+		queryWrapper.eq("inspect_obj_id", dangerInspectItem.getInspectObjId());
 		result.setSuccess(true);
 		result.setResult(pageList);
 		return result;

@@ -75,7 +75,12 @@ public class DangerInspectionController {
 		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;

@@ -75,6 +75,9 @@ public class DangerInspectionItemController {
 		Result<IPage<DangerInspectionItem>> result = new Result<IPage<DangerInspectionItem>>();
 		QueryWrapper<DangerInspectionItem> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspectionItem, req.getParameterMap());
 		Page<DangerInspectionItem> page = new Page<DangerInspectionItem>(pageNo, pageSize);
+		queryWrapper.eq("inspect_obj_id",dangerInspectionItem.getInspectObjId());
+		queryWrapper.orderByDesc("create_time");
+
 		IPage<DangerInspectionItem> pageList = dangerInspectionItemService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);

@@ -75,6 +75,8 @@ public class DangerInspectionRecodeController {
 		Result<IPage<DangerInspectionRecode>> result = new Result<IPage<DangerInspectionRecode>>();
 		QueryWrapper<DangerInspectionRecode> queryWrapper = QueryGenerator.initQueryWrapper(dangerInspectionRecode, req.getParameterMap());
 		Page<DangerInspectionRecode> page = new Page<DangerInspectionRecode>(pageNo, pageSize);
+		queryWrapper.eq("danger_id",dangerInspectionRecode.getDangerId());
+		queryWrapper.orderByDesc("create_time");
 		IPage<DangerInspectionRecode> pageList = dangerInspectionRecodeService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);

@@ -11,4 +11,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface DangerInspectItemMapper extends BaseMapper<DangerInspectItem> {
 
+    /**
+     * 根据inspectObjId删除记录集合
+     * @param inspectObjId
+     */
+    public  void deleteByInspectInfoId(@Param("inspectObjId") String inspectObjId);
 }

@@ -2,4 +2,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.DangerInspectItemMapper">
 
+    <!-- 根据inspectObjId删除记录集合-->
+    <delete id="deleteByInspectInfoId">
+        delete from danger_inspect_item where inspect_obj_id =#{inspectObjId}
+    </delete>
 </mapper>
\ No newline at end of file

@@ -2,10 +2,30 @@ package com.skua.modules.safe.service;
 
 import com.skua.modules.safe.entity.DangerInspectInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.skua.modules.safe.vo.DangerInspectInfoVO;
 
 /**
  * 检查内容对象
  */
 public interface IDangerInspectInfoService extends IService<DangerInspectInfo> {
 
+    /***
+     *  根据id删除检查内容对象、以及检查项对象
+     * @param id
+     */
+    public  void delById(String id);
+
+    /***
+     *  修改检查内容对象、以及检查项对象
+     * @param dangerInspectInfoVO
+     * @return
+     */
+    public  boolean updateDangerInspectInfo(DangerInspectInfoVO dangerInspectInfoVO);
+
+
+    /***
+     *  新增检查内容对象、以及检查项对象
+     * @param dangerInspectInfoVO
+     */
+    public  void saveDangerInspectInfo(DangerInspectInfoVO dangerInspectInfoVO);
 }

 package com.skua.modules.safe.service.impl;
 
 import com.skua.modules.safe.entity.DangerInspectInfo;
+import com.skua.modules.safe.entity.DangerInspectItem;
 import com.skua.modules.safe.mapper.DangerInspectInfoMapper;
+import com.skua.modules.safe.mapper.DangerInspectItemMapper;
 import com.skua.modules.safe.service.IDangerInspectInfoService;
+import com.skua.modules.safe.vo.DangerInspectInfoVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
 
 /**
  * 检查内容对象
@@ -13,4 +20,59 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class DangerInspectInfoServiceImpl extends ServiceImpl<DangerInspectInfoMapper, DangerInspectInfo> implements IDangerInspectInfoService {
 
+    @Resource
+    private DangerInspectItemMapper   inspectItemMapper;
+    /***
+     *  根据id删除检查内容对象、以及检查项对象
+     * @param id
+     */
+    @Transactional
+    public  void delById(String id){
+        //根据DangerInspectInfoID删除检查项对象
+        inspectItemMapper.deleteByInspectInfoId(id);
+        this.baseMapper.deleteById(id);
+
+    }
+
+    /***
+     *  修改检查内容对象、以及检查项对象
+     * @param dangerInspectInfoVO
+     * @return
+     */
+    @Transactional
+    public  boolean updateDangerInspectInfo(DangerInspectInfoVO dangerInspectInfoVO){
+        DangerInspectInfo  dangerInspectInfo = new DangerInspectInfo();
+        BeanUtils.copyProperties( dangerInspectInfoVO  ,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.insert(dangerInspectItem) ;
+            }
+        }
+        return count > 0 ?true : false;
+    }
+
+
+    /***
+     *  新增检查内容对象、以及检查项对象
+     * @param dangerInspectInfoVO
+     */
+    public  void saveDangerInspectInfo(DangerInspectInfoVO dangerInspectInfoVO){
+        DangerInspectInfo  dangerInspectInfo = new DangerInspectInfo();
+        BeanUtils.copyProperties( dangerInspectInfoVO  ,dangerInspectInfo   );
+        this.baseMapper.insert( dangerInspectInfo );
+
+        //根据检查内容对象，删除检查项目集合
+        if(dangerInspectInfoVO.getDangerInspectItemList() != null ){
+            for(DangerInspectItem  dangerInspectItem :  dangerInspectInfoVO.getDangerInspectItemList()){
+                dangerInspectItem.setInspectObjId( dangerInspectInfoVO.getId() ) ;
+                inspectItemMapper.insert(dangerInspectItem) ;
+            }
+        }
+
+    }
 }

+package com.skua.modules.safe.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.skua.modules.safe.entity.DangerInspectItem;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.List;
+
+/**
+ * 检查内容对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="danger_inspect_info对象", description="检查内容对象")
+public class DangerInspectInfoVO {
+
+    /**id*/
+    @TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "id")
+    private String id;
+    /**风险点编号*/
+    @Excel(name = "风险点编号", width = 15)
+    @ApiModelProperty(value = "风险点编号")
+    private String dangerLevelId;
+    /**检查内容*/
+    @Excel(name = "检查内容", width = 15)
+    @ApiModelProperty(value = "检查内容")
+    private String inspectName;
+    /**检查标准*/
+    @Excel(name = "检查标准", width = 15)
+    @ApiModelProperty(value = "检查标准")
+    private String inspectStandard;
+    /**检查方法*/
+    @Excel(name = "检查方法", width = 15)
+    @ApiModelProperty(value = "检查方法")
+    private String inspectMethod;
+
+
+    @Excel(name = "检查项集合", width = 15)
+    @ApiModelProperty(value = "检查项集合")
+    private List<DangerInspectItem> dangerInspectItemList ;
+}