kangwei: 风险点---移动端---风险点巡检--开始巡检

@@ -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) {

@@ -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);//默认全部
 		}

+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;
+    }*/
+
+
+
+}

@@ -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;
@@ -81,4 +83,9 @@ public class DangerInspectInfo {
 	@Excel(name = "删除标识，1有效，0删除", width = 15)
     @ApiModelProperty(value = "删除标识，1有效，0删除")
 	private Integer delFlag;
+
+
+	@TableField(exist=false)
+	@ApiModelProperty(value = "检查项集合")
+	private List<DangerInspectItem> dangerInspectItemList ;
 }

@@ -46,7 +46,7 @@ public class DangerInspection {
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "上报时间")
-	private Date reportDate;
+	private String reportDate;
 	/**巡检状态(0:未开始，1:开始，2:结束，3：作废)*/
 	@Excel(name = "巡检状态(0:未开始，1:开始，2:结束，3：作废)", width = 15)
     @ApiModelProperty(value = "巡检状态(0:未开始，1:开始，2:结束，3：作废)")

@@ -128,4 +128,10 @@ public class DangerLevelManage {
 	/**删除标识，1有效，0删除*/
     @ApiModelProperty(value = "删除标识，1有效，0删除")
 	private Integer delFlag;
+
+
+	@TableField(exist=false)
+	@ApiModelProperty(value = "上次巡检时间")
+	private String lastInspectionTime;
+
 }

@@ -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);
 }

@@ -8,4 +8,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IDangerInspectionService extends IService<DangerInspection> {
 
+    /**
+     * 根据分线点编号dangerId，获取最新的巡检记录
+     * @param dangerId
+     * @return
+     */
+    public DangerInspection queryOneByDangerId(String dangerId);
 }

 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,20 +73,19 @@ 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) ;
             }
         }
@@ -59,17 +95,15 @@ public class DangerInspectInfoServiceImpl extends ServiceImpl<DangerInspectInfoM
 
     /***
      *  新增检查内容对象、以及检查项对象
-     * @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) ;
             }
         }

 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;
@@ -13,4 +16,16 @@ 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);
+    }
+
 }