admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
Administrator 2023-05-13 18:19:25 +08:00
parent 1c32a48650
commit 2a2f2487bc
6 changed files with 124 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorDevController.java
View File

@ -22,11 +22,11 @@ import java.util.List;
import java.util.Map;
/**
/**
* @Title: Controller
* @Description: 混凝土监测设备
* @author： pds
* @date： 2021-04-22
* @date： 2021-04-22
* @version： V1.0
*/
@RestController
@ -34,94 +34,92 @@ import java.util.Map;
@Slf4j
@Api(tags = "混凝土监测设备")
public class ConcreteMonitorDevController {
@Autowired
private IConcreteMonitorDevService concreteMonitorDevService;
/**
* 分页列表查询
* @return
*/
@ApiOperation(value = " 分页列表查询混凝土监测设备信息", notes = "分页列表查询混凝土监测设备信息", httpMethod="POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"),
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
})
@PostMapping(value = "/list")
public Result<IPage<EntityMap>> queryPageList(@RequestBody Map<String,Object> map) {
return Result.success(concreteMonitorDevService.selectConcreteMonitorDevPageList(map));
}
@Autowired
private IConcreteMonitorDevService concreteMonitorDevService;
@ApiOperation(value = "列表查询混凝土监测设备信息", notes = "列表查询混凝土监测设备信息", httpMethod="POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"),
})
@PostMapping(value = "/selectConcreteMonitorDevList")
public Result<List<ConcreteMonitorDev>> selectConcreteMonitorDevList(@RequestBody Map<String,Object> map) {
return Result.success(concreteMonitorDevService.selectConcreteMonitorDevList(map));
}
/**
* 添加
* @param concreteMonitorDev
* @return
*/
@OperLog(operModul = "大体积混凝土监测管理",operType = "添加混凝土监测设备",operDesc = "添加混凝土监测设备信息")
@ApiOperation(value = " 添加混凝土监测设备信息", notes = "添加混凝土监测设备信息" , httpMethod="POST")
@PostMapping(value = "/add")
public Result<ConcreteMonitorDev> add(@RequestBody ConcreteMonitorDev concreteMonitorDev) {
Result<ConcreteMonitorDev> result = new Result<ConcreteMonitorDev>();
try {
concreteMonitorDevService.saveConcreteMonitorDev(concreteMonitorDev);
result.successMsg("添加成功！");
} catch (Exception e) {
e.printStackTrace();
log.info(e.getMessage());
result.error500("操作失败");
}
return result;
}
/**
* 编辑
* @param concreteMonitorDev
* @return
*/
@OperLog(operModul = "大体积混凝土监测管理",operType = "编辑混凝土监测设备",operDesc = "编辑混凝土监测设备信息")
@ApiOperation(value = "编辑混凝土监测设备信息", notes = "编辑混凝土监测设备信息" , httpMethod="POST")
@PostMapping(value = "/edit")
public Result<ConcreteMonitorDev> edit(@RequestBody ConcreteMonitorDev concreteMonitorDev) {
/**
* 分页列表查询
*
* @return
*/
@ApiOperation(value = " 分页列表查询混凝土监测设备信息", notes = "分页列表查询混凝土监测设备信息", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"),
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
})
@PostMapping(value = "/list")
public Result<IPage<EntityMap>> queryPageList(@RequestBody Map<String, Object> map) {
return Result.success(concreteMonitorDevService.selectConcreteMonitorDevPageList(map));
}
@ApiOperation(value = "列表查询混凝土监测设备信息", notes = "列表查询混凝土监测设备信息", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"),
})
@PostMapping(value = "/selectConcreteMonitorDevList")
public Result<List<ConcreteMonitorDev>> selectConcreteMonitorDevList(@RequestBody Map<String, Object> map) {
return Result.success(concreteMonitorDevService.selectConcreteMonitorDevList(map));
}
/**
* 添加
*
* @param concreteMonitorDev
* @return
*/
@OperLog(operModul = "大体积混凝土监测管理", operType = "添加混凝土监测设备", operDesc = "添加混凝土监测设备信息")
@ApiOperation(value = " 添加混凝土监测设备信息", notes = "添加混凝土监测设备信息", httpMethod = "POST")
@PostMapping(value = "/add")
public Result<ConcreteMonitorDev> add(@RequestBody ConcreteMonitorDev concreteMonitorDev) {
Result<ConcreteMonitorDev> result = new Result<ConcreteMonitorDev>();
concreteMonitorDevService.saveConcreteMonitorDev(concreteMonitorDev);
result.successMsg("添加成功！");
return result;
}
/**
* 编辑
*
* @param concreteMonitorDev
* @return
*/
@OperLog(operModul = "大体积混凝土监测管理", operType = "编辑混凝土监测设备", operDesc = "编辑混凝土监测设备信息")
@ApiOperation(value = "编辑混凝土监测设备信息", notes = "编辑混凝土监测设备信息", httpMethod = "POST")
@PostMapping(value = "/edit")
public Result<ConcreteMonitorDev> edit(@RequestBody ConcreteMonitorDev concreteMonitorDev) {
concreteMonitorDevService.editConcreteMonitorDev(concreteMonitorDev);
return Result.ok();
}
/**
* 通过id删除
* @param
* @return
*/
@OperLog(operModul = "大体积混凝土监测管理",operType = "删除混凝土监测设备",operDesc = "删除混凝土监测设备信息")
@ApiOperation(value = "删除混凝土监测设备信息", notes = "删除混凝土监测设备信息" , httpMethod="POST")
@ApiImplicitParam(name = "id", value = "混凝土监测设备ID", paramType = "query", required = true, dataType = "Integer")
@PostMapping(value = "/delete")
public Result<ConcreteMonitorDev> delete(@RequestBody Map<String,Object> map) {
concreteMonitorDevService.deleteConcreteMonitorDev(MapUtils.getString(map,"id"));
return Result.ok();
}
return Result.ok();
}
/**
* 通过id查询
* @param
* @return
*/
@ApiOperation(value = "通过id查询混凝土监测设备信息", notes = "通过id查询混凝土监测设备信息" , httpMethod="POST")
@ApiImplicitParam(name = "id", value = "混凝土监测设备ID", paramType = "query", required = true, dataType = "Integer")
@PostMapping(value = "/queryById")
public Result<ConcreteMonitorDev> queryById(@RequestBody Map<String,Object> map) {
return Result.success(concreteMonitorDevService.selectConcreteMonitorDevById(MapUtils.getString(map,"id")));
}
/**
* 通过id删除
*
* @param
* @return
*/
@OperLog(operModul = "大体积混凝土监测管理", operType = "删除混凝土监测设备", operDesc = "删除混凝土监测设备信息")
@ApiOperation(value = "删除混凝土监测设备信息", notes = "删除混凝土监测设备信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "混凝土监测设备ID", paramType = "query", required = true, dataType = "Integer")
@PostMapping(value = "/delete")
public Result<ConcreteMonitorDev> delete(@RequestBody Map<String, Object> map) {
concreteMonitorDevService.deleteConcreteMonitorDev(MapUtils.getString(map, "id"));
return Result.ok();
}
/**
* 通过id查询
*
* @param
* @return
*/
@ApiOperation(value = "通过id查询混凝土监测设备信息", notes = "通过id查询混凝土监测设备信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "混凝土监测设备ID", paramType = "query", required = true, dataType = "Integer")
@PostMapping(value = "/queryById")
public Result<ConcreteMonitorDev> queryById(@RequestBody Map<String, Object> map) {
return Result.success(concreteMonitorDevService.selectConcreteMonitorDevById(MapUtils.getString(map, "id")));
}
}

5
src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectController.java
View File

@ -189,11 +189,12 @@ public class ProjectController {
@PostMapping(value = "/edit")
public Result<Project> edit(@RequestBody Project project) {
Result<Project> result = new Result<Project>();
Project projectEntity = projectService.getById(project.getProjectId());
LambdaQueryWrapper<Project> queryWrapper = new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, project.getProjectSn());
Project projectEntity = projectService.getOne(queryWrapper);
if (projectEntity == null) {
result.error500(MessageUtil.get("notFindErr"));
} else {
boolean ok = projectService.updateById(project);
boolean ok = projectService.update(project, queryWrapper);
redisRepository.del("projectInfoBySn:" + project.getProjectSn());
if (ok) {
result.successMsg(MessageUtil.get("editSucess"));

2
src/main/java/com/zhgd/xmgl/modules/quality/mapper/DangerTypeRecordMapper.java
View File

@ -25,7 +25,7 @@ public interface DangerTypeRecordMapper extends BaseMapper<DangerTypeRecord> {
List<EntityMap> selectCompanyChildDangerTypeList(Map<String, Object> map);
List<EntityMap> getBigList(String projectSn);
List<EntityMap> getBigList(Map<String, Object> map);
int deleteRecordById(Long id);
}

40
src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/ISjImageProgressService.xml
View File

@ -38,16 +38,19 @@
a.order_sort,
a.parent_id,
a.remark,
IFNULL(b.record_status, 0) record_status
IFNULL(b.record_status, 0) record_status
from danger_type_record a
INNER JOIN company p1 ON a.sn = p1.headquarters_sn
INNER JOIN project p2 ON p2.company_sn = p1.company_sn
LEFT JOIN (SELECT *
FROM project_danger_type_disable
WHERE project_sn = #{projectSn}
and type = 1) b ON b.danger_type_id = a.id
INNER JOIN company p1 ON a.sn = p1.headquarters_sn
INNER JOIN project p2 ON p2.company_sn = p1.company_sn
LEFT JOIN (SELECT *
FROM project_danger_type_disable
WHERE project_sn = #{projectSn}
and type = 1) b ON b.danger_type_id = a.id
WHERE a.parent_id != 0
and p2.project_sn = #{projectSn}
and p2.project_sn = #{projectSn}
<if test="recordStatus == '0'.toString()">
and b.record_status IS null
</if>
ORDER BY a.parent_id, a.order_sort
</select>
@ -89,16 +92,19 @@
a.order_sort,
a.parent_id,
a.remark,
IFNULL(b.record_status, 0) record_status
IFNULL(b.record_status, 0) record_status
from danger_type_record a
INNER JOIN company p1 ON a.sn = p1.headquarters_sn
INNER JOIN project p2 ON p2.company_sn = p1.company_sn
LEFT JOIN (SELECT *
FROM project_danger_type_disable
WHERE project_sn = #{projectSn}
and type = 1) b ON b.danger_type_id = a.id
INNER JOIN company p1 ON a.sn = p1.headquarters_sn
INNER JOIN project p2 ON p2.company_sn = p1.company_sn
LEFT JOIN (SELECT *
FROM project_danger_type_disable
WHERE project_sn = #{projectSn}
and type = 1) b ON b.danger_type_id = a.id
WHERE a.parent_id = 0
and p2.project_sn = #{projectSn}
and p2.project_sn = #{projectSn}
<if test="recordStatus == '0'.toString()">
and b.record_status IS null
</if>
ORDER BY a.parent_id, a.order_sort
</select>
</mapper>
</mapper>

15
src/main/java/com/zhgd/xmgl/modules/quality/service/impl/DangerTypeRecordServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.quality.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.base.Objects;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.project.entity.ProjectDangerTypeDisable;
import com.zhgd.xmgl.modules.project.mapper.ProjectDangerTypeDisableMapper;
@ -18,6 +19,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -152,7 +154,7 @@ public class DangerTypeRecordServiceImpl extends ServiceImpl<DangerTypeRecordMap
@Override
public List<EntityMap> selectDangerTypeList(Map<String, Object> map) {
String dangerName = MapUtils.getString(map, "dangerName");
List<EntityMap> list = dangerTypeRecordMapper.getBigList(MapUtils.getString(map, "projectSn"));
List<EntityMap> list = dangerTypeRecordMapper.getBigList(map);
List<EntityMap> childList = dangerTypeRecordMapper.selectChildDangerTypeList(map);
list = getchildrenList(list, childList, dangerName);
return list;
@ -161,7 +163,12 @@ public class DangerTypeRecordServiceImpl extends ServiceImpl<DangerTypeRecordMap
@Override
public List<EntityMap> selectDangerTypeAndItemList(Map<String, Object> map) {
String dangerName = MapUtils.getString(map, "dangerName");
List<EntityMap> list = dangerTypeRecordMapper.getBigList(MapUtils.getString(map, "projectSn"));
//Integer recordStatus = MapUtils.getInteger(map, "recordStatus");
//只显示开启的状态的
//if (Objects.equal(recordStatus, 0)) {
// map.put("open", 1);
//}
List<EntityMap> list = dangerTypeRecordMapper.getBigList(map);
List<EntityMap> childList = dangerTypeRecordMapper.selectChildDangerTypeList(map);
String headquartersSn = projectMapper.getHeadquartersSnByProject(MapUtils.getString(map, "projectSn"));
map.put("headquartersSn", headquartersSn);
@ -185,7 +192,9 @@ public class DangerTypeRecordServiceImpl extends ServiceImpl<DangerTypeRecordMap
@Override
public List<EntityMap> getBigList(String projectSn) {
return dangerTypeRecordMapper.getBigList(projectSn);
HashMap<String, Object> map = new HashMap<>();
map.put("projectSn", projectSn);
return dangerTypeRecordMapper.getBigList(map);
}
@Override

2
src/main/resources/application-other-env-show.properties
View File

@ -24,7 +24,7 @@ video.alarm.newUrl=223.82.100.80:6040
wx-appid=
wx-AppSecret=
mqtt-scope=zjsjTopic
serverUrl=http://124.71.67.160:8088/
serverUrl=http://127.0.0.1:11120
#serverUrl=http://182.90.224.237:7000
#serverUrl=http://127.0.0.1:6023
#\u89C6\u9891\u5206\u6790url