Skip to content

张雷 / skboot-zhongye

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

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

1 个父辈 b5397fcb
内嵌 并排
正在显示 10 个修改的文件 包含 282 行增加 和 25 行删除
sk-module-biz/src/main/java/com/skua/modules/safe/controller/DangerInspectInfoController.java
...@@ -99,7 +99,7 @@ public class DangerInspectInfoController { ...@@ -99,7 +99,7 @@ public class DangerInspectInfoController {
99 @AutoLog(value = "检查内容对象-添加") 99 @AutoLog(value = "检查内容对象-添加")
100 @ApiOperation(value="检查内容对象-添加", notes="检查内容对象-添加") 100 @ApiOperation(value="检查内容对象-添加", notes="检查内容对象-添加")
101 @PostMapping(value = "/add") 101 @PostMapping(value = "/add")
102 public Result<DangerInspectInfo> add(@RequestBody DangerInspectInfoVO dangerInspectInfo) { 102 public Result<DangerInspectInfo> add(@RequestBody DangerInspectInfo dangerInspectInfo) {
103 Result<DangerInspectInfo> result = new Result<DangerInspectInfo>(); 103 Result<DangerInspectInfo> result = new Result<DangerInspectInfo>();
104 try { 104 try {
105 dangerInspectInfoService.saveDangerInspectInfo(dangerInspectInfo); 105 dangerInspectInfoService.saveDangerInspectInfo(dangerInspectInfo);
...@@ -122,7 +122,7 @@ public class DangerInspectInfoController { ...@@ -122,7 +122,7 @@ public class DangerInspectInfoController {
122 @AutoLog(value = "检查内容对象-编辑") 122 @AutoLog(value = "检查内容对象-编辑")
123 @ApiOperation(value="检查内容对象-编辑", notes="检查内容对象-编辑") 123 @ApiOperation(value="检查内容对象-编辑", notes="检查内容对象-编辑")
124 @PutMapping(value = "/edit") 124 @PutMapping(value = "/edit")
125 public Result<DangerInspectInfo> edit(@RequestBody DangerInspectInfoVO dangerInspectInfo) { 125 public Result<DangerInspectInfo> edit(@RequestBody DangerInspectInfo dangerInspectInfo) {
126 Result<DangerInspectInfo> result = new Result<DangerInspectInfo>(); 126 Result<DangerInspectInfo> result = new Result<DangerInspectInfo>();
127 DangerInspectInfo dangerInspectInfoEntity = dangerInspectInfoService.getById(dangerInspectInfo.getId()); 127 DangerInspectInfo dangerInspectInfoEntity = dangerInspectInfoService.getById(dangerInspectInfo.getId());
128 if(dangerInspectInfoEntity==null) { 128 if(dangerInspectInfoEntity==null) {
......
sk-module-biz/src/main/java/com/skua/modules/safe/controller/SafetyOffenceRecordController.java
...@@ -123,23 +123,23 @@ public class SafetyOffenceRecordController { ...@@ -123,23 +123,23 @@ public class SafetyOffenceRecordController {
123 Result<IPage<SafetyOffenceRecord>> result = new Result<IPage<SafetyOffenceRecord>>(); 123 Result<IPage<SafetyOffenceRecord>> result = new Result<IPage<SafetyOffenceRecord>>();
124 124
125 Boolean flag = false; 125 Boolean flag = false;
126 /* String role_ah_id = sysConfigService.queryValueByKey("ROLE_AH_ADMIN");//安环管理员角色编号 126 String role_ah_id = sysConfigService.queryValueByKey("ROLE_AH_ADMIN");//安环管理员角色编号
127 String role_cz_id = sysConfigService.queryValueByKey("ROLE_CZ");//厂长角色编号 127 String role_cz_id = sysConfigService.queryValueByKey("ROLE_CZ");//厂长角色编号
128 String userRoleIds = BaseContextHandler.getRoles(); 128 String userRoleIds = BaseContextHandler.getRoles();
129 129
130 safetyOffenceRecord.setDepartId( "0" );//屏蔽数据使用；非安环管理员、与厂长角色看不到数据 130 safetyOffenceRecord.setDepartId( "0" );//屏蔽数据使用；非安环管理员、与厂长角色看不到数据
131 safetyOffenceRecord.setReportType("1");//上报集团--默认
131 132
132 //安装部长角色看集团类型的违法上报 133 //安装部长角色看集团类型的违法上报
133 if( userRoleIds != null && userRoleIds.contains( role_ah_id ) ){//判断安环管理员 134 if( userRoleIds != null && userRoleIds.contains( role_ah_id ) ){//判断安环管理员
134 safetyOffenceRecord.setDepartId( null ); 135 safetyOffenceRecord.setDepartId( null );
135 safetyOffenceRecord.setReportType("1");//上报集团--默认
136 flag = false; 136 flag = false;
137 } 137 }
138 if( userRoleIds != null && userRoleIds.contains( role_cz_id ) ){//判断 厂长 ,查询分管的所有长编号 138 if( userRoleIds != null && userRoleIds.contains( role_cz_id ) ){//判断 厂长 ,查询分管的所有长编号
139 safetyOffenceRecord.setDepartId( BaseContextHandler.getDeparts() );//BaseContextHandler.getRealDepartId() 139 safetyOffenceRecord.setDepartId( BaseContextHandler.getDeparts() );//BaseContextHandler.getRealDepartId()
140 safetyOffenceRecord.setReportType("2");//上报厂长 140 safetyOffenceRecord.setReportType("2");//上报厂长
141 flag = true; 141 flag = true;
142 }*/ 142 }
143 if(safetyOffenceRecord.getStatus() !=null && safetyOffenceRecord.getStatus().equals("0")){ 143 if(safetyOffenceRecord.getStatus() !=null && safetyOffenceRecord.getStatus().equals("0")){
144 safetyOffenceRecord.setStatus(null);//默认全部 144 safetyOffenceRecord.setStatus(null);//默认全部
145 } 145 }
......
sk-module-biz/src/main/java/com/skua/modules/safe/controller/app/APPDangerInspectionController.java 0 → 100644
1 package com.skua.modules.safe.controller.app;
2 import java.util.Arrays;
3 import java.util.List;
4 import java.util.Map;
5 import java.io.IOException;
6 import java.io.UnsupportedEncodingException;
7 import java.net.URLDecoder;
8 import javax.servlet.http.HttpServletRequest;
9 import javax.servlet.http.HttpServletResponse;
10 import com.skua.core.api.vo.Result;
11 import com.skua.core.aspect.annotation.AutoLog;
12 import com.skua.core.context.BaseContextHandler;
13 import com.skua.core.query.QueryGenerator;
14 import com.skua.core.service.ISequenceService;
15 import com.skua.core.util.ConvertUtils;
16 import com.skua.modules.safe.entity.DangerInspectInfo;
17 import com.skua.modules.safe.entity.DangerInspection;
18 import com.skua.modules.safe.entity.DangerLevelManage;
19 import com.skua.modules.safe.service.IDangerInspectInfoService;
20 import com.skua.modules.safe.service.IDangerInspectionService;
21 import java.util.Date;
22 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
23 import com.baomidou.mybatisplus.core.metadata.IPage;
24 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
25 import com.skua.modules.safe.service.IDangerLevelManageService;
26 import lombok.extern.slf4j.Slf4j;
27
28 import org.bytedeco.javacpp.annotation.AsUtf16;
29 import org.jeecgframework.poi.excel.ExcelImportUtil;
30 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
31 import org.jeecgframework.poi.excel.entity.ExportParams;
32 import org.jeecgframework.poi.excel.entity.ImportParams;
33 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
34
35 import org.springframework.beans.factory.annotation.Autowired;
36 import org.springframework.web.bind.annotation.*;
37 import org.springframework.web.multipart.MultipartFile;
38 import org.springframework.web.multipart.MultipartHttpServletRequest;
39 import org.springframework.web.servlet.ModelAndView;
40 import com.alibaba.fastjson.JSON;
41 import io.swagger.annotations.Api;
42 import io.swagger.annotations.ApiOperation;
43
44 /**
45 * <pre>
46 * 风险巡检
47 * </pre>
48 * @author 开发者姓名
49 * @version V0.1, 开发时间
50 */
51 @Slf4j
52 @Api(tags="风险巡检")
53 @RestController("APPDangerInspectionController")
54 @RequestMapping("/app/safe/dangerInspection")
55 public class APPDangerInspectionController {
56
57 @Autowired
58 private IDangerLevelManageService dangerLevelManageService;//风险点Service
59
60 @Autowired
61 private IDangerInspectionService inspectionService;//巡检service
62
63 @Autowired
64 private IDangerInspectInfoService inspectInfoService;//风险点---检查内容对象
65
66 /**
67 * <pre>
68 * 扫描二维码进入：风险点详情
69 * </pre>
70 * @param id
71 * @return
72 * @author 开发者姓名, 开发时间
73 * @Description: TODO(这里描述这个方法的需求变更情况)
74 */
75 @AutoLog(value = "扫描二维码进入：风险点详情")
76 @ApiOperation(value="扫描二维码进入：风险点详情", notes="扫描二维码进入：风险点详情")
77 @GetMapping(value = "/queryDangerById")
78 public Result<DangerLevelManage> queryById(@RequestParam(name="id",required=true) String id) {
79 Result<DangerLevelManage> result = new Result<DangerLevelManage>();
80 DangerLevelManage dangerInspection = dangerLevelManageService.getById(id);
81 //查询：上次巡检时间
82 DangerInspection inspection = inspectionService.queryOneByDangerId( id );//根据分线点编号，获取巡检最后一条记录
83 if(inspection != null ){
84 dangerInspection.setLastInspectionTime( inspection.getReportDate() );
85 }else{
86 dangerInspection.setLastInspectionTime("");
87 }
88 if(dangerInspection==null) {
89 result.error500("未找到对应实体");
90 }else {
91 result.setResult(dangerInspection);
92 result.setSuccess(true);
93 }
94 return result;
95 }
96
97 /**
98 * <pre>
99 * 开始巡检-->获取风险点，检查对象集合
100 * </pre>
101 * @param dangerId
102 * @return
103 * @author 开发者姓名, 开发时间
104 * @Description: TODO(这里描述这个方法的需求变更情况)
105 */
106 @AutoLog(value = "开始巡检-->获取风险点，检查对象集合")
107 @ApiOperation(value="开始巡检-->获取风险点，检查对象集合", notes="开始巡检-->获取风险点，检查对象集合")
108 @GetMapping(value = "/queryInspectInfoByDangerId")
109 public Result< List<DangerInspectInfo> > queryInspectInfoByDangerId(@RequestParam(name="dangerId",required=true) String dangerId) {
110 Result< List<DangerInspectInfo> > result = new Result< List<DangerInspectInfo> >();
111
112 List<DangerInspectInfo > dangerInspectInfoList = inspectInfoService.queryListByDangerId(dangerId);
113 if(dangerInspectInfoList==null) {
114 result.error500("未找到对应实体");
115 }else {
116 result.setResult(dangerInspectInfoList);
117 result.setSuccess(true);
118 }
119 return result;
120 }
121
122 /**
123 * <pre>
124 * 开始巡检-->根据id获取检查内容对象
125 * </pre>
126 * @param id
127 * @return
128 * @author 开发者姓名, 开发时间
129 * @Description: TODO(这里描述这个方法的需求变更情况)
130 */
131 @AutoLog(value = "开始巡检-->根据id获取检查内容对象")
132 @ApiOperation(value="开始巡检-->根据id获取检查内容对象", notes="开始巡检-->根据id获取检查内容对象")
133 @GetMapping(value = "/queryInspectInfoById")
134 public Result< DangerInspectInfo > queryInspectInfoById(@RequestParam(name="id",required=true) String id) {
135 Result< DangerInspectInfo > result = new Result< DangerInspectInfo >();
136
137 DangerInspectInfo dangerInspectInfo = inspectInfoService.getById(id);
138 if(dangerInspectInfo==null) {
139 result.error500("未找到对应实体");
140 }else {
141 result.setResult(dangerInspectInfo);
142 result.setSuccess(true);
143 }
144 return result;
145 }
146
147 /**
148 * <pre>
149 * 开始巡检-->
150 * </pre>
151 * @param id
152 * @return
153 * @author 开发者姓名, 开发时间
154 * @Description: TODO(这里描述这个方法的需求变更情况)
155 */
156 /* @AutoLog(value = "开始巡检-->获取风险点，检查对象集合")
157 @ApiOperation(value="开始巡检-->获取风险点，检查对象集合", notes="开始巡检-->获取风险点，检查对象集合")
158 @GetMapping(value = "/queryInspectInfoById")
159 public Result< DangerInspectInfo > queryByDangerId(@RequestParam(name="id",required=true) String id) {
160 Result< DangerInspectInfo > result = new Result< DangerInspectInfo >();
161
162 DangerInspectInfo dangerInspectInfo = inspectInfoService.getById(id);
163 if(dangerInspectInfo==null) {
164 result.error500("未找到对应实体");
165 }else {
166 result.setResult(dangerInspectInfo);
167 result.setSuccess(true);
168 }
169 return result;
170 }*/
171
172
173
174 }
sk-module-biz/src/main/java/com/skua/modules/safe/entity/DangerInspectInfo.java
...@@ -2,6 +2,8 @@ package com.skua.modules.safe.entity; ...@@ -2,6 +2,8 @@ package com.skua.modules.safe.entity;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
4 import java.util.Date; 4 import java.util.Date;
5 import java.util.List;
6
5 import com.baomidou.mybatisplus.annotation.IdType; 7 import com.baomidou.mybatisplus.annotation.IdType;
6 import com.baomidou.mybatisplus.annotation.TableId; 8 import com.baomidou.mybatisplus.annotation.TableId;
7 import com.baomidou.mybatisplus.annotation.TableName; 9 import com.baomidou.mybatisplus.annotation.TableName;
...@@ -81,4 +83,9 @@ public class DangerInspectInfo { ...@@ -81,4 +83,9 @@ public class DangerInspectInfo {
81 @Excel(name = "删除标识，1有效，0删除", width = 15) 83 @Excel(name = "删除标识，1有效，0删除", width = 15)
82 @ApiModelProperty(value = "删除标识，1有效，0删除") 84 @ApiModelProperty(value = "删除标识，1有效，0删除")
83 private Integer delFlag; 85 private Integer delFlag;
86
87
88 @TableField(exist=false)
89 @ApiModelProperty(value = "检查项集合")
90 private List<DangerInspectItem> dangerInspectItemList ;
84 } 91 }
......
sk-module-biz/src/main/java/com/skua/modules/safe/entity/DangerInspection.java
...@@ -46,7 +46,7 @@ public class DangerInspection { ...@@ -46,7 +46,7 @@ public class DangerInspection {
46 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") 46 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
47 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 47 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
48 @ApiModelProperty(value = "上报时间") 48 @ApiModelProperty(value = "上报时间")
49 private Date reportDate; 49 private String reportDate;
50 /**巡检状态(0:未开始，1:开始，2:结束，3：作废)*/ 50 /**巡检状态(0:未开始，1:开始，2:结束，3：作废)*/
51 @Excel(name = "巡检状态(0:未开始，1:开始，2:结束，3：作废)", width = 15) 51 @Excel(name = "巡检状态(0:未开始，1:开始，2:结束，3：作废)", width = 15)
52 @ApiModelProperty(value = "巡检状态(0:未开始，1:开始，2:结束，3：作废)") 52 @ApiModelProperty(value = "巡检状态(0:未开始，1:开始，2:结束，3：作废)")
......
sk-module-biz/src/main/java/com/skua/modules/safe/entity/DangerLevelManage.java
...@@ -128,4 +128,10 @@ public class DangerLevelManage { ...@@ -128,4 +128,10 @@ public class DangerLevelManage {
128 /**删除标识，1有效，0删除*/ 128 /**删除标识，1有效，0删除*/
129 @ApiModelProperty(value = "删除标识，1有效，0删除") 129 @ApiModelProperty(value = "删除标识，1有效，0删除")
130 private Integer delFlag; 130 private Integer delFlag;
131
132
133 @TableField(exist=false)
134 @ApiModelProperty(value = "上次巡检时间")
135 private String lastInspectionTime;
136
131 } 137 }
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/IDangerInspectInfoService.java
...@@ -4,12 +4,27 @@ import com.skua.modules.safe.entity.DangerInspectInfo; ...@@ -4,12 +4,27 @@ 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 import com.skua.modules.safe.vo.DangerInspectInfoVO;
6 6
7 import java.util.List;
8
7 /** 9 /**
8 * 检查内容对象 10 * 检查内容对象
9 */ 11 */
10 public interface IDangerInspectInfoService extends IService<DangerInspectInfo> { 12 public interface IDangerInspectInfoService extends IService<DangerInspectInfo> {
11 13
12 /*** 14 /***
15 * 根据id编号获取检查内容对象、检查项集合
16 * @param id
17 * @return
18 */
19 public DangerInspectInfo queryById(String id);
20
21 /***
22 * 根据检查点编号，获取检查内容对象集合
23 * @return
24 */
25 public List<DangerInspectInfo> queryListByDangerId(String dangerId);
26
27 /***
13 * 根据id删除检查内容对象、以及检查项对象 28 * 根据id删除检查内容对象、以及检查项对象
14 * @param id 29 * @param id
15 */ 30 */
...@@ -17,15 +32,15 @@ public interface IDangerInspectInfoService extends IService<DangerInspectInfo> { ...@@ -17,15 +32,15 @@ public interface IDangerInspectInfoService extends IService<DangerInspectInfo> {
17 32
18 /*** 33 /***
19 * 修改检查内容对象、以及检查项对象 34 * 修改检查内容对象、以及检查项对象
20 * @param dangerInspectInfoVO 35 * @param dangerInspectInfo
21 * @return 36 * @return
22 */ 37 */
23 public boolean updateDangerInspectInfo(DangerInspectInfoVO dangerInspectInfoVO); 38 public boolean updateDangerInspectInfo(DangerInspectInfo dangerInspectInfo);
24 39
25 40
26 /*** 41 /***
27 * 新增检查内容对象、以及检查项对象 42 * 新增检查内容对象、以及检查项对象
28 * @param dangerInspectInfoVO 43 * @param dangerInspectInfo
29 */ 44 */
30 public void saveDangerInspectInfo(DangerInspectInfoVO dangerInspectInfoVO); 45 public void saveDangerInspectInfo(DangerInspectInfo dangerInspectInfo);
31 } 46 }
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/IDangerInspectionService.java
...@@ -8,4 +8,10 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -8,4 +8,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
8 */ 8 */
9 public interface IDangerInspectionService extends IService<DangerInspection> { 9 public interface IDangerInspectionService extends IService<DangerInspection> {
10 10
11 /**
12 * 根据分线点编号dangerId，获取最新的巡检记录
13 * @param dangerId
14 * @return
15 */
16 public DangerInspection queryOneByDangerId(String dangerId);
11 } 17 }
......
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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
3 import com.skua.modules.safe.entity.DangerInspectInfo; 5 import com.skua.modules.safe.entity.DangerInspectInfo;
4 import com.skua.modules.safe.entity.DangerInspectItem; 6 import com.skua.modules.safe.entity.DangerInspectItem;
5 import com.skua.modules.safe.mapper.DangerInspectInfoMapper; 7 import com.skua.modules.safe.mapper.DangerInspectInfoMapper;
...@@ -13,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -13,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
13 import org.springframework.transaction.annotation.Transactional; 15 import org.springframework.transaction.annotation.Transactional;
14 16
15 import javax.annotation.Resource; 17 import javax.annotation.Resource;
18 import java.util.List;
16 19
17 /** 20 /**
18 * 检查内容对象 21 * 检查内容对象
...@@ -22,6 +25,40 @@ public class DangerInspectInfoServiceImpl extends ServiceImpl<DangerInspectInfoM ...@@ -22,6 +25,40 @@ public class DangerInspectInfoServiceImpl extends ServiceImpl<DangerInspectInfoM
22 25
23 @Resource 26 @Resource
24 private DangerInspectItemMapper inspectItemMapper; 27 private DangerInspectItemMapper inspectItemMapper;
28
29 /***
30 * 根据id编号获取检查内容对象、检查项集合
31 * @param id
32 * @return
33 */
34 public DangerInspectInfo queryById(String id){
35 DangerInspectInfo dangerInspectInfo = this.baseMapper.selectById(id);
36
37
38 String inspectObjId = id;
39 LambdaQueryWrapper<DangerInspectItem> queryWrapper = new LambdaQueryWrapper<DangerInspectItem>();
40 queryWrapper.eq(DangerInspectItem::getInspectObjId, inspectObjId);
41 queryWrapper.orderByDesc(DangerInspectItem::getCreateTime);//添加排序
42 List<DangerInspectItem> inspectItemList = this.inspectItemMapper.selectList(queryWrapper);
43
44 dangerInspectInfo.setDangerInspectItemList( inspectItemList);
45 return dangerInspectInfo;
46 }
47
48
49
50
51 /***
52 * 根据检查点编号，获取检查内容对象集合
53 * @return
54 */
55 public List<DangerInspectInfo> queryListByDangerId(String dangerId){
56 LambdaQueryWrapper<DangerInspectInfo> queryWrapper = new LambdaQueryWrapper<DangerInspectInfo>();
57 queryWrapper.eq(DangerInspectInfo::getDangerLevelId, dangerId);
58 queryWrapper.orderByDesc(DangerInspectInfo::getCreateTime);//添加排序
59 return this.baseMapper.selectList(queryWrapper);
60 }
61
25 /*** 62 /***
26 * 根据id删除检查内容对象、以及检查项对象 63 * 根据id删除检查内容对象、以及检查项对象
27 * @param id 64 * @param id
...@@ -36,20 +73,19 @@ public class DangerInspectInfoServiceImpl extends ServiceImpl<DangerInspectInfoM ...@@ -36,20 +73,19 @@ public class DangerInspectInfoServiceImpl extends ServiceImpl<DangerInspectInfoM
36 73
37 /*** 74 /***
38 * 修改检查内容对象、以及检查项对象 75 * 修改检查内容对象、以及检查项对象
39 * @param dangerInspectInfoVO 76 * @param dangerInspectInfo
40 * @return 77 * @return
41 */ 78 */
42 @Transactional 79 @Transactional
43 public boolean updateDangerInspectInfo(DangerInspectInfoVO dangerInspectInfoVO){ 80 public boolean updateDangerInspectInfo(DangerInspectInfo dangerInspectInfo){
44 DangerInspectInfo dangerInspectInfo = new DangerInspectInfo(); 81
45 BeanUtils.copyProperties( dangerInspectInfoVO ,dangerInspectInfo );
46 int count = this.baseMapper.updateById( dangerInspectInfo ); 82 int count = this.baseMapper.updateById( dangerInspectInfo );
47 83
48 //根据检查内容对象，删除检查项目集合 84 //根据检查内容对象，删除检查项目集合
49 inspectItemMapper.deleteByInspectInfoId(dangerInspectInfoVO.getId()); 85 inspectItemMapper.deleteByInspectInfoId(dangerInspectInfo.getId());
50 if(dangerInspectInfoVO.getDangerInspectItemList() != null ){ 86 if(dangerInspectInfo.getDangerInspectItemList() != null ){
51 for(DangerInspectItem dangerInspectItem : dangerInspectInfoVO.getDangerInspectItemList()){ 87 for(DangerInspectItem dangerInspectItem : dangerInspectInfo.getDangerInspectItemList()){
52 dangerInspectItem.setInspectObjId( dangerInspectInfoVO.getId() ) ; 88 dangerInspectItem.setInspectObjId( dangerInspectInfo.getId() ) ;
53 inspectItemMapper.insert(dangerInspectItem) ; 89 inspectItemMapper.insert(dangerInspectItem) ;
54 } 90 }
55 } 91 }
...@@ -59,17 +95,15 @@ public class DangerInspectInfoServiceImpl extends ServiceImpl<DangerInspectInfoM ...@@ -59,17 +95,15 @@ public class DangerInspectInfoServiceImpl extends ServiceImpl<DangerInspectInfoM
59 95
60 /*** 96 /***
61 * 新增检查内容对象、以及检查项对象 97 * 新增检查内容对象、以及检查项对象
62 * @param dangerInspectInfoVO 98 * @param dangerInspectInfo
63 */ 99 */
64 public void saveDangerInspectInfo(DangerInspectInfoVO dangerInspectInfoVO){ 100 public void saveDangerInspectInfo(DangerInspectInfo dangerInspectInfo){
65 DangerInspectInfo dangerInspectInfo = new DangerInspectInfo();
66 BeanUtils.copyProperties( dangerInspectInfoVO ,dangerInspectInfo );
67 this.baseMapper.insert( dangerInspectInfo ); 101 this.baseMapper.insert( dangerInspectInfo );
68 102
69 //根据检查内容对象，删除检查项目集合 103 //根据检查内容对象，删除检查项目集合
70 if(dangerInspectInfoVO.getDangerInspectItemList() != null ){ 104 if(dangerInspectInfo.getDangerInspectItemList() != null ){
71 for(DangerInspectItem dangerInspectItem : dangerInspectInfoVO.getDangerInspectItemList()){ 105 for(DangerInspectItem dangerInspectItem : dangerInspectInfo.getDangerInspectItemList()){
72 dangerInspectItem.setInspectObjId( dangerInspectInfoVO.getId() ) ; 106 dangerInspectItem.setInspectObjId( dangerInspectInfo.getId() ) ;
73 inspectItemMapper.insert(dangerInspectItem) ; 107 inspectItemMapper.insert(dangerInspectItem) ;
74 } 108 }
75 } 109 }
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/DangerInspectionServiceImpl.java
1 package com.skua.modules.safe.service.impl; 1 package com.skua.modules.safe.service.impl;
2 2
3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
3 import com.skua.modules.safe.entity.DangerInspection; 5 import com.skua.modules.safe.entity.DangerInspection;
4 import com.skua.modules.safe.mapper.DangerInspectionMapper; 6 import com.skua.modules.safe.mapper.DangerInspectionMapper;
5 import com.skua.modules.safe.service.IDangerInspectionService; 7 import com.skua.modules.safe.service.IDangerInspectionService;
8 import com.skua.modules.system.entity.SysUserDepart;
6 import org.springframework.stereotype.Service; 9 import org.springframework.stereotype.Service;
7 10
8 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 11 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...@@ -13,4 +16,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -13,4 +16,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
13 @Service 16 @Service
14 public class DangerInspectionServiceImpl extends ServiceImpl<DangerInspectionMapper, DangerInspection> implements IDangerInspectionService { 17 public class DangerInspectionServiceImpl extends ServiceImpl<DangerInspectionMapper, DangerInspection> implements IDangerInspectionService {
15 18
19 /**
20 * 根据分线点编号dangerId，获取最新的巡检记录
21 * @param dangerId
22 * @return
23 */
24 public DangerInspection queryOneByDangerId(String dangerId){
25 LambdaQueryWrapper<DangerInspection> queryWrapper = new LambdaQueryWrapper<DangerInspection>();
26 queryWrapper.eq(DangerInspection::getDangerId, dangerId);
27 queryWrapper.orderByDesc(DangerInspection::getCreateTime);//添加排序
28 return this.baseMapper.selectOne(queryWrapper);
29 }
30
16 } 31 }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!