Skip to content

A
amos-boot-biz
Commit 5901d973 authored by kongfm's avatar kongfm
Browse files
Options

Merge remote-tracking branch 'origin/developer' into developer

parents 84a8048d e5724730
Hide whitespace changes
Inline Side-by-side
Showing with 553 additions and 191 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FailureDetailsDto.java
View file @ 5901d973
package com.yeejoin.amos.boot.module.common.api.dto;
import java.util.Date;
import java.util.List;
import org.springframework.format.annotation.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.List;
/**
* @author system_generator
* @date 2021-08-04
......@@ -37,10 +40,9 @@ public class FailureDetailsDto extends BaseDto {
@ApiModelProperty(value = "故障设备")
private String failureEquipment;
@JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "YYYY-MM-dd")
//@JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "YYYY-MM-dd")
@ApiModelProperty(value = "故障时间")
private Date faultTime;
private String faultTime;
@ApiModelProperty(value = "故障现象")
private String faultPhenomenon;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/UserDto.java
View file @ 5901d973
......@@ -38,4 +38,7 @@ public class UserDto {
@ApiModelProperty(value = "机构编码")
private String bizOrgCode;
@ApiModelProperty(value = "机构类型（部门：DEPARTMENT，单位：COMPANY，人员：PERSON）")
private String bizOrgType;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java
View file @ 5901d973
......@@ -33,11 +33,13 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "地址")
private String address;
@ExcelIgnore
@ApiModelProperty(value = "经度")
@ExcelProperty(value = "经度", index = 48)
private Double longitude;
@ExcelIgnore
@ApiModelProperty(value = "纬度")
@ExcelProperty(value = "纬度", index = 49)
private Double latitude;
@ExcelIgnore
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FailureDetails.java
View file @ 5901d973
......@@ -4,6 +4,7 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
......@@ -51,8 +52,9 @@ public class FailureDetails extends BaseEntity {
/**
* 故障时间
*/
@JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "YYYY-MM-dd")
@TableField("fault_time")
private Date faultTime;
private String faultTime;
/**
* 故障现象
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FailureDetailsMapper.java
View file @ 5901d973
......@@ -22,124 +22,141 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
/**
* 查询全部 分页
*
* @param currentStatus 当前任务状态
* * @param startTime 起始时间
* * @param endTime 结束时间
* * @param submissionPid 报送人
* @param current 当前页
* * @param startTime 起始时间
* * @param endTime 结束时间
* * @param submissionPid 报送人
* @param current 当前页
* @return
*/
List<FailureDetails> selectAllPage(Long current,Long size, Long currentStatus,
String startTime,String endTime, Integer submissionPid);
List<FailureDetails> selectAllPage(Long current, Long size, Long currentStatus,
String startTime, String endTime, Integer submissionPid);
List<FailureDetailsDto> selectWebPage(Long current, Long size,Long currentStatus,
String startTime, String endTime, String submissionName, Long submissionBranchId,
Long sequenceNbr);
/**
* 查询我发起的 分页
* current 当前页
* size 条数
*
* @param currentStatus 当前任务状态
* * @param startTime 起始时间
* * @param endTime 结束时间
* * @param submissionPid 报送人
* * @param startTime 起始时间
* * @param endTime 结束时间
* * @param submissionPid 报送人
* @return
*/
List<FailureDetails> selectISubPage(Long current,Long size, Long currentStatus,
String startTime,String endTime, Integer submissionPid);
List<FailureDetails> selectISubPage(Long current, Long size, Long currentStatus,
String startTime, String endTime, Integer submissionPid);
/**
* 查询待处理 分页
*
* @param currentStatus 当前任务状态
* * @param startTime 起始时间
* * @param endTime 结束时间
* * @param submissionPid 报送人
* * @param startTime 起始时间
* * @param endTime 结束时间
* * @param submissionPid 报送人
* @param
* @return
*/
List<FailureDetails> selectInProcessing(Long current,Long size,Long currentStatus,
String startTime,String endTime, Integer submissionPid);
List<FailureDetails> selectInProcessing(Long current, Long size, Long currentStatus,
String startTime, String endTime, Integer submissionPid);
/**
* 查询待处理 应急指挥科人员分页
*
* @param
* @return
*/
List<FailureDetails> selectStatusWaitTj(Long current,Long size,Long currentStatus,
String startTime,String endTime, Integer submissionPid);
List<FailureDetails> selectStatusWaitTj(Long current, Long size, Long currentStatus,
String startTime, String endTime, Integer submissionPid);
/**
* 查询待处理 维修人员分页
*
* @param currentStatus 当前任务状态
* * @param startTime 起始时间
* * @param endTime 结束时间
* * @param submissionPid 报送人
* * @param startTime 起始时间
* * @param endTime 结束时间
* * @param submissionPid 报送人
* @param
* @return
*/
List<FailureDetails> selectStatusWaitWx(Long current,Long size,Long currentStatus,
String startTime,String endTime, Integer submissionPid);
List<FailureDetails> selectStatusWaitWx(Long current, Long size, Long currentStatus,
String startTime, String endTime, Integer submissionPid);
/**
* 统计 全部
*
* @param currentStatus 状态
* @param startTime 起始时间
* @param endTime 结束时间
* @param submissionPid 报送人
*
* @param startTime 起始时间
* @param endTime 结束时间
* @param submissionPid 报送人
* @return
*/
List<StatusDto> selectStatusCount(Long currentStatus,String startTime,String endTime, Integer submissionPid);
List<StatusDto> selectStatusCount(Long currentStatus, String startTime, String endTime, Integer submissionPid);
/**
* 统计 维修人员
*
* @param currentStatus 状态
* @param startTime 起始时间
* @param endTime 结束时间
* @param submissionPid 报送人
*
* @param startTime 起始时间
* @param endTime 结束时间
* @param submissionPid 报送人
* @return
*/
List<StatusDto> selectStatusWx(Long currentStatus,String startTime,String endTime, Integer submissionPid);
List<StatusDto> selectStatusWx(Long currentStatus, String startTime, String endTime, Integer submissionPid);
/**
* 统计 应急指挥科人员
*
* @param currentStatus 状态
* @param startTime 起始时间
* @param endTime 结束时间
* @param submissionPid 报送人
*
* @param startTime 起始时间
* @param endTime 结束时间
* @param submissionPid 报送人
* @return
*/
List<StatusDto> selectStatusFq(Long currentStatus,String startTime,String endTime, Integer submissionPid);
List<StatusDto> selectStatusFq(Long currentStatus, String startTime, String endTime, Integer submissionPid);
/**
* 统计 我发起
*
* @param currentStatus 状态
* @param startTime 起始时间
* @param endTime 结束时间
* @param submissionPid 报送人
*
* @param startTime 起始时间
* @param endTime 结束时间
* @param submissionPid 报送人
* @return
*/
List<StatusDto> selectStatusFqp(Long currentStatus,String startTime,String endTime, Integer submissionPid);
List<StatusDto> selectStatusFqp(Long currentStatus, String startTime, String endTime, Integer submissionPid);
/**
* 统计 领导
*
* @param currentStatus 状态
* @param startTime 起始时间
* @param endTime 结束时间
* @param submissionPid 报送人
*
* @param startTime 起始时间
* @param endTime 结束时间
* @param submissionPid 报送人
* @return
*/
List<StatusDto> selectStatusLeader(Long currentStatus,String startTime,String endTime, Integer submissionPid);
List<StatusDto> selectStatusLeader(Long currentStatus, String startTime, String endTime, Integer submissionPid);
List<StatusDto> selectAudit(Long currentStatus, String startTime, String endTime, Integer submissionPid, String userId);
List<StatusDto> selectMaintain(Long currentStatus, String startTime, String endTime, Integer submissionPid, String userId);
List<StatusDto> selectUserId(Long currentStatus, String startTime, String endTime, String userId);
List<FailureDetails> selectYJ(Long currentStatus, String startTime, String endTime, String userId,Long current, Long size);
List<FailureDetails> selectForAudit(Long currentStatus, String startTime, String endTime,Integer submissionPid, String userId,Long current, Long size);
List<FailureDetails> selectForMaintain(Long currentStatus, String startTime, String endTime, Integer submissionPid, String userId,Long current, Long size);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FailureDetailsMapper.xml
View file @ 5901d973
......@@ -31,6 +31,42 @@
order by submission_time DESC limit #{current},#{size}
</select>
<select id="selectWebPage" resultType="com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto">
SELECT
sequence_nbr,
current_status,
failure_equipment_id,
failure_equipment,
fault_time,
fault_phenomenon,
submission_name,
submission_pid,
biz_code,
submission_time,
submission_branch,
submission_branch_id
FROM
cb_failure_details
<where>
<if test="currentStatus!= null ">
and current_status = #{currentStatus}
</if>
<if test="startTime!= null and endTime != null">
and submission_time between #{startTime} and #{endTime}
</if>
<if test="submissionName != null ">
and submission_name = #{submissionName}
</if>
<if test="submissionBranchId!= null ">
and submission_branch_id = #{submissionBranchId}
</if>
<if test="sequenceNbr!= null ">
and sequence_nbr = #{ sequenceNbr}
</if>
</where>
order by submission_time DESC limit #{current},#{size}
</select>
......@@ -257,5 +293,188 @@
GROUP BY cb_failure_details.current_status
</select>
<select id="selectAudit" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
SELECT
current_status,
count(current_status)
AS currentStatusCount
FROM
cb_failure_details d
<where>
d.sequence_nbr in
(SELECT
fault_id
FROM
cb_failure_audit
where
rec_user_id = #{userId}
)
<if test="currentStatus!= null ">
and current_status = #{currentStatus}
</if>
<if test="startTime!= null and endTime != null">
and submission_time between #{startTime} and #{endTime}
</if>
<if test="submissionPid!= null ">
and submission_pid = #{submissionPid}
</if>
</where>
GROUP BY current_status;
</select>
<select id="selectMaintain" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
SELECT
current_status,
count(current_status)
AS currentStatusCount
FROM
cb_failure_details d
<where>
d.sequence_nbr in
(SELECT
fault_id
FROM
cb_failure_maintain
where
rec_user_id = #{userId}
)
<if test="currentStatus!= null ">
and current_status = #{currentStatus}
</if>
<if test="startTime!= null and endTime != null">
and submission_time between #{startTime} and #{endTime}
</if>
<if test="submissionPid!= null ">
and submission_pid = #{submissionPid}
</if>
</where>
GROUP BY current_status;
</select>
<select id="selectUserId" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
SELECT
current_status,
count(current_status)
AS currentStatusCount
FROM
cb_failure_details d
WHERE
<where>
d.sequence_nbr in
(SELECT
fault_id
FROM
cb_failure_audit
where
audit_result = 2
)
<if test="currentStatus!= null ">
and current_status = #{currentStatus}
</if>
<if test="startTime!= null and endTime != null">
and submission_time between #{startTime} and #{endTime}
</if>
<if test="userId != null ">
and submission_pid = #{userId}
</if>
</where>
GROUP BY current_status;
</select>
<select id="selectYJ" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
SELECT
*
FROM
cb_failure_details d
WHERE
d.sequence_nbr in
(SELECT
fault_id
FROM
cb_failure_audit
where
) and
submission_pid = #{userId}
<where>
d.sequence_nbr in
(SELECT
fault_id
FROM
cb_failure_audit
where
audit_result = 2
)
<if test="currentStatus != null ">
and current_status = #{currentStatus}
</if>
<if test="startTime!= null and endTime != null">
and submission_time between #{startTime} and #{endTime}
</if>
<if test="userId != null ">
and submission_pid = #{userId}
</if>
</where>
order by submission_time DESC
limit #{current},#{size};
</select>
<select id="selectForAudit" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
SELECT
*
FROM
cb_failure_details d
<where>
d.sequence_nbr in
(SELECT
fault_id
FROM
cb_failure_audit
where
rec_user_id = #{userId}
)
<if test="currentStatus != null ">
and current_status = #{currentStatus}
</if>
<if test="startTime!= null and endTime != null">
and submission_time between #{startTime} and #{endTime}
</if>
<if test="submissionPid!= null ">
and submission_pid = #{submissionPid}
</if>
</where>
order by submission_time DESC
limit #{current},#{size};
</select>
<select id="selectForMaintain" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
SELECT
*
FROM
cb_failure_details d
<where>
d.sequence_nbr in
(SELECT
fault_id
FROM
cb_failure_maintain
where
rec_user_id = #{userId}
)
<if test="currentStatus != null ">
and current_status = #{currentStatus}
</if>
<if test="startTime!= null and endTime != null">
and submission_time between #{startTime} and #{endTime}
</if>
<if test="submissionPid!= null ">
and submission_pid = #{submissionPid}
</if>
</where>
order by submission_time DESC
limit #{current},#{size};
</select>
</mapper>
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
View file @ 5901d973
......@@ -428,7 +428,8 @@ GROUP BY
'2' AS identityType,
u.biz_org_code,
f.field_code,
f.field_value
f.field_value,
u.biz_org_type
FROM
`cb_org_usr` u
LEFT JOIN cb_dynamic_form_instance f ON f.instance_id = u.sequence_nbr
......
amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/InputItem.java
View file @ 5901d973
......@@ -224,8 +224,8 @@ public class InputItem extends BasicEntity {
/**
* 扩展属性
*/
@Transient
private String ext;
// @Transient
// private String ext;
public Integer getItemStart() {
return itemStart;
......@@ -514,12 +514,4 @@ public class InputItem extends BasicEntity {
public void setCheckTypeId(String checkTypeId) {
this.checkTypeId = checkTypeId;
}
public String getExt() {
return ext;
}
public void setExt(String ext) {
this.ext = ext;
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureDetailsController.java
View file @ 5901d973
......@@ -241,12 +241,7 @@ public class FailureDetailsController extends BaseController {
@RequestParam (required = false) Long submissionBranchId,
@RequestParam (required = false) Long sequenceNbr ) {
Page<FailureDetailsDto> page = new Page<>();
if (current > 0) {
page.setCurrent((current - 1) * size);
} else {
page.setCurrent(current);
}
page.setCurrent(current * size);
page.setSize(size);
ReginParams userInfo = getSelectedOrgInfo();
IPage<FailureDetailsDto> failureDetailDTOsIPage = new Page<>();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureAuditServiceImpl.java
View file @ 5901d973
......@@ -4,6 +4,7 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
......@@ -59,7 +60,9 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
model.setAuditTime(new Date());
model.setAuditDepartmentId(userInfo.getDepartment().getSequenceNbr());
model.setAuditor(userInfo.getUserModel().getRealName());
model.setAuditDepartment(userInfo.getDepartment().getDepartmentName());
String parentId = iOrgUsrService.getParentId(userInfo.getUserModel().getUserId());
OrgUsr orgUsr = iOrgUsrService.getById(parentId);
model.setAuditDepartment(orgUsr.getBizOrgName());
FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java
View file @ 5901d973
......@@ -79,15 +79,16 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
public static Integer SELECY_STATUS = 7;
public static Integer SELECY_ISUBMIT = 8;
public static Integer SELECY_ACCEPT = 9;
public String[] roleName = {"maintenance_department_maintenance_personnel", "emergency_command_staff","emergency_command_leader","maintenance_department"};
public String[] roleName = {"maintenance_department_maintenance_personnel", "emergency_command_staff", "emergency_command_leader", "maintenance_department"};
/**
* 分页查询接口
* @param type 查询类型
* @param currentStatus 状态
* @param startTime 起始时间
* @param startTime 结束时间
* @param userId 用户id
*
* @param type 查询类型
* @param currentStatus 状态
* @param startTime 起始时间
* @param startTime 结束时间
* @param userId 用户id
*/
public IPage<FailureDetails> queryForFailureDetailsPage(Page<FailureDetails> page, ReginParams userInfo, Long currentStatus,
String startTime, String endTime, Integer userId, Integer type) {
......@@ -110,50 +111,20 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
if (type.equals(SELECY_ACCEPT)) {
//当角色为维修人员时
if (userInfo.getRole().getRoleName().equals(roleName[0])) {
LambdaQueryWrapper<FailureMaintain> Wrapper = new LambdaQueryWrapper<>();
Wrapper.eq(FailureMaintain::getRecUserId,userInfo.getUserModel().getUserId());
Wrapper.orderByDesc(FailureMaintain::getMaintainTime);
List<FailureMaintain> failureMaintains = failureMaintainService.getBaseMapper().selectList(Wrapper);
List<FailureDetails> failureDetails = new ArrayList<FailureDetails>();
failureMaintains.forEach(e->{
FailureDetails result = getById(e.getFaultId());
failureDetails.add(result);
});
List<FailureDetails> failureDetails = baseMapper.selectForMaintain(currentStatus, startTime, endTime, userId, userInfo.getUserModel().getUserId(), page.getCurrent(), page.getSize());
IPage<FailureDetails> iPage = new Page<>();
iPage.setRecords(failureDetails);
return iPage;
} else if (userInfo.getRole().getRoleName().equals(roleName[2]) && userInfo.getRole().getRoleName().equals(roleName[3])) {
LambdaQueryWrapper<FailureAudit> Wrapper = new LambdaQueryWrapper<>();
Wrapper.eq(FailureAudit::getRecUserId,userInfo.getUserModel().getUserId());
Wrapper.orderByDesc(FailureAudit::getAuditTime);
List<FailureAudit> failureAudit = ifailureAuditService.getBaseMapper().selectList(Wrapper);
List<FailureDetails> failureDetails = new ArrayList<FailureDetails>();
} else if (userInfo.getRole().getRoleName().equals(roleName[2]) || userInfo.getRole().getRoleName().equals(roleName[3])) {
List<FailureDetails> failureDetails = baseMapper.selectForAudit(currentStatus, startTime, endTime, userId, userInfo.getUserModel().getUserId(), page.getCurrent(), page.getSize());
failureAudit.forEach(e->{
FailureDetails result = getById(e.getFaultId());
failureDetails.add(result);
}); IPage<FailureDetails> iPage = new Page<>();
IPage<FailureDetails> iPage = new Page<>();
iPage.setRecords(failureDetails);
return iPage;
}else {
LambdaQueryWrapper<FailureAudit> Wrapper = new LambdaQueryWrapper<>();
Long parentId = Long.valueOf(iOrgUsrService.getParentId(userInfo.getUserModel().getUserId()));
Wrapper.eq(FailureAudit::getAuditDepartmentId,parentId);
Wrapper.eq(FailureAudit::getAuditResult, AuditResultEnum.REFUSE.getCode());
Wrapper.orderByDesc(FailureAudit::getAuditTime);
List<FailureAudit> failureAudit = ifailureAuditService.getBaseMapper().selectList(Wrapper);
List<FailureDetails> failureDetails = new ArrayList<FailureDetails>();
failureAudit.forEach(e->{
FailureDetails result = getById(e.getFaultId());
if (result.getSubmissionPid().equals(userInfo.getUserModel().getUserId())){
failureDetails.add(result);
}
});
} else {
List<FailureDetails> failureDetails = baseMapper.selectYJ(currentStatus, startTime, endTime, userInfo.getUserModel().getUserId(), page.getCurrent(), page.getSize());
IPage<FailureDetails> iPage = new Page<>();
iPage.setRecords(failureDetails);
return iPage;
......@@ -167,11 +138,13 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
* web端列表查询
*/
public IPage<FailureDetailsDto> queryForPageList(Page<FailureDetailsDto> page, ReginParams userInfo, Long currentStatus,
String startTime, String endTime, String submissionName, Long submissionBranchId,
Long sequenceNbr ) {
return queryForPage(page,"",false,currentStatus,startTime, endTime, submissionName,submissionBranchId,sequenceNbr);
String startTime, String endTime, String submissionName, Long submissionBranchId,
Long sequenceNbr) {
List<FailureDetailsDto> list = baseMapper.selectWebPage(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, submissionName, submissionBranchId, sequenceNbr);
IPage<FailureDetailsDto> iPage = new Page<>();
iPage.setRecords(list);
return iPage;
}
/**
......@@ -182,7 +155,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
if (userInfo.getRole().getRoleName().equals(roleName[0])) {
IPage<FailureDetails> wxIpage = new Page<FailureDetails>();
List<FailureDetails> list = baseMapper.selectStatusWaitWx(page.getCurrent(), page.getSize(),currentStatus, startTime, endTime, userId);
List<FailureDetails> list = baseMapper.selectStatusWaitWx(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, userId);
wxIpage.setRecords(list);
return wxIpage;
} else if (userInfo.getRole().getRoleName().equals(roleName[1])) {
......@@ -247,6 +220,14 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
statusDtos = baseMapper.selectStatusFqp(currentStatus, startTime, endTime, Integer.parseInt(userInfo.getUserModel().getUserId()));
} else if (type.equals(SELECY_ALL)) {
statusDtos = baseMapper.selectStatusCount(currentStatus, startTime, endTime, userId);
} else if (type.equals(SELECY_ACCEPT)) {
if (userInfo.getRole().getRoleName().equals(roleName[2]) || userInfo.getRole().getRoleName().equals(roleName[3])){
statusDtos = baseMapper.selectAudit(currentStatus, startTime, endTime, userId, userInfo.getUserModel().getUserId());
}else if (userInfo.getRole().getRoleName().equals(roleName[0])){
statusDtos = baseMapper.selectMaintain(currentStatus, startTime, endTime, userId, userInfo.getUserModel().getUserId());
}else {
statusDtos = baseMapper.selectUserId(currentStatus, startTime, endTime, userInfo.getUserModel().getUserId());
}
} else {
statusDtos = baseMapper.selectStatusLeader(currentStatus, startTime, endTime, userId);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureMaintainServiceImpl.java
View file @ 5901d973
......@@ -6,6 +6,7 @@ import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import org.apache.commons.lang3.ObjectUtils;
......@@ -61,6 +62,10 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
@Autowired
WorkflowFeignService workflowFeignService;
@Autowired
OrgUsrServiceImpl iOrgUsrService;
private static String RECORE_TYPE = "维修记录";
private static String[] MAINTENANCE_STATUS = {"维修完成", "维修中"};
......@@ -88,7 +93,9 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
}
failureMaintainDto.setMaintainMan(userInfo.getUserModel().getRealName());
failureMaintainDto.setMaintainTime(new Date());
failureMaintainDto.setDepartment(userInfo.getDepartment().getDepartmentName());
String parentId = iOrgUsrService.getParentId(userInfo.getUserModel().getUserId());
OrgUsr orgUsr = iOrgUsrService.getById(parentId);
failureMaintainDto.setDepartment(orgUsr.getBizOrgName());
failureMaintainDto.setBizId(userInfo.getDepartment().getSequenceNbr());
failureMaintainDto.setRecoreType(RECORE_TYPE);
this.createWithModel(failureMaintainDto);
......@@ -135,7 +142,9 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
}
failureMaintainDto.setMaintainMan(userInfo.getUserModel().getUserName());
failureMaintainDto.setMaintainTime(new Date());
failureMaintainDto.setDepartment(userInfo.getDepartment().getDepartmentName());
String parentId = iOrgUsrService.getParentId(userInfo.getUserModel().getUserId());
OrgUsr orgUsr = iOrgUsrService.getById(parentId);
failureMaintainDto.setDepartment(orgUsr.getBizOrgName());
failureMaintainDto.setBizId(userInfo.getDepartment().getSequenceNbr());
failureMaintainDto.setRecoreType(RECORE_TYPE);
this.createWithModel(failureMaintainDto);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureVerifyServiceImpl.java
View file @ 5901d973
......@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.FailureVerifyDto;
import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto;
import com.yeejoin.amos.boot.module.common.api.entity.FailureVerify;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.enums.AuditResultEnum;
import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum;
import com.yeejoin.amos.boot.module.common.api.mapper.FailureVerifyMapper;
......@@ -33,7 +34,8 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
FailureDetailsServiceImpl failureDetailsService;
@Autowired
FailureRepairlogServiceImpl failureRepairlogService;
@Autowired
OrgUsrServiceImpl iOrgUsrService;
@Transactional
public Object savemodel(FailureVerifyDto model, ReginParams userInfo) throws Exception {
......@@ -42,7 +44,9 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
model.setVerifyTime(new Date());
model.setVerifyDepartmentId(userInfo.getDepartment().getSequenceNbr());
model.setAcceptor(userInfo.getUserModel().getRealName());
model.setVerifyDepartment(userInfo.getDepartment().getDepartmentName());
String parentId = iOrgUsrService.getParentId(userInfo.getUserModel().getUserId());
OrgUsr orgUsr = iOrgUsrService.getById(parentId);
model.setVerifyDepartment(orgUsr.getBizOrgName());
FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
......@@ -79,8 +83,6 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
public Boolean updateStatus(FailureVerifyDto model, FailureStatuEnum status, ReginParams userInfo, int condition) throws Exception {
FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
//当前角色部门id为应急指挥科的时候 并且同意时 不修改主表状态 依然为待验收
//当前角色部门id为维修部门的时候 修改状态
List<FailureVerify> byfaultId = findByfaultId(failureDetailsDto.getSequenceNbr());
if (byfaultId.size() != 0) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @ 5901d973
......@@ -1192,24 +1192,19 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
// 业主单位
List<UserDto> list = orgUsrMapper.getUserInfo(userId, typeArr[0], null, FIELD_CODE);
if (!CollectionUtils.isEmpty(list)) {
throw new RuntimeException("人员绑定单位重复！");
} else {
if (!CollectionUtils.isEmpty(list)) {
if (list.size() == 1) {
userDtoList.addAll(list);
UserDto userDto = list.get(0);
String codeVal = userDto.getCompanyId().substring(0, 5);
if (StringUtils.isNotBlank(codeVal)) {
List<UserDto> dtoList = orgUsrMapper.getUserInfo(null, typeArr[1], codeVal, COMPANY_FIELD_CODE);
if (!CollectionUtils.isEmpty(dtoList)) {
userDtoList.addAll(dtoList);
return userDtoList;
}
if (list.size() == 1) {
userDtoList.addAll(list);
UserDto userDto = list.get(0);
String codeVal = userDto.getBizOrgCode().substring(0, 5);
if (StringUtils.isNotBlank(codeVal)) {
List<UserDto> dtoList = orgUsrMapper.getUserInfo(null, typeArr[1], codeVal, COMPANY_FIELD_CODE);
if (!CollectionUtils.isEmpty(dtoList)) {
userDtoList.addAll(dtoList);
}
throw new RuntimeException("未获取人员业主单位！");
}
throw new RuntimeException("人员绑定业主单位不唯一！");
return userDtoList;
}
throw new RuntimeException("人员绑定业主单位不唯一！");
}
throw new RuntimeException("人员未绑定任何单位！");
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/config/StartLoader.java
View file @ 5901d973
......@@ -46,11 +46,11 @@ public class StartLoader implements ApplicationRunner {
emqKeeper.getMqttClient().subscribe(topic, (s, mqttMessage) -> {
byte[] payload = mqttMessage.getPayload();
try {
String obj = new String(payload);
String obj = new String(payload,"GB2312");
if (!ValidationUtil.isEmpty(obj)) {
JSONObject json = JSON.parseObject(obj);
AlertNewsDto alertNewsDto = new AlertNewsDto( "物联警情", json.get("unitInvolvedName")+","+json.get("address")+"，发生警情，请处理。", json.get("id").toString(), obj);
emqKeeper.getMqttClient().publish(topicweb, JSONObject.toJSON(alertNewsDto).toString().getBytes(), RuleConfig.DEFAULT_QOS, true);
AlertNewsDto alertNewsDto = new AlertNewsDto( "物联警情", json.get("unitInvolvedName")+","+json.get("address")+"，发生警情，请处理。", json.get("id").toString(), json);
emqKeeper.getMqttClient().publish(topicweb, JSONObject.toJSON(alertNewsDto).toString().getBytes("UTF-8"), 1, false);
}
} catch (Exception e) {
logger.error("系统异常", e);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java
View file @ 5901d973
......@@ -833,7 +833,7 @@ if (excelDtoList != null && excelDtoList.size() > 0) {
}
if (fireExperts.getHighestEducation() != null) {
String[] highestEducation = fireExperts.getHighestEducation().split("@");
fireExperts.setHighestEducation(highestEducation[0]);
fireExperts.setHighestEducation(highestEducation[1]); // BUG 2942 by litw 2021年9月18日 导入学历编号
}
excelEntityList.add(fireExperts);
});
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/CheckController.java
View file @ 5901d973
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.supervision.business.controller;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.supervision.business.constants.XJConstant;
import com.yeejoin.amos.supervision.business.dto.CheckDto;
import com.yeejoin.amos.supervision.business.dto.CheckInputItemDto;
import com.yeejoin.amos.supervision.business.param.CheckInfoPageParam;
import com.yeejoin.amos.supervision.business.param.CheckPageParam;
import com.yeejoin.amos.supervision.business.param.CheckRecordParam;
......@@ -550,8 +551,8 @@ public class CheckController extends AbstractBaseController {
ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getOrgCode(reginParams);
requestParam.setOrgCode(orgCode);
CheckDto checkDto = checkService.saveCheckRecord(requestParam, reginParams);
return ResponseHelper.buildResponse(checkDto);
List<CheckInputItemDto> checkInputItemDtoList = checkService.saveCheckRecord(requestParam, reginParams);
return ResponseHelper.buildResponse(checkInputItemDtoList);
} catch (Exception e) {
log.error(e.getMessage(), e);
return ResponseHelper.buildResponse(e.getMessage());
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/PlanTaskDetailMapper.java
View file @ 5901d973
......@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Param;
public interface PlanTaskDetailMapper extends BaseMapper {
void finishTaskDetail(@Param(value="planTaskDetailId") long planTaskDetailId, @Param(value="pointId") long pointId, @Param(value="planTaskId") long planTaskId
, @Param(value="executorId") String executorId , @Param(value="executorName") String executorName , @Param(value="size") int size );
, @Param(value="executorId") String executorId , @Param(value="executorName") String executorName , @Param(value="size") int size,@Param(value="planTaskStatus") String planTaskStatus );
Map findPlanTaskByTaskIdAndPointId(@Param(value="planTaskId") long planTaskId,@Param(value="pointId") long pointId);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/RoutePointItemMapper.java
View file @ 5901d973
......@@ -15,5 +15,7 @@ public interface RoutePointItemMapper extends BaseMapper {
long queryPageCount(InputItemPageParam param);
int getPointItemCount(Long routeId , Long pointId);
List<RoutePointItemVo> queryPage(InputItemPageParam param);
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/ICheckShotDao.java
View file @ 5901d973
......@@ -3,9 +3,12 @@ package com.yeejoin.amos.supervision.business.dao.repository;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
import com.yeejoin.amos.supervision.dao.entity.CheckShot;
import org.springframework.transaction.annotation.Transactional;
@Repository("checkShotDao")
public interface ICheckShotDao extends BaseDao<CheckShot, Long> {
......@@ -27,4 +30,13 @@ public interface ICheckShotDao extends BaseDao<CheckShot, Long> {
* @return
*/
List<CheckShot> findAllByCheckIdAndCheckInputId(Long checkId, Long checkInputId);
/**
* 根据check_input_id删除图片
*/
// @Modifying
// @Transactional
// @Query(value = "DELETE FROM p_check_shot WHERE check_input_id = ?1 ", nativeQuery = true)
// void deleteByCheckInputId(Long checkInputId);
void deleteByCheckInputId(Long checkInputId);
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dto/CheckInputItemDto.java 0 → 100644
View file @ 5901d973
package com.yeejoin.amos.supervision.business.dto;
public class CheckInputItemDto {
private Long checkInputId;
private Long checkId;
private Long routPointItemId;
public Long getCheckInputId() {
return checkInputId;
}
public void setCheckInputId(Long checkInputId) {
this.checkInputId = checkInputId;
}
public Long getCheckId() {
return checkId;
}
public void setCheckId(Long checkId) {
this.checkId = checkId;
}
public Long getRoutPointItemId() {
return routPointItemId;
}
public void setRoutPointItemId(Long routPointItemId) {
this.routPointItemId = routPointItemId;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/param/CheckInputParam.java
View file @ 5901d973
......@@ -8,6 +8,7 @@ import java.util.List;
@Data
public class CheckInputParam {
private Long id;
private long inputItemId;
private String inputValue;
private String selectName;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/param/CheckPageParam.java
View file @ 5901d973
......@@ -7,6 +7,7 @@ import lombok.Data;
public class CheckPageParam extends CommonPageable {
private Long planId;
private Long companyId;
private Long pointId;
private String orgCode;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/param/CheckRecordParam.java
View file @ 5901d973
......@@ -26,6 +26,9 @@ public class CheckRecordParam {
@ApiModelProperty(value = "检查时间")
private String checkTime;
@ApiModelProperty(value = "任务状态是否结束")
private String planTaskStatus; // 0 不结束，1结束
/**
* 检查项
*/
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/CheckServiceImpl.java
View file @ 5901d973
......@@ -18,6 +18,7 @@ import com.yeejoin.amos.supervision.business.dao.mapper.PlanTaskMapper;
import com.yeejoin.amos.supervision.business.dao.mapper.RouteMapper;
import com.yeejoin.amos.supervision.business.dao.repository.*;
import com.yeejoin.amos.supervision.business.dto.CheckDto;
import com.yeejoin.amos.supervision.business.dto.CheckInputItemDto;
import com.yeejoin.amos.supervision.business.dto.CheckRecordDto;
import com.yeejoin.amos.supervision.business.entity.mybatis.*;
import com.yeejoin.amos.supervision.business.feign.EquipFeign;
......@@ -1335,7 +1336,7 @@ public class CheckServiceImpl implements ICheckService {
@Override
@Transactional
public CheckDto saveCheckRecord(CheckRecordParam recordParam, ReginParams reginParams) throws Exception {
public List<CheckInputItemDto> saveCheckRecord(CheckRecordParam recordParam, ReginParams reginParams) throws Exception {
ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
if (ObjectUtils.isEmpty(reginParams.getUserModel()) && ObjectUtils.isEmpty(reginParams.getCompany()) && ObjectUtils.isEmpty(personIdentity)) {
throw new RuntimeException("获取用户信息失败");
......@@ -1411,10 +1412,19 @@ public class CheckServiceImpl implements ICheckService {
List<Map<String, Object>> unqualifiedCheckItemList = Lists.newArrayList();
StringBuilder error = new StringBuilder();
int score = 0;
int size = 0;
for (CheckInputParam item : list) {
List<CheckShot> checkShots = new ArrayList<>();
InputItem inputItem = inputItemDao.findById(item.getInputItemId()).get();
// InputItem inputItem = inputItemDao.findById(item.getInputItemId()).get();
InputItem inputItem = inputItemDao.getOne(item.getInputItemId());
CheckInput checkInput = new CheckInput();
if (!ObjectUtils.isEmpty(item.getId())) {
checkInput.setId(item.getId());
// 更新操作，将该点下所有图片删除，其余更新
checkShotDao.deleteByCheckInputId(item.getId());
} else {
size += 1;
}
checkInput.setCreateDate(new Date());
checkInput.setOrgCode(recordParam.getOrgCode());
checkInput.setInputId(inputItem.getId());
......@@ -1490,7 +1500,13 @@ public class CheckServiceImpl implements ICheckService {
checkInputDao.saveAll(checkItemList);
}
List<CheckShot> allShot = new ArrayList<>();
List<CheckInputItemDto> checkInputItemDtoList = new ArrayList<>();
checkItemList.forEach(c -> {
CheckInputItemDto checkInputItemDto = new CheckInputItemDto();
checkInputItemDto.setCheckId(c.getCheckId());
checkInputItemDto.setCheckInputId(c.getId());
checkInputItemDto.setRoutPointItemId(c.getRoutePointItemId());
checkInputItemDtoList.add(checkInputItemDto);
c.getCheckShotList().forEach(s -> {
s.setCheckId(c.getCheckId());
s.setOrgCode(recordParam.getOrgCode());
......@@ -1504,15 +1520,17 @@ public class CheckServiceImpl implements ICheckService {
checkShotDao.saveAll(allShot);
}
int size = 0;
if (!ObjectUtils.isEmpty(list)) {
size = list.size();
}
// if (!ObjectUtils.isEmpty(list)) {
// size = list.size();
// }
// 更改状态
String planTaskStatus = recordParam.getPlanTaskStatus();
planTaskDetailMapper.finishTaskDetail(Long.parseLong(detail.get("planTaskDetailId").toString()), recordParam.getPointId(),
recordParam.getPlanTaskId(), mtUserSeq, userName, size);
recordParam.getPlanTaskId(), mtUserSeq, userName, size, planTaskStatus);
//7.返回不合格记录
return new CheckDto(check.getId(), unqualifiedCheckItemList);
// return new CheckDto(check.getId(), unqualifiedCheckItemList);
return checkInputItemDtoList;
} catch (Exception e) {
throw new Exception(e.getMessage(), e);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanTaskServiceImpl.java
View file @ 5901d973
......@@ -10,6 +10,7 @@ import com.yeejoin.amos.supervision.business.constants.XJConstant;
import com.yeejoin.amos.supervision.business.dao.mapper.PlanMapper;
import com.yeejoin.amos.supervision.business.dao.mapper.PlanTaskDetailMapper;
import com.yeejoin.amos.supervision.business.dao.mapper.PlanTaskMapper;
import com.yeejoin.amos.supervision.business.dao.mapper.RoutePointItemMapper;
import com.yeejoin.amos.supervision.business.dao.repository.*;
import com.yeejoin.amos.supervision.business.dao.repository.ICheckDao;
import com.yeejoin.amos.supervision.business.dao.repository.IPlanDao;
......@@ -30,6 +31,7 @@ import com.yeejoin.amos.supervision.business.vo.CalDateVo;
import com.yeejoin.amos.supervision.business.vo.CodeOrderVo;
import com.yeejoin.amos.supervision.business.vo.LeavePlanTaskVo;
import com.yeejoin.amos.supervision.business.vo.PlanTaskVo;
import com.yeejoin.amos.supervision.common.enums.PlanStatusEnum;
import com.yeejoin.amos.supervision.common.enums.PlanTaskDetailIsFinishEnum;
import com.yeejoin.amos.supervision.common.enums.PlanTaskFinishStatusEnum;
import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
......@@ -98,6 +100,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
@Autowired
private IPointInputItemDao pointInputItemDao;
@Autowired
private RoutePointItemMapper routePointItemMapper;
@Override
public Page<HashMap<String, Object>> getPlanTaskInfo(PlanTaskPageParam params) {
long total = planTaskMapper.countPlanTask(params);
......@@ -326,7 +331,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
String strDate = df.format(now);
String tomorrow = DateUtil.getIntervalDateStr(now, 1, "yyyy-MM-dd");//下一天
List<Plan> planList = iplanDao.queryScheduledPlan(strDate, XJConstant.PLAN_STATUS_START);
List<Plan> planList = iplanDao.queryScheduledPlan(strDate, String.valueOf(PlanStatusEnum.EXAMINE_DEVELOPED.getValue()));
if (planList == null || planList.size() <= 0) {
log.info(strDate + " " + " 暂无待生成执行数据的计划");
return;
......@@ -514,8 +519,10 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
}
// 查询点下检查项的个数
List<PointInputItem> pointInputItemByPointId = pointInputItemDao.getPointInputItemByPointId(pointId.longValue());
planTaskDetailInstance.setItemNum(pointInputItemByPointId.size());
// List<PointInputItem> pointInputItemByPointId = pointInputItemDao.getPointInputItemByPointId(pointId.longValue());
Long routeId = plan.getRouteId();
int itemCount = routePointItemMapper.getPointItemCount(routeId, pointId.longValue());
planTaskDetailInstance.setItemNum(itemCount);
// 2.保存执行数据明细表
planTaskDetail.saveAndFlush(planTaskDetailInstance);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/ICheckService.java
View file @ 5901d973
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.supervision.business.service.intfc;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.supervision.business.dto.CheckDto;
import com.yeejoin.amos.supervision.business.dto.CheckInputItemDto;
import com.yeejoin.amos.supervision.business.dto.CheckRecordDto;
import com.yeejoin.amos.supervision.business.entity.mybatis.*;
import com.yeejoin.amos.supervision.business.param.*;
......@@ -269,7 +270,7 @@ public interface ICheckService {
* @param reginParams 权限信息
* @return CheckDto
*/
CheckDto saveCheckRecord(CheckRecordParam recordParam, ReginParams reginParams) throws Exception;
List<CheckInputItemDto> saveCheckRecord(CheckRecordParam recordParam, ReginParams reginParams) throws Exception;
/**
* 校验是否已经填写过
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/vo/CheckVo.java
View file @ 5901d973
......@@ -4,10 +4,18 @@ import lombok.Data;
import java.util.Date;
/**
* @author DELL
*/
@Data
public class CheckVo {
/**
* 主键id
*/
private Long id;
/**
* 检查项ID
*/
private Long inputItemId;
......
amos-boot-system-jcs/src/main/resources/application.properties
View file @ 5901d973
......@@ -63,8 +63,8 @@ mqtt.topic.command.meteorological.notice=meteorological
mqtt.topic.command.power.deployment=power
mqtt.topic.alert.iot=iotnews
mqtt.topic.alert.iot.web=iotNewsWeb
mqtt.topic.alert.iot=iot-system-alarm
mqtt.topic.alert.iot.web=iot-system-alarm-web
security.systemctl.name=AMOS-API-SYSTEMCTL
......
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ 5901d973
......@@ -1084,4 +1084,38 @@
</changeSet>
<changeSet author="tw" id="2021-09-17-020">
<comment>update data jc_alert_form</comment>
<sql>
update jc_alert_form set field_name = '火灾位置',field_type='inputPoi' where sequence_nbr = 2 ;
</sql>
</changeSet>
<changeSet author="tw" id="2021-09-18-0001">
<comment>update data jc_alert_form</comment>
<sql>
update jc_alert_form set url = 'data-dictionary/gwmcDataDictionary/SGXZ' where sequence_nbr = 113 ;
</sql>
</changeSet>
<changeSet author="tw" id="2021-09-18-0002">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_data_dictionary" />
<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
</preConditions>
<comment>add data cb_data_dictionary</comment>
<sql>
INSERT INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1231, '1231', '居民家中取钥匙', 'SGXZ', NULL, NULL, NULL, NULL, NULL, b'0', 1);
INSERT INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1232, '1232', '摘除蜂窝', 'SGXZ', NULL, NULL, NULL, NULL, NULL, b'0', 2);
INSERT INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1233, '1233', '关闭居民水', 'SGXZ', NULL, NULL, NULL, NULL, NULL, b'0', 3);
INSERT INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1234, '1234', '气阀门', 'SGXZ', NULL, NULL, NULL, NULL, NULL, b'0', 4);
INSERT INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1235, '1235', '锅炉事故', 'SGXZ', NULL, NULL, NULL, NULL, NULL, b'0', 5);
INSERT INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1236, '1236', '其它', 'SGXZ', NULL, NULL, NULL, NULL, NULL, b'0', 6);
</sql>
</changeSet>
</databaseChangeLog>
amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_check.xml
View file @ 5901d973
......@@ -1988,44 +1988,53 @@
p_check c
LEFT JOIN p_check_input ci ON ci.check_id = c.id
LEFT JOIN p_input_item i ON i.id = ci.input_id
LEFT JOIN p_point pp ON pp.id = c.point_id
<where>
<if test="planId != null">
c.plan_id = #{planId}
</if>
<if test="companyId != null">
AND c.company_id = #{companyId}
AND pp.original_id = #{companyId}
</if>
<if test="orgCode != null">
c.org_code = #{orgCode}
<if test="pointId != null">
AND pp.id = #{pointId}
</if>
<!-- <if test="orgCode != null">-->
<!-- AND c.org_code = #{orgCode}-->
<!-- </if>-->
</where>
</select>
<select id="queryPage" resultType="com.yeejoin.amos.supervision.business.vo.CheckVo">
SELECT
i.id,
i.`name`,
i.`name` inputItemName,
ci.safety_danger_num,
ci.major_danger_num,
c.check_time,
c.user_name,
c.company_id,
c.company_name,
ci.create_date checkTime,
ci.user_name,
pp.original_id,
pp.name companyName,
IF
( c.check_time IS NULL, 0, 1 ) AS ext
FROM
p_check c
LEFT JOIN p_check_input ci ON ci.check_id = c.id
LEFT JOIN p_input_item i ON i.id = ci.input_id
LEFT JOIN p_point pp ON pp.id = c.point_id
<where>
<if test="planId != null">
c.plan_id = #{planId}
</if>
<if test="companyId != null">
AND c.company_id = #{companyId}
AND pp.original_id = #{companyId}
</if>
<if test="orgCode != null">
c.org_code = #{orgCode}
<if test="pointId != null">
AND pp.id = #{pointId}
</if>
<!-- <if test="orgCode != null">-->
<!-- AND c.org_code = #{orgCode}-->
<!-- </if>-->
ORDER BY c.check_time DESC
<choose>
<when test="pageSize==-1"></when>
......
amos-boot-system-supervision/src/main/resources/db/mapper/plan_task_detail.xml
View file @ 5901d973
......@@ -3,7 +3,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.supervision.business.dao.mapper.PlanTaskDetailMapper">
<update id="finishTaskDetail">
call updatePlanTask(#{planTaskId}, #{pointId}, #{planTaskDetailId} ,#{executorId},#{executorName},#{size})
call updatePlanTask(#{planTaskId}, #{pointId}, #{planTaskDetailId} ,#{executorId},#{executorName},#{size},#{planTaskStatus})
</update>
<select id="findPlanTaskByTaskIdAndPointId" resultType="Map">
......
amos-boot-system-supervision/src/main/resources/db/mapper/pointMapper.xml
View file @ 5901d973
......@@ -1142,15 +1142,15 @@
<select id="queryItemsByPointId" resultType="map">
SELECT
COALESCE ( pci.id , 0 ) inputId,
ppi.id,
ppi.input_item_id itemId,
ppi.point_id pointId,
prp.point_id pointId,
pii.name itemName,
pii.item_type itemTyp,
pii.data_json dataJson,
pii.remark remark,
pii.picture_json picJson,
prpi.id routePointItemId,
pii.id itemId,
CASE pii.`input_type`
WHEN 0 THEN
'手动录入'
......@@ -1158,13 +1158,13 @@
'同步'
END inputType
FROM
p_point_inputitem ppi
LEFT JOIN p_input_item pii ON pii.id = ppi.input_item_id
LEFT JOIN p_route_point pp ON pp.route_id = #{routeId} AND pp.point_id = ppi.point_id
LEFT JOIN p_route_point_item prpi ON prpi.route_point_id = pp.id AND prpi.point_input_item_id = ppi.id
LEFT JOIN p_check_input pci ON pci.route_point_item_id = prpi.id
p_route_point prp
LEFT JOIN p_route_point_item ppi ON ppi.route_point_id = prp.id
LEFT JOIN p_input_item pii ON ppi.input_item_id = pii.id
LEFT JOIN p_check_input pci ON pci.route_point_item_id = ppi.id
WHERE
ppi.point_id = #{pointId} AND pii.is_delete = 0 AND pci.route_point_item_id is NULL
prp.route_id = #{routeId} AND pii.is_delete = 0
-- AND pci.route_point_item_id is NULL
ORDER BY pii.order_no
</select>
......
amos-boot-system-supervision/src/main/resources/db/mapper/routePointItemMapper.xml
View file @ 5901d973
......@@ -80,4 +80,14 @@
<when test="pageSize!=-1">limit #{offset},#{pageSize}</when>
</choose>
</select>
<select id="getPointItemCount" resultType="int">
SELECT
COUNT(prpi.input_item_id)
FROM
p_route_point_item prpi
LEFT JOIN p_route_point prp ON prp.id = prpi.route_point_id
WHERE
prp.route_id = #{routeId} AND prp.point_id = #{pointId}
</select>
</mapper>
\ No newline at end of file
pom.xml
View file @ 5901d973
......@@ -27,7 +27,7 @@
<springcloud.version>Hoxton.SR8</springcloud.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<tyboot-version>1.1.20</tyboot-version>
<amos.version>1.6.0</amos.version>
<amos.version>1.6.3-SNAPSHOT</amos.version>
<itext.version>7.1.1</itext.version>
</properties>
......@@ -235,7 +235,7 @@
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-component-rule</artifactId>
<version>1.4.7</version>
<version>${amos.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment