Skip to content

A
amos-boot-biz
Commit b29d778a authored by suhuiguang's avatar suhuiguang
Browse files
Options

feat(tcm): 监管删除启停用企业

1.监管删除启停用企业 2.巡检公共包移动到common
parent febaf59f
Show whitespace changes
Inline Side-by-side
Showing with 598 additions and 47 deletions
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/ESPlanTaskList.java → amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dao/ESPlanTaskList.java
View file @ b29d778a
package com.yeejoin.amos.patrol.business.dao.repository;
package com.yeejoin.amos.boot.module.common.api.dao;
import com.yeejoin.amos.patrol.dao.entity.ESPlanTaskListDto;
import com.yeejoin.amos.boot.module.common.api.dto.ESPlanTaskListDto;
import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.stereotype.Repository;
import java.util.List;
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/ESTaskDetail.java → amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dao/ESTaskDetail.java
View file @ b29d778a
package com.yeejoin.amos.patrol.business.dao.repository;
package com.yeejoin.amos.boot.module.common.api.dao;
import com.yeejoin.amos.patrol.dao.entity.ESTaskDetailDto;
import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
import org.springframework.stereotype.Repository;
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/ESPlanTaskListDto.java → amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/ESPlanTaskListDto.java
View file @ b29d778a
package com.yeejoin.amos.patrol.dao.entity;
package com.yeejoin.amos.boot.module.common.api.dto;
import lombok.Data;
import lombok.experimental.Accessors;
......@@ -73,7 +73,6 @@ public class ESPlanTaskListDto {
private String userDept;
@Field(type = FieldType.Text)
private String unplan;
......@@ -91,7 +90,7 @@ public class ESPlanTaskListDto {
private String omission;
@Field(type = FieldType.Object)
private List<PlanTaskDetail> points;
private List<PlanTaskDetailDto> points;
}
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/PlanTaskDetailDto.java 0 → 100644
View file @ b29d778a
package com.yeejoin.amos.boot.module.common.api.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* The persistent class for the p_plan_task_detail database table.
*/
@Data
public class PlanTaskDetailDto implements Serializable {
private static final long serialVersionUID = 1L;
private long id;
private Date createDate;
/**
* 是否完成：是否完成0-未完成，1-已完成，2-超时漏检
*/
private int isFinish;
/**
* 点编号
*/
private long pointId;
/**
* 任务批次号
*/
private long taskNo;
/**
* 具体执行人id
*/
private String executorId;
/**
* 点名称
*/
private String name;
/**
* 点编号
*/
private String pointNo;
/**
* 执行时间
*/
private Date executorDate;
/**
* 状态：0 未开始；1 合格；2 不合格；3 漏检
*/
private String status;
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/PatrolMapper.java 0 → 100644
View file @ b29d778a
package com.yeejoin.amos.boot.module.tcm.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface PatrolMapper extends BaseMapper {
List<ESTaskDetailDto> findAllByTaskNos(@Param("taskNos") List<String> taskNos);
void deleteAllPlanTaskDetailByTaskNos(@Param("taskNos") List<String> taskNos);
void deleteAllPlanTaskById(@Param("ids") List<String> ids);
List<String> selectPlanTaskIdsByUseCode(@Param("useCode") String useCode);
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/TzsUserInfoMapper.java
View file @ b29d778a
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tcm.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.dto.CountDto;
import com.yeejoin.amos.boot.module.common.api.dto.UserPermissionDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.GroupAndPersonInfoDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzsEquipListDto;
......@@ -76,4 +77,11 @@ public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> {
*/
@Select("SELECT count(1) from tzs_user_equip where user_seq = #{userSeq}")
Integer queryUserBindEquNum(@Param("userSeq") String userSeq);
/**
* 统计指定单位下的人数
* @param unitCodes 单位code集合
* @return 人数统计信息
*/
List<CountDto> countUserByUnitCodes(@Param("unitCodes") List<String> unitCodes);
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/PatrolMapper.xml 0 → 100644
View file @ b29d778a
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.tcm.api.mapper.PatrolMapper">
<delete id="deleteAllPlanTaskDetailByTaskNos">
delete from
"p_plan_task_detail" pptd
where
pptd.task_no in
<foreach collection="taskNos" item="no" open="(" separator="," close=")">
#{no}
</foreach>
</delete>
<delete id="deleteAllPlanTaskById">
delete from "p_plan_task" ppt
where ppt.id = ANY(ARRAY[
<foreach collection="ids" item="id" open="(" separator="," close=")">
#{id}
</foreach>
])
</delete>
<select id="findAllByTaskNos" resultType="com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto">
select
pptd.id
from
"p_plan_task_detail" pptd
where
pptd.task_no = ANY(ARRAY[
<foreach collection="taskNos" item="no" open="(" separator="," close=")">
#{no}
</foreach>
])
</select>
<select id="selectPlanTaskIdsByUseCode" resultType="java.lang.String">
select
a.id
from
p_plan_task a
where
a.use_code = #{useCode}
and (a.finish_status != '2' or a.finish_status != '3')
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsUserInfoMapper.xml
View file @ b29d778a
......@@ -397,4 +397,21 @@
and (e.unit_type like '%检验机构%' or e.unit_type like '%检测机构%')
and u.post like '%6616%'
</select>
<select id="countUserByUnitCodes" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
SELECT
e.use_unit_code as keyStr,
count(1) as longValue
FROM
"tzs_user_info" u,
"tz_base_enterprise_info" e
where
u.unit_code = e.use_code
and u.is_delete = false
and e.use_code = ANY(ARRAY[
<foreach collection="unitCodes" item="unitCode" separator=",">
#{unitCode}
</foreach>
])
group by e.use_code
</select>
</mapper>
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzBaseEnterpriseInfoController.java
View file @ b29d778a
......@@ -16,6 +16,7 @@ import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
import com.yeejoin.amos.boot.module.tcm.api.enums.EquipmentClassifityEnum;
import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseEnterpriseInfoMapper;
import com.yeejoin.amos.boot.module.tcm.api.service.ITzBaseEnterpriseInfoService;
import com.yeejoin.amos.boot.module.tcm.biz.service.impl.EnterpriseManageServiceImpl;
import com.yeejoin.amos.boot.module.tcm.biz.utils.JsonUtils;
import com.yeejoin.amos.component.feign.utils.FeignUtil;
import com.yeejoin.amos.feign.privilege.Privilege;
......@@ -55,6 +56,9 @@ public class TzBaseEnterpriseInfoController extends BaseController {
ITzBaseEnterpriseInfoService iTzBaseEnterpriseInfoService;
@Autowired
EnterpriseManageServiceImpl enterpriseManageService;
@Autowired
RedisUtils redisUtils;
@Value("classpath:/json/equipCategory.json")
......@@ -375,4 +379,27 @@ public class TzBaseEnterpriseInfoController extends BaseController {
public ResponseModel<TzIndividualityDto> personalInfoUpdateById(@RequestBody Map<String, Object> map) {
return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.personalInfoUpdateById(map));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/deleteBatch")
@ApiOperation(httpMethod = "DELETE", value = "批量删除企业", notes = "批量删除企业")
public ResponseModel<Boolean> deleteBatch(@RequestParam String ids) {
return ResponseHelper.buildResponse(enterpriseManageService.delete(Arrays.asList(ids.split(","))));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/enableBatch")
@ApiOperation(httpMethod = "PUT", value = "企业启用", notes = "企业启用")
public ResponseModel<Boolean> enableBatch(@RequestParam String ids) {
return ResponseHelper.buildResponse(enterpriseManageService.enable(Arrays.asList(ids.split(","))));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/disableBatch")
@ApiOperation(httpMethod = "PUT", value = "企业停用", notes = "企业停用")
public ResponseModel<Boolean> disableBatch(@RequestParam String ids) {
return ResponseHelper.buildResponse(enterpriseManageService.disable(Arrays.asList(ids.split(","))));
}
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/refresh/handler/EnterpriseRefreshHandler.java
View file @ b29d778a
......@@ -43,7 +43,7 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler {
private final EsUserInfoDao esUserInfoDao;
@Value("${jyjc.open.online: true}")
@Value("${jyjc.open.online:true}")
private Boolean onlineJyjc;
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/EnterpriseManageServiceImpl.java 0 → 100644
View file @ b29d778a
package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.yeejoin.amos.boot.biz.common.dto.CountDto;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.module.common.api.dao.ESPlanTaskList;
import com.yeejoin.amos.boot.module.common.api.dao.ESTaskDetail;
import com.yeejoin.amos.boot.module.common.api.dao.EsBaseEnterpriseInfoDao;
import com.yeejoin.amos.boot.module.common.api.dto.ESPlanTaskListDto;
import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
import com.yeejoin.amos.boot.module.common.api.entity.EsBaseEnterpriseInfo;
import com.yeejoin.amos.boot.module.common.api.entity.TzsDataRefreshMessage;
import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
import com.yeejoin.amos.boot.module.tcm.api.mapper.PatrolMapper;
import com.yeejoin.amos.boot.module.tcm.biz.refresh.handler.EnterpriseRefreshHandler;
import com.yeejoin.amos.component.feign.utils.FeignUtil;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import lombok.RequiredArgsConstructor;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.aggregations.AggregationBuilders;
import org.elasticsearch.search.aggregations.bucket.terms.Terms;
import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@Service
@RequiredArgsConstructor
public class EnterpriseManageServiceImpl {
private final TzsUserInfoServiceImpl userInfoService;
private final RestHighLevelClient restHighLevelClient;
private final TzBaseEnterpriseInfoServiceImpl enterpriseInfoService;
private final EsBaseEnterpriseInfoDao esBaseEnterpriseInfoDao;
private final EnterpriseRefreshHandler refreshHandler;
private final ESPlanTaskList esPlanTaskList;
private final ESTaskDetail esTaskDetail;
private final PatrolMapper patrolMapper;
/**
* 批量删除企业
*
* @param ids 企业ids
*/
public Boolean delete(List<String> ids) {
// 校验
List<TzBaseEnterpriseInfo> enterpriseInfos = enterpriseInfoService.getBaseMapper().selectBatchIds(ids);
List<String> useUnitCodes = this.castIds2UseUnitCodes(ids, enterpriseInfos);
Map<String, Long> useUnitCodeUserNumMap = this.countUserByUnit(enterpriseInfos);
this.checkForUse(useUnitCodes, useUnitCodeUserNumMap, "人员");
Map<String, Long> useUnitCodeEquipNumMap = this.countEquipByUnit(enterpriseInfos);
this.checkForUse(useUnitCodes, useUnitCodeEquipNumMap, "设备");
// 业务操作
enterpriseInfos.forEach(e -> {
this.deleteEnterprise(e);
this.deleteAmosUser(e);
this.deleteAmosCompany(e);
this.deleteEsEnterpriseInfo(e);
});
return true;
}
private List<String> castIds2UseUnitCodes(List<String> ids, List<TzBaseEnterpriseInfo> enterpriseInfos) {
List<String> useUnitCodes = new ArrayList<>();
Map<String, String> map = enterpriseInfos.stream().collect(Collectors.toMap(s -> String.valueOf(s.getSequenceNbr()), TzBaseEnterpriseInfo::getUseUnitCode));
ids.forEach(id -> {
useUnitCodes.add(map.get(id));
});
return useUnitCodes;
}
/**
* 批量启用企业
*
* @param ids 企业ids
*/
public Boolean enable(List<String> ids) {
// 校验
List<TzBaseEnterpriseInfo> enterpriseInfos = enterpriseInfoService.getBaseMapper().selectBatchIds(ids);
// 状态校验，非停用状态不能启用
this.checkForEnable(ids, enterpriseInfos);
enterpriseInfos.forEach(enterpriseInfo -> {
this.updateEnterpriseDeletedStatus(enterpriseInfo, false);
this.insertEnterprise2Es(enterpriseInfo);
this.unlockLoginAccount(enterpriseInfo);
this.createPatrolData(enterpriseInfo);
});
return true;
}
/**
* 批量停用企业
*
* @param ids 企业ids
*/
public Boolean disable(List<String> ids) {
// 校验
List<TzBaseEnterpriseInfo> enterpriseInfos = enterpriseInfoService.getBaseMapper().selectBatchIds(ids);
// 状态校验，非启用状态不能停用
this.checkForDisable(ids, enterpriseInfos);
enterpriseInfos.forEach(enterpriseInfo -> {
this.updateEnterpriseDeletedStatus(enterpriseInfo, true);
this.deleteEnterpriseFromEs(enterpriseInfo);
this.clearPatrolData(enterpriseInfo);
this.lockLoginAccount(enterpriseInfo);
});
return true;
}
private void clearPatrolData(TzBaseEnterpriseInfo enterpriseInfo) {
//删除planTask
List<String> planTaskIds = patrolMapper.selectPlanTaskIdsByUseCode(enterpriseInfo.getUseCode());
if (planTaskIds.size() > 5000) {
int index = 5000;
for (int i = 0; i < planTaskIds.size(); i += 5000) {
if (i + 5000 > planTaskIds.size()) {
index = planTaskIds.size() - i;
}
List<String> subList = planTaskIds.subList(i, i + index);
List<ESTaskDetailDto> maps = patrolMapper.findAllByTaskNos(subList);
esTaskDetail.deleteAll(maps);
List<ESPlanTaskListDto> esPlanTaskListDtos = subList.stream().map(item -> new ESPlanTaskListDto().setId(item)).collect(Collectors.toList());
esPlanTaskList.deleteAll(esPlanTaskListDtos);
patrolMapper.deleteAllPlanTaskDetailByTaskNos(subList);
patrolMapper.deleteAllPlanTaskById(subList);
}
} else {
List<ESTaskDetailDto> maps = patrolMapper.findAllByTaskNos(planTaskIds);
esTaskDetail.deleteAll(maps);
List<ESPlanTaskListDto> esPlanTaskListDtos = planTaskIds.stream().map(item -> new ESPlanTaskListDto().setId(item)).collect(Collectors.toList());
esPlanTaskList.deleteAll(esPlanTaskListDtos);
patrolMapper.deleteAllPlanTaskDetailByTaskNos(planTaskIds);
patrolMapper.deleteAllPlanTaskById(planTaskIds);
}
}
private void createPatrolData(TzBaseEnterpriseInfo enterpriseInfo) {
// todo
}
private void unlockLoginAccount(TzBaseEnterpriseInfo enterpriseInfo) {
// Lambda 形式
Set<AgencyUserModel> userModels = FeignUtil.remoteCall(() -> Privilege.agencyUserClient.queryByOrgCode(enterpriseInfo.getOrgCode(), null));
if (!userModels.isEmpty()) {
List<String> userIds = userModels.stream().map(AgencyUserModel::getUserId).collect(Collectors.toList());
Privilege.agencyUserClient.unlockUsers(String.join(",", userIds));
}
}
private void insertEnterprise2Es(TzBaseEnterpriseInfo enterpriseInfo) {
refreshHandler.doRefresh(new TzsDataRefreshMessage().setDataId(enterpriseInfo.getSequenceNbr() + "").setOperation(DataRefreshEvent.Operation.INSERT.name()));
}
private void deleteEnterpriseFromEs(TzBaseEnterpriseInfo enterpriseInfo) {
esBaseEnterpriseInfoDao.deleteById(enterpriseInfo.getSequenceNbr() + "");
}
private void lockLoginAccount(TzBaseEnterpriseInfo enterpriseInfo) {
// Lambda 形式
Set<AgencyUserModel> userModels = FeignUtil.remoteCall(() -> Privilege.agencyUserClient.queryByOrgCode(enterpriseInfo.getOrgCode(), null));
if (!userModels.isEmpty()) {
List<String> userIds = userModels.stream().map(AgencyUserModel::getUserId).collect(Collectors.toList());
Privilege.agencyUserClient.lockUsers(String.join(",", userIds));
}
}
private void updateEnterpriseDeletedStatus(TzBaseEnterpriseInfo enterpriseInfo, Boolean isDeleted) {
LambdaUpdateWrapper<TzBaseEnterpriseInfo> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(BaseEntity::getIsDelete, isDeleted);
updateWrapper.eq(BaseEntity::getSequenceNbr, enterpriseInfo.getSequenceNbr());
enterpriseInfoService.update(updateWrapper);
}
private void checkForEnable(List<String> ids, List<TzBaseEnterpriseInfo> enterpriseInfos) {
long enableUnitNum = enterpriseInfos.stream().map(BaseEntity::getIsDelete).filter(d -> !d).count();
if (enableUnitNum > 0) {
List<Integer> indexes = new ArrayList<>();
List<String> enableUnits = enterpriseInfos.stream().filter(s -> !s.getIsDelete()).map(BaseEntity::getSequenceNbr).map(String::valueOf).collect(Collectors.toList());
for (int i = 0; i < ids.size(); i++) {
if (enableUnits.contains(ids.get(i))) {
indexes.add(i + 1);
}
}
this.buildEnableCheckFailureMsg(indexes);
}
}
private void checkForDisable(List<String> ids, List<TzBaseEnterpriseInfo> enterpriseInfos) {
long disableUnitNum = enterpriseInfos.stream().map(BaseEntity::getIsDelete).filter(d -> d).count();
if (disableUnitNum > 0) {
List<Integer> indexes = new ArrayList<>();
List<String> disableUnits = enterpriseInfos.stream().filter(BaseEntity::getIsDelete).map(BaseEntity::getSequenceNbr).map(String::valueOf).collect(Collectors.toList());
for (int i = 0; i < ids.size(); i++) {
if (disableUnits.contains(ids.get(i))) {
indexes.add(i + 1);
}
}
this.buildDisableCheckFailureMsg(indexes);
}
}
private void deleteEsEnterpriseInfo(TzBaseEnterpriseInfo e) {
Optional<EsBaseEnterpriseInfo> op = esBaseEnterpriseInfoDao.findById(e.getSequenceNbr() + "");
op.ifPresent(v -> {
esBaseEnterpriseInfoDao.deleteById(v.getSequenceNbr());
});
}
private void checkForUse(List<String> ids, Map<String, Long> seqUseNumMap, String type) {
if (seqUseNumMap.values().stream().reduce(0L, Long::sum) > 0) {
List<Integer> indexUse = new ArrayList<>();
for (int i = 0; i < ids.size(); i++) {
if (seqUseNumMap.getOrDefault(ids.get(i), 0L) > 0) {
indexUse.add(i + 1);
}
}
this.buildDeleteCheckFailureMsg(indexUse, type);
}
}
private void buildDisableCheckFailureMsg(List<Integer> indexDisabled) {
String msg = indexDisabled.stream().map(String::valueOf).collect(Collectors.joining("、", "第", "行")) + "已经是停用状态，不能重复操作！";
throw new BadRequest(msg);
}
private void buildEnableCheckFailureMsg(List<Integer> indexDisabled) {
String msg = indexDisabled.stream().map(String::valueOf).collect(Collectors.joining("、", "第", "行")) + "已经是启用状态，不能重复操作！";
throw new BadRequest(msg);
}
private void buildDeleteCheckFailureMsg(List<Integer> indexUse, String type) {
String msg = String.format("%s的企业下存在%s，请先删除%s后再操作！", indexUse.stream().map(String::valueOf).collect(Collectors.joining("、", "第", "行")), type, type);
throw new BadRequest(msg);
}
private void deleteAmosCompany(TzBaseEnterpriseInfo e) {
CompanyModel companyModel = FeignUtil.remoteCall(() -> Privilege.companyClient.queryByCompanyCode(e.getUseCode()));
Privilege.companyClient.deleteCompany(companyModel.getSequenceNbr() + "");
}
private void deleteAmosUser(TzBaseEnterpriseInfo e) {
// Lambda 形式
Set<AgencyUserModel> userModels = FeignUtil.remoteCall(() -> Privilege.agencyUserClient.queryByOrgCode(e.getOrgCode(), null));
if (!userModels.isEmpty()) {
List<String> userIds = userModels.stream().map(AgencyUserModel::getUserId).collect(Collectors.toList());
Privilege.agencyUserClient.multDeleteUser(String.join(",", userIds), true);
}
}
private void deleteEnterprise(TzBaseEnterpriseInfo e) {
enterpriseInfoService.removeById(e.getSequenceNbr());
}
private Map<String, Long> countEquipByUnit(List<TzBaseEnterpriseInfo> enterpriseInfos) {
// 按照使用单位查询
Map<String, Long> useCountMap = countByUseCode(enterpriseInfos);
// 按照安装单位查询
Map<String, Long> uscCountMap = countByUscCode(enterpriseInfos);
return this.mergeUseAndUscCount(useCountMap, uscCountMap);
}
private Map<String, Long> mergeUseAndUscCount(Map<String, Long> useCountMap, Map<String, Long> uscCountMap) {
return Stream.of(useCountMap, uscCountMap).flatMap(map -> map.entrySet().stream()).filter(entry -> entry.getKey() != null && entry.getValue() != null) // 过滤null
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, Long::sum, // key冲突时，求和
HashMap::new));
}
private Map<String, Long> countByUscCode(List<TzBaseEnterpriseInfo> enterpriseInfos) {
Map<String, Long> countMap = new HashMap<>();
SearchRequest request = new SearchRequest();
request.indices("idx_biz_view_jg_all");
BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
boolMust.must(QueryBuilders.termsQuery("USC_UNIT_CREDIT_CODE.keyword", enterpriseInfos.stream().map(TzBaseEnterpriseInfo::getUseUnitCode).collect(Collectors.toList())));
SearchSourceBuilder builder = new SearchSourceBuilder();
builder.query(boolMust);
TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("count_by_usc_code").field("USC_UNIT_CREDIT_CODE.keyword");
builder.aggregation(aggregationBuilder);
request.source(builder);
try {
SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
Terms terms = response.getAggregations().get("count_by_usc_code");
for (Terms.Bucket bucket : terms.getBuckets()) {
countMap.put(bucket.getKeyAsString(), bucket.getDocCount());
}
} catch (IOException e) {
throw new RuntimeException(e);
}
return countMap;
}
private Map<String, Long> countByUseCode(List<TzBaseEnterpriseInfo> enterpriseInfos) {
Map<String, Long> countMap = new HashMap<>();
SearchRequest request = new SearchRequest();
request.indices("idx_biz_view_jg_all");
BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
boolMust.must(QueryBuilders.termsQuery("USE_UNIT_CREDIT_CODE.keyword", enterpriseInfos.stream().map(TzBaseEnterpriseInfo::getUseUnitCode).collect(Collectors.toList())));
SearchSourceBuilder builder = new SearchSourceBuilder();
builder.query(boolMust);
TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("count_by_use_code").field("USE_UNIT_CREDIT_CODE.keyword");
builder.aggregation(aggregationBuilder);
request.source(builder);
try {
SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
Terms terms = response.getAggregations().get("count_by_use_code");
for (Terms.Bucket bucket : terms.getBuckets()) {
countMap.put(bucket.getKeyAsString(), bucket.getDocCount());
}
} catch (IOException e) {
throw new RuntimeException(e);
}
return countMap;
}
private Map<String, Long> countUserByUnit(List<TzBaseEnterpriseInfo> enterpriseInfos) {
List<String> unitCodes = enterpriseInfos.stream().map(TzBaseEnterpriseInfo::getUseCode).collect(Collectors.toList());
List<CountDto> countDos = userInfoService.getBaseMapper().countUserByUnitCodes(unitCodes);
return countDos.stream().collect(Collectors.toMap(CountDto::getKeyStr, CountDto::getLongValue));
}
}
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/pom.xml
View file @ b29d778a
......@@ -21,17 +21,6 @@
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java
View file @ b29d778a
package com.yeejoin.amos.patrol.business.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.module.common.api.dto.ESPlanTaskListDto;
import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.patrol.business.constants.XJConstant;
import com.yeejoin.amos.patrol.business.dao.mapper.CheckMapper;
import com.yeejoin.amos.patrol.business.dao.mapper.PlanTaskMapper;
import com.yeejoin.amos.patrol.business.dao.mapper.PointMapper;
import com.yeejoin.amos.patrol.business.dao.repository.ESPlanTaskList;
import com.yeejoin.amos.patrol.business.dao.repository.ICheckInputDao;
import com.yeejoin.amos.patrol.business.dto.CheckDto;
import com.yeejoin.amos.patrol.business.dto.SendToMsgRiskAlarmInfoVo;
......@@ -18,7 +18,6 @@ import com.yeejoin.amos.patrol.business.dto.SendToMsgRiskDetailVo;
import com.yeejoin.amos.patrol.business.dto.SendToMsgRiskEquipInfoVo;
import com.yeejoin.amos.patrol.business.dto.TopicEntityVo;
import com.yeejoin.amos.patrol.business.param.CheckInfoPageParam;
import com.yeejoin.amos.patrol.business.param.CheckInputParam;
import com.yeejoin.amos.patrol.business.param.CheckRecordParam;
import com.yeejoin.amos.patrol.business.param.CheckStatisticalParam;
import com.yeejoin.amos.patrol.business.service.intfc.ICheckService;
......@@ -42,7 +41,6 @@ import com.yeejoin.amos.patrol.common.enums.PlanTaskTypeStatusEnum;
import com.yeejoin.amos.patrol.core.async.AsyncTask;
import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
import com.yeejoin.amos.patrol.core.common.request.CommonRequest;
import com.yeejoin.amos.patrol.core.common.response.AppCheckInputRespone;
import com.yeejoin.amos.patrol.core.common.response.AppPointCheckRespone;
import com.yeejoin.amos.patrol.core.common.response.GraphInitDataResponse;
import com.yeejoin.amos.patrol.core.enums.QueryOperatorEnum;
......@@ -56,7 +54,6 @@ import com.yeejoin.amos.patrol.utils.UserTransmittableUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
......@@ -93,12 +90,10 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@RestController
@RequestMapping(value = "/api/check")
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PlanTaskDetailMapper.java
View file @ b29d778a
package com.yeejoin.amos.patrol.business.dao.mapper;
import com.yeejoin.amos.patrol.dao.entity.ESTaskDetailDto;
import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
import org.apache.ibatis.annotations.Param;
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PlanTaskMapper.java
View file @ b29d778a
package com.yeejoin.amos.patrol.business.dao.mapper;
import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
import com.yeejoin.amos.patrol.business.dto.PlanTaskStaticDto;
import com.yeejoin.amos.patrol.business.dto.StaticTableUpdateDto;
import com.yeejoin.amos.patrol.business.entity.mybatis.CheckChkExListBo;
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/data/CheckRecordDataConsumer.java
View file @ b29d778a
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.patrol.business.data;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
import com.yeejoin.amos.component.robot.AmosRequestContext;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.patrol.business.constants.XJConstant;
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dto/CheckRecordDataDto.java
View file @ b29d778a
package com.yeejoin.amos.patrol.business.dto;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.patrol.dao.entity.PlanTask;
import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
import lombok.Data;
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java
View file @ b29d778a
package com.yeejoin.amos.patrol.business.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
......@@ -9,6 +10,12 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.module.common.api.dao.ESPlanTaskList;
import com.yeejoin.amos.boot.module.common.api.dao.ESTaskDetail;
import com.yeejoin.amos.boot.module.common.api.dto.ESPlanTaskListDto;
import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
import com.yeejoin.amos.boot.module.common.api.dto.PlanTaskDetailDto;
import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
......@@ -710,7 +717,7 @@ public class CheckServiceImpl implements ICheckService {
List<PlanTaskDetail> maps = planTaskMapper.selectTaskDetails(ids);
int unqualified = Integer.parseInt(esPlanTaskListDto.getUnqualified()) + 1;
esPlanTaskListDto.setUnqualified( unqualified + "");
esPlanTaskListDto.setPoints(maps);
esPlanTaskListDto.setPoints(this.castPlanTaskEntry2Dto(maps));
esPlanTaskList.save(esPlanTaskListDto);
});
} else {
......@@ -718,7 +725,7 @@ public class CheckServiceImpl implements ICheckService {
op.ifPresent(esPlanTaskListDto->{
String ids = String.format("(%d)",planTaskId);
List<PlanTaskDetail> maps = planTaskMapper.selectTaskDetails(ids);
esPlanTaskListDto.setPoints(maps);
esPlanTaskListDto.setPoints(this.castPlanTaskEntry2Dto(maps));
esPlanTaskList.save(esPlanTaskListDto);
});
}
......@@ -731,6 +738,10 @@ public class CheckServiceImpl implements ICheckService {
}
}
private List<PlanTaskDetailDto> castPlanTaskEntry2Dto(List<PlanTaskDetail> planTaskDetails) {
return BeanUtil.copyToList(planTaskDetails, PlanTaskDetailDto.class);
}
private CheckInput setInputValueByItemType(CheckInput checkInput, String dataJson, String itemType, CheckInputParam item, String isScore) {
if (XJConstant.INPUT_ITEM_SELECT.equals(itemType)) {
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PatrolDataSyncServiceImpl.java
View file @ b29d778a
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.patrol.business.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
import com.yeejoin.amos.patrol.business.bo.CheckInputSyncBo;
import com.yeejoin.amos.patrol.business.bo.PlanTaskSyncBo;
import com.yeejoin.amos.patrol.business.dao.mapper.CheckMapper;
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java
View file @ b29d778a
......@@ -9,6 +9,12 @@ import com.google.common.base.Joiner;
import com.yeejoin.amos.boot.biz.common.constants.RuleConstant;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.common.api.dao.ESPlanTaskList;
import com.yeejoin.amos.boot.module.common.api.dao.ESTaskDetail;
import com.yeejoin.amos.boot.module.common.api.dto.ESPlanTaskListDto;
import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
import com.yeejoin.amos.boot.module.common.api.dto.PlanTaskDetailDto;
import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.component.robot.AmosRequestContext;
......@@ -599,8 +605,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
*/
private void handleEsPlanTaskListPointsByIds(List<String> taskDetailIds, List<String> taskIds) {
taskIds.forEach(taskId -> esPlanTaskList.findById(taskId).ifPresent(esPlanTaskListDto -> {
List<PlanTaskDetail> points = esPlanTaskListDto.getPoints();
List<PlanTaskDetail> filterPoints = points.stream().filter(point -> !taskDetailIds.contains(Objects.toString(point.getId()))).collect(Collectors.toList());
List<PlanTaskDetailDto> points = esPlanTaskListDto.getPoints();
List<PlanTaskDetailDto> filterPoints = points.stream().filter(point -> !taskDetailIds.contains(Objects.toString(point.getId()))).collect(Collectors.toList());
esPlanTaskList.deleteById(taskId);
if (!filterPoints.isEmpty()) {
esPlanTaskListDto.setPoints(filterPoints);
......@@ -1247,7 +1253,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
Map<String, List<PlanTaskStaticDto>> collect3 = planTaskStaticListMap.stream().collect(Collectors.groupingBy(PlanTaskStaticDto::getPlanTaskId));
Map<Long, List<PlanTaskDetail>> collect = planTaskDetailList.stream().collect(Collectors.groupingBy(PlanTaskDetail::getTaskNo));
for (ESPlanTaskListDto esPlanTaskListDto : esPlanTaskListDtos) {
esPlanTaskListDto.setPoints(collect.get(Long.valueOf(esPlanTaskListDto.getPlanTaskId())));
esPlanTaskListDto.setPoints(castPlanTaskEntry2Dto(collect.get(Long.valueOf(esPlanTaskListDto.getPlanTaskId()))));
if (!ValidationUtil.isEmpty(planTaskIds)) {
esPlanTaskListDto.setFinshNum(ObjectUtils.isEmpty(collect3.get(esPlanTaskListDto.getPlanTaskId()).get(0).getFinshNum()) ? "0" : collect3.get(esPlanTaskListDto.getPlanTaskId()).get(0).getFinshNum());
esPlanTaskListDto.setOmission(ObjectUtils.isEmpty(collect3.get(esPlanTaskListDto.getPlanTaskId()).get(0).getOmission()) ? "0" : collect3.get(esPlanTaskListDto.getPlanTaskId()).get(0).getOmission());
......@@ -1271,6 +1277,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
log.info("任务存入es，耗时：{} 秒", stopWatch7.getTotalTimeSeconds());
}
private PlanTaskDetailDto castPlanTaskEntry2Dto(PlanTaskDetail planTaskDetail) {
return BeanUtil.copyProperties(planTaskDetail, PlanTaskDetailDto.class);
}
public static CheckInput paraseSelect(CheckInput checkInput, String json) {
JSONArray jsonArray = JSONArray.parseArray(json);
......@@ -1696,8 +1705,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
esPlanTaskListDto.setUnplan(ObjectUtils.isEmpty(task.get("unplan")) ? "0" : task.get("unplan").toString());
esPlanTaskListDto.setTaskPlanNum(ObjectUtils.isEmpty(task.get("taskPlanNum")) ? "0" : task.get("taskPlanNum").toString());
List<PlanTaskDetail> planTaskDetailList = planTaskMapper.selectTaskDetails("('" + esPlanTaskListDto.getPlanTaskId() + "')");
esPlanTaskListDto.setPoints(planTaskDetailList);
esPlanTaskListDto.setPoints(castPlanTaskEntry2Dto(planTaskDetailList));
esPlanTaskList.save(esPlanTaskListDto);
}
}
......@@ -1999,7 +2007,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
esPlanTaskListDto.setUnqualified(this.filterByStatus("2", esPlanTaskListDto.getPlanTaskId(), esTaskDetailDtos));
esPlanTaskListDto.setUnplan(this.filterByStatus("0", esPlanTaskListDto.getPlanTaskId(), esTaskDetailDtos));
esPlanTaskListDto.setTaskPlanNum(this.filterByStatus("1", esPlanTaskListDto.getPlanTaskId(), esTaskDetailDtos));
esPlanTaskListDto.setPoints(this.buildPlanTaskPoint(esPlanTaskListDto.getPlanTaskId(), planTaskDetails));
esPlanTaskListDto.setPoints(this.castPlanTaskEntry2Dto(this.buildPlanTaskPoint(esPlanTaskListDto.getPlanTaskId(), planTaskDetails)));
});
return esPlanTaskListDtos;
}
......@@ -2009,10 +2017,14 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
esPlanTaskListDto.setFinishStatus(String.valueOf(PlanTaskFinishStatusEnum.FINISHED.getValue()));
esPlanTaskListDto.setFinshNum(esPlanTaskListDto.getPoints().size() + "");
esPlanTaskListDto.setUnplan("0");
esPlanTaskListDto.setPoints(this.buildPlanTaskPoint(esPlanTaskListDto.getPlanTaskId(), planTaskDetails));
esPlanTaskListDto.setPoints(this.castPlanTaskEntry2Dto(this.buildPlanTaskPoint(esPlanTaskListDto.getPlanTaskId(), planTaskDetails)));
});
}
private List<PlanTaskDetailDto> castPlanTaskEntry2Dto(List<PlanTaskDetail> planTaskDetails) {
return BeanUtil.copyToList(planTaskDetails, PlanTaskDetailDto.class);
}
private List<PlanTaskDetail> buildPlanTaskPoint(String planTaskId, List<PlanTaskDetail> planTaskDetails) {
return planTaskDetails.stream().filter(t -> Long.parseLong(planTaskId) == t.getTaskNo()).collect(Collectors.toList());
}
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PointServiceImpl.java
View file @ b29d778a
......@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.systemctl.Systemctl;
......@@ -30,7 +31,6 @@ import com.yeejoin.amos.patrol.core.common.response.PointResponse;
import com.yeejoin.amos.patrol.core.util.StringUtil;
import com.yeejoin.amos.patrol.core.util.query.BaseQuerySpecification;
import com.yeejoin.amos.patrol.dao.entity.*;
import com.yeejoin.amos.patrol.exception.YeeException;
import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
import com.yeejoin.amos.safety.common.cache.PointStatusCache;
import lombok.extern.slf4j.Slf4j;
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/ICheckService.java
View file @ b29d778a
......@@ -14,8 +14,8 @@ import com.yeejoin.amos.patrol.core.common.response.CommonPage;
import com.yeejoin.amos.patrol.core.common.response.GraphInitDataResponse;
import com.yeejoin.amos.patrol.core.common.response.QueryCriteriaRespone;
import com.yeejoin.amos.patrol.dao.entity.CheckShot;
import com.yeejoin.amos.patrol.dao.entity.ESPlanTaskListDto;
import com.yeejoin.amos.patrol.dao.entity.ESTaskDetailDto;
import com.yeejoin.amos.boot.module.common.api.dto.ESPlanTaskListDto;
import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
import com.yeejoin.amos.patrol.dao.entity.PlanTask;
import com.yeejoin.amos.patrol.exception.YeeException;
import org.springframework.data.domain.Page;
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IPatrolDataSyncService.java
View file @ b29d778a
package com.yeejoin.amos.patrol.business.service.intfc;
import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
import com.yeejoin.amos.patrol.business.bo.CheckInputSyncBo;
import com.yeejoin.amos.patrol.dao.entity.*;
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/quartz/JobService.java
View file @ b29d778a
package com.yeejoin.amos.patrol.quartz;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.yeejoin.amos.boot.module.common.api.dao.ESPlanTaskList;
import com.yeejoin.amos.boot.module.common.api.dao.ESTaskDetail;
import com.yeejoin.amos.boot.module.common.api.dto.ESPlanTaskListDto;
import com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto;
import com.yeejoin.amos.boot.module.common.api.dto.PlanTaskDetailDto;
import com.yeejoin.amos.patrol.dao.entity.PlanTaskDetail;
import com.yeejoin.amos.component.feign.config.InnerInvokException;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.component.robot.AmosRequestContext;
......@@ -307,13 +314,17 @@ public class JobService implements IJobService {
esTaskDetailDtos.add(esTaskDetailDto);
}
esTaskDetail.saveAll(esTaskDetailDtos);
esPlanTaskListDto.setPoints(planTaskDetailList);
esPlanTaskListDto.setPoints(castPlanTaskEntry2Dto(planTaskDetailList));
esPlanTaskListDtos.add(esPlanTaskListDto);
}
}
esPlanTaskList.saveAll(esPlanTaskListDtos);
}
private List<PlanTaskDetailDto> castPlanTaskEntry2Dto(List<PlanTaskDetail> planTaskDetails) {
return BeanUtil.copyToList(planTaskDetails, PlanTaskDetailDto.class);
}
private void updatePlanTaskAndDetailStatus(PlanTask planTask) {
List<String> esIds = planTaskMapper.selectPlanTaskIdLists(planTask.getPlanId(), PlanTaskFinishStatusEnum.UNDERWAY.getValue(), PlanTaskFinishStatusEnum.NOTSTARTED.getValue());
if (esIds.size() > 0) {
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/dbTemplate_plan_task.xml
View file @ b29d778a
......@@ -192,7 +192,10 @@
</update>
<select id="getGenPlanTask" resultType="java.lang.String">
select a.id from p_plan_task a
select
a.id
from
p_plan_task a
<trim prefix="where" prefixOverrides="AND |OR">
<if test="beginDate!=null"> and a.begin_Time >= #{beginDate}</if>
<if test="endDate!=null"> and a.begin_Time <![CDATA[<=]]> #{endDate}</if>
......@@ -1838,7 +1841,7 @@
GROUP BY a.planTaskId
</select>
<select id="selectTaskDetailList" resultType="com.yeejoin.amos.patrol.dao.entity.ESTaskDetailDto">
<select id="selectTaskDetailList" resultType="com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto">
SELECT
pptd.id,
pptd.task_no planTaskId,
......@@ -1854,7 +1857,7 @@
WHERE
task_no IN ${ids}
</select>
<select id="selectTaskInfoList" resultType="com.yeejoin.amos.patrol.dao.entity.ESTaskDetailDto">
<select id="selectTaskInfoList" resultType="com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto">
SELECT
id planTaskId,
date_format(ppt.begin_time,'%Y-%m-%d %H:%i:%s') beginTime,
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/plan_task_detail.xml
View file @ b29d778a
......@@ -51,7 +51,7 @@
</foreach>
</delete>
<select id="findAllByTaskNos" resultType="com.yeejoin.amos.patrol.dao.entity.ESTaskDetailDto">
<select id="findAllByTaskNos" resultType="com.yeejoin.amos.boot.module.common.api.dto.ESTaskDetailDto">
select
pptd.id
from
......
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