diff --git a/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java b/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java index 7fae2b4..b258d29 100644 --- a/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java +++ b/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java @@ -37,8 +37,8 @@ import java.util.Map; * @date 2023/3/29 * @description: 操作日志切面处理类 */ -@Aspect -@Component +//@Aspect +//@Component @Slf4j public class SysLogAspect { diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/AreaAssetDeviceVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/AreaAssetDeviceVo.java index 56ce3a8..fa6f71d 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/AreaAssetDeviceVo.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/AreaAssetDeviceVo.java @@ -16,11 +16,8 @@ public class AreaAssetDeviceVo { @ApiModelProperty(value = "机构Id") private Long deptId; - @ApiModelProperty(value = "设备名称") - private String deviceCode; - - @ApiModelProperty(value = "设备名称") - private String deviceName; + @ApiModelProperty(value = "机构名称") + private String deptName; @ApiModelProperty(value = "状态") private Integer status; diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/AreaTimelyVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/AreaTimelyVo.java index d50cd69..29ec5c1 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/AreaTimelyVo.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/census/vo/AreaTimelyVo.java @@ -24,8 +24,8 @@ public class AreaTimelyVo { private String time; @ApiModelProperty(value = "提醒数量") - private Integer sum; + private String type; - @ApiModelProperty(value = "字体颜色：1-红色 0-黄色") + @ApiModelProperty(value = "字体颜色：0-红色 1-黄色 2-绿色") private Integer colour; } diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ContentDefinitionEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ContentDefinitionEntity.java index 7dbba17..e5b8a4e 100644 --- a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ContentDefinitionEntity.java +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ContentDefinitionEntity.java @@ -39,9 +39,11 @@ public class ContentDefinitionEntity extends TenantEntity implements Serializabl private String description; @ApiModelProperty(value = "记录类型 0不记录 1仅选择 2仅记值 3选择并记值") + @QueryField(condition = SqlCondition.EQUAL) private String recordType; @ApiModelProperty(value = "检测类型") + @QueryField(condition = SqlCondition.EQUAL) private String checkType; @ApiModelProperty(value = "检测类型子类") diff --git a/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/dto/WxMessageDTO.java b/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/dto/WxMessageDTO.java index 0c40b50..6846b6d 100644 --- a/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/dto/WxMessageDTO.java +++ b/hzims-service-api/message-api/src/main/java/com/hnac/hzims/message/dto/WxMessageDTO.java @@ -45,7 +45,7 @@ public class WxMessageDTO implements Serializable { @NotNull @ApiModelProperty(value = "推送消息键值对") - private Map map; + private Map map; @NotNull @ApiModelProperty(value = "内容") diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/workarea/entity/WorkArea.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/workarea/entity/WorkArea.java new file mode 100644 index 0000000..0f1ae1a --- /dev/null +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/workarea/entity/WorkArea.java @@ -0,0 +1,54 @@ +package com.hnac.hzims.safeproduct.workarea.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("work_area") +public class WorkArea { + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 区域名称 + */ + @TableField("area_name") + private String areaName; + + /** + * 安全责任人 + */ + @TableField("direct_op_id") + private Long directOpId; + + /** + * 监管部门 + */ + @TableField("depart_id") + private Long departId; + + /** + * 分管领导 + */ + @TableField("lead_op_id") + private Long leadOpId; + + /** + * 区域范围 + */ + @TableField("area_range") + private String areaRange; + + private String directOpName; + + private String departName; + + private String leadOpName; +} diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/workarea/vo/WorkAreaQueryVo.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/workarea/vo/WorkAreaQueryVo.java new file mode 100644 index 0000000..61c2160 --- /dev/null +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/workarea/vo/WorkAreaQueryVo.java @@ -0,0 +1,32 @@ +package com.hnac.hzims.safeproduct.workarea.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; + +@Data +public class WorkAreaQueryVo { + + /** + * 区域名称 + */ + @TableField("area_name") + private String areaName; + + /** + * 安全责任人 + */ + @TableField("direct_op_id") + private Long directOpId; + + /** + * 监管部门 + */ + @TableField("depart_id") + private Long departId; + + /** + * 分管领导 + */ + @TableField("lead_op_id") + private Long leadOpId; +} diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/dto/TicketStatisticDTO.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/dto/TicketStatisticDTO.java new file mode 100644 index 0000000..4378262 --- /dev/null +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/dto/TicketStatisticDTO.java @@ -0,0 +1,35 @@ +package com.hnac.hzims.ticket.allTicket.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * @ClassName TicketStatisticDTO + * @description: 两票统计请求 + * @author: hx + * @create: 2023-08-17 11:26 + * @Version 4.0 + **/ +@Data +@Builder +@EqualsAndHashCode +public class TicketStatisticDTO implements Serializable { + + private String deptIds; + + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + private LocalDateTime startTime; + + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + private LocalDateTime endTime; + +} diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/entity/TicketInfoEntity.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/entity/TicketInfoEntity.java new file mode 100644 index 0000000..ad63e24 --- /dev/null +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/entity/TicketInfoEntity.java @@ -0,0 +1,71 @@ +package com.hnac.hzims.ticket.allTicket.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springblade.core.mp.support.QueryField; +import org.springblade.core.mp.support.SqlCondition; +import org.springblade.core.tenant.mp.TenantEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * @ClassName TicketInfoEntity + * @description: + * @author: hx + * @create: 2023-08-30 08:30 + * @Version 4.0 + **/ +@TableName("v_hzims_ticket_info") +@ApiModel("两票合计对象") +@Data +public class TicketInfoEntity extends TenantEntity { + @ApiModelProperty("审批流程ID") + @QueryField(condition = SqlCondition.EQUAL) + private String processInstanceId; + + @ApiModelProperty(value = "关联业务类型") + @QueryField(condition = SqlCondition.EQUAL) + private String type; + + @ApiModelProperty(value = "单位") + @QueryField(condition = SqlCondition.LIKE) + private String company; + + @ApiModelProperty(value = "编号") + @QueryField(condition = SqlCondition.LIKE) + private String code; + + @ApiModelProperty(value = "关联业务类型") + @QueryField(condition = SqlCondition.EQUAL) + private String taskType; + + @ApiModelProperty(value = "关联业务ID") + @QueryField(condition = SqlCondition.EQUAL) + @JsonSerialize(nullsUsing = NullSerializer.class) + private Long taskId; + + @ApiModelProperty("关联业务名称") + @QueryField(condition = SqlCondition.LIKE) + private String taskName; + + @ApiModelProperty(value = "计划开始时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime planStartTime; + + @ApiModelProperty(value = "计划结束时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime planEndTime; + + @ApiModelProperty("流程描述") + private String flowDescription; + +} diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/ITicketInfoAllClient.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/ITicketInfoAllClient.java index a2a4335..bb2971c 100644 --- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/ITicketInfoAllClient.java +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/ITicketInfoAllClient.java @@ -1,11 +1,14 @@ package com.hnac.hzims.ticket.allTicket.fegin; +import com.hnac.hzims.ticket.allTicket.dto.TicketStatisticDTO; import com.hnac.hzims.ticket.allTicket.vo.DoublePassRateVO; import com.hnac.hzims.ticket.allTicket.vo.DoublePassVO; import com.hnac.hzims.ticket.allTicket.vo.TicketInfoStatisticVO; import com.hnac.hzims.ticket.constants.TicketConstants; +import org.springblade.core.tool.api.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.time.LocalDateTime; @@ -25,6 +28,7 @@ public interface ITicketInfoAllClient { String DOUBLE_PASS_RATE = "/getDoublePassRate"; String DOUBLE_PASS_QUANTITY = "/getDoublePassQuantity"; String GET_TICKET_REPORT_STATISTIC = API_PREFIX+"/getTicketReportStatistic"; + String GET_TICKET_PASS_RATE = API_PREFIX + "/getTicketPassRate"; /** * 统计站点统计月报-两票 @@ -61,4 +65,7 @@ public interface ITicketInfoAllClient { List getDoublePassQuantity(@RequestParam(value = "stationMap") Map stationMap, @RequestParam(value = "firstDateTime") LocalDateTime firstDateTime, @RequestParam(value = "now") LocalDateTime now); + + @GetMapping(GET_TICKET_PASS_RATE) + R getTicketPassRate(TicketStatisticDTO ticketStatisticDTO); } diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClientFallback.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClientFallback.java index b14d13b..76506d0 100644 --- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClientFallback.java +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClientFallback.java @@ -1,8 +1,10 @@ package com.hnac.hzims.ticket.allTicket.fegin; +import com.hnac.hzims.ticket.allTicket.dto.TicketStatisticDTO; import com.hnac.hzims.ticket.allTicket.vo.DoublePassRateVO; import com.hnac.hzims.ticket.allTicket.vo.DoublePassVO; import com.hnac.hzims.ticket.allTicket.vo.TicketInfoStatisticVO; +import org.springblade.core.tool.api.R; import org.springframework.stereotype.Component; import java.time.LocalDateTime; @@ -34,4 +36,9 @@ public class TicketInfoAllClientFallback implements ITicketInfoAllClient { public List getDoublePassQuantity(Map stationMap, LocalDateTime firstDateTime, LocalDateTime now) { return null; } + + @Override + public R getTicketPassRate(TicketStatisticDTO ticketStatisticDTO) { + return null; + } } diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/feign/SpareClient.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/feign/SpareClient.java index aef9c2b..4711db9 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/feign/SpareClient.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/feign/SpareClient.java @@ -110,26 +110,18 @@ public class SpareClient implements ISpareClient{ WtSpWarehouseEntity warehouse = warehouses.stream().filter(o->o.getId().equals(total.getWarehouseId())).min(Comparator.comparing(WtSpWarehouseEntity::getId)).get(); timely.setDeptName(warehouse.getName()); timely.setEventId(String.valueOf(total.getId())); + timely.setType("固定资产"); + timely.setColour(1); if(total.getStock() > basic.getUpperLimit()){ timely.setContent(String.format("（%s）已达到上限，目前仓库内的库存为：%s，上限值为：%s。", basic.getName(), total.getStock(), basic.getUpperLimit())); - timely.setSum((int) (total.getStock() - basic.getUpperLimit())); - timely.setColour(0); - if((double) (total.getStock() - basic.getUpperLimit()) / basic.getUpperLimit() > 0.3){ - timely.setColour(1); - } }else{ timely.setContent(String.format("（%s）已达到下限，目前仓库内的库存为：%s，下限值为：%s。", basic.getName(), total.getStock(), basic.getUpperLimit())); - timely.setSum((int) (total.getStock() - basic.getLowerLimit())); - timely.setColour(0); - if((double)(basic.getLowerLimit() - total.getStock()) / basic.getLowerLimit() > 0.3){ - timely.setColour(1); - } } timely.setTime(DateUtil.format(new Date(),DateUtil.PATTERN_DATETIME)); exceeds.add(timely); diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpReceivesMapper.xml b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpReceivesMapper.xml index 29c592e..5cfb451 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpReceivesMapper.xml +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpReceivesMapper.xml @@ -45,7 +45,7 @@ wt_sp_receives wr JOIN wt_sp_warehouse sw ON wr.STORAGE_ROOM = sw.id - and wr.code = #{params.code} + and wr.code like concat('%',#{params.code},'%') and wr.CREATE_USER = #{params.createUser} diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java index f9dbf68..74bf8bb 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java @@ -1,6 +1,5 @@ package com.hnac.hzims.spare.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hnac.hzims.spare.entity.SpTemporaryStockDetailEntity; import com.hnac.hzims.spare.entity.WtSpBasicEntity; import com.hnac.hzims.spare.vo.WtSpBasicVO; @@ -15,7 +14,7 @@ import java.util.Map; * * @author Chill */ -public interface WtSpBasicMapper extends BaseMapper { +public interface WtSpBasicMapper extends UserDataScopeBaseMapper { /** * 备品备件基础信息列表 * @param params diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java index fa00a7c..3a3bcb4 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java @@ -14,14 +14,13 @@ import com.hnac.hzims.spare.vo.WtSpBasicVO; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springblade.core.launch.constant.FlowConstant; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.support.Kv; +import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.core.tool.utils.StringUtil; import org.springblade.system.entity.Dept; import org.springblade.system.feign.IDictBizClient; @@ -31,7 +30,6 @@ import org.springblade.system.user.feign.IUserClient; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -39,7 +37,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * 服务实现类 @@ -246,7 +243,11 @@ public class SpAllocationServiceImpl extends BaseServiceImpl data = new ArrayList<>(); List error = new ArrayList<>(); error = JSONArray.parseArray(JSON.toJSONString(entityList), WtSpBasicEntity.class).stream() - .filter(entity -> Func.isEmpty(entity.getName())).collect(Collectors.toList()); + .filter(entity -> Func.isEmpty(entity.getCode())).collect(Collectors.toList()); data = JSONArray.parseArray(JSON.toJSONString(entityList), WtSpBasicEntity.class).stream() - .filter(entity -> Func.isNotEmpty(entity.getName())).collect(Collectors.toList()); + .filter(entity -> Func.isNotEmpty(entity.getCode())).collect(Collectors.toList()); Assert.isTrue(CollectionUtil.isEmpty(error), () -> { throw new ServiceException("填入工器具编码不能为空"); }); @@ -567,7 +567,7 @@ public class WtSpBasicServiceImpl extends BaseServiceImpl r = this.validExcel(libraryExcel, codeList, counter); - if (r.getMsg()!=null|| !r.isSuccess()) { + if ( !r.isSuccess()) { return r; } } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java index ba577d3..ccf9ee1 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java @@ -638,7 +638,7 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl{ -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ObjectMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ObjectMapper.java deleted file mode 100644 index b130b94..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ObjectMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.inspect; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzinfo.inspect.obj.entity.ObjectEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author ysj - */ -@Mapper -public interface ObjectMapper extends BaseMapper { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ObjectUserMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ObjectUserMapper.java deleted file mode 100644 index bf7bd6b..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ObjectUserMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.inspect; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzinfo.inspect.obj.entity.ObjectUserEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author ysj - */ -@Mapper -public interface ObjectUserMapper extends BaseMapper{ - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanMapper.java deleted file mode 100644 index e4a1c2d..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.inspect; - -import com.hnac.hzinfo.inspect.plan.entity.PlanEntity; -import org.apache.ibatis.annotations.Mapper; -import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; - -/** - * @author ysj - */ -@Mapper -public interface PlanMapper extends UserDataScopeBaseMapper { -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanObjectTemplateMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanObjectTemplateMapper.java deleted file mode 100644 index cffeb83..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanObjectTemplateMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.inspect; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzinfo.inspect.plan.entity.PlanObjectTemplateEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author ysj - */ -@Mapper -public interface PlanObjectTemplateMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanOrgMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanOrgMapper.java deleted file mode 100644 index 7a9b54f..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanOrgMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.inspect; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzinfo.inspect.plan.entity.PlanOrgEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author ysj - */ -@Mapper -public interface PlanOrgMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanPositionMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanPositionMapper.java deleted file mode 100644 index 31ee860..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanPositionMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.inspect; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzinfo.inspect.plan.entity.PlanPositionEntity; -import org.apache.ibatis.annotations.Mapper; - - -/** - * @author ysj - */ -@Mapper -public interface PlanPositionMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanUserMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanUserMapper.java deleted file mode 100644 index 6d4d19e..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanUserMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.inspect; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzinfo.inspect.plan.entity.PlanUserEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author ysj - */ -@Mapper -public interface PlanUserMapper extends BaseMapper { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ProjectContentMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ProjectContentMapper.java deleted file mode 100644 index 8e9ae3e..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ProjectContentMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.inspect; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzinfo.inspect.obj.entity.ProjectContentEntity; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @author ysj - */ -@Mapper -public interface ProjectContentMapper extends BaseMapper{ - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ProjectMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ProjectMapper.java deleted file mode 100644 index c237f71..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ProjectMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.inspect; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author ysj - */ -@Mapper -public interface ProjectMapper extends BaseMapper{ - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskMapper.java index 1a4a34b..6cf873d 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskMapper.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskMapper.java @@ -1,13 +1,13 @@ package com.hnac.hzims.scheduled.mapper.inspect; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hnac.hzinfo.inspect.task.entity.TaskEntity; import org.apache.ibatis.annotations.Mapper; -import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; /** * @author ysj */ @Mapper -public interface TaskMapper extends UserDataScopeBaseMapper { +public interface TaskMapper extends BaseMapper { } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectMapper.java deleted file mode 100644 index 0c0869c..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.inspect; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author ysj - */ -@Mapper -public interface TaskObjectMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectProjectContentMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectProjectContentMapper.java deleted file mode 100644 index 4bdca02..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectProjectContentMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.inspect; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectContentEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author ysj - */ -@Mapper -public interface TaskObjectProjectContentMapper extends BaseMapper { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectProjectMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectProjectMapper.java deleted file mode 100644 index fdef106..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectProjectMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.inspect; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author ysj - */ -@Mapper -public interface TaskObjectProjectMapper extends BaseMapper { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskResultMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskResultMapper.java deleted file mode 100644 index ee0f34b..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskResultMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.inspect; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzinfo.inspect.task.entity.TaskResultEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author ysj - */ -@Mapper -public interface TaskResultMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskUserMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskUserMapper.java deleted file mode 100644 index 83c6db3..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskUserMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.inspect; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzinfo.inspect.task.entity.TaskUserEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author ysj - */ -@Mapper -public interface TaskUserMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TemplateMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TemplateMapper.java deleted file mode 100644 index 0b82110..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TemplateMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.inspect; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzinfo.inspect.obj.entity.TemplateEntity; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @author ysj - */ -@Mapper -public interface TemplateMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TemplateProjectMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TemplateProjectMapper.java deleted file mode 100644 index 6d42089..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TemplateProjectMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.mapper.inspect; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hnac.hzinfo.inspect.obj.entity.TemplateProjectEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author ysj - */ -@Mapper -public interface TemplateProjectMapper extends BaseMapper{ - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BusinessScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BusinessScheduledTask.java deleted file mode 100644 index f908b36..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BusinessScheduledTask.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.hnac.hzims.scheduled.scheduled; - -import com.hnac.hzims.scheduled.service.inspect.TaskService; -import com.hnac.hzims.scheduled.service.operation.business.MaintenanceService; -import com.xxl.job.core.biz.model.ReturnT; -import com.xxl.job.core.handler.annotation.XxlJob; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.tool.utils.Func; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import java.util.Date; -import static com.hnac.hzinfo.inspect.task.TaskContants.*; - - -/** - * 业务模块定时任务 - * @author ysj - */ -@Slf4j -@Component -public class BusinessScheduledTask { - - @Autowired - private TaskService service; - - private MaintenanceService maintenanceService; - - /** - * 巡检任务派发 : 一分钟执行一次 - */ - @XxlJob(INSPECT_TASK_DISTRIBUTE) - //@Scheduled(cron = "0/40 * * * * ? ") - public ReturnT inspectTaskDistribute(String param) { - if (Func.isBlank(param)) { - param = DateUtil.format(new Date(), "yyyy-MM"); - } - service.inspectTaskDistribute(param); - return new ReturnT<>("SUCCESS"); - } - - /** - * 巡检任务派发 : 一天执行一次 凌晨0时执行 - */ - @XxlJob(MAINTENANCE_TASK_DISTRIBUTE) - //@Scheduled(cron = "0/40 * * * * ? ") - public ReturnT maintenanceTaskDistribute(String param) { - if (Func.isBlank(param)) { - param = DateUtil.format(new Date(), "yyyy-MM"); - } - maintenanceService.maintenanceTaskDistribute(param); - return new ReturnT<>("SUCCESS"); - } - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ContentService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ContentService.java deleted file mode 100644 index f1f04cf..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ContentService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.obj.entity.ContentEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface ContentService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ObjectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ObjectService.java deleted file mode 100644 index 7512337..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ObjectService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.obj.entity.ObjectEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface ObjectService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ObjectUserService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ObjectUserService.java deleted file mode 100644 index 2963621..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ObjectUserService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.obj.entity.ObjectUserEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface ObjectUserService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanObjectTemplateService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanObjectTemplateService.java deleted file mode 100644 index 9c7314f..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanObjectTemplateService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.plan.entity.PlanObjectTemplateEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface PlanObjectTemplateService extends BaseService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanOrgService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanOrgService.java deleted file mode 100644 index 3372f82..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanOrgService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.plan.entity.PlanOrgEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface PlanOrgService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanPositionService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanPositionService.java deleted file mode 100644 index 334cfc6..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanPositionService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.plan.entity.PlanPositionEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface PlanPositionService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanService.java deleted file mode 100644 index ac2b6aa..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.plan.entity.PlanEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface PlanService extends BaseService { - - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanUserService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanUserService.java deleted file mode 100644 index 7634f14..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanUserService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.plan.entity.PlanUserEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * 巡检计划用户模板服务类 - * - * @author Chill - */ -public interface PlanUserService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ProjectContentService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ProjectContentService.java deleted file mode 100644 index 82cd962..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ProjectContentService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - - -import com.hnac.hzinfo.inspect.obj.entity.ProjectContentEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface ProjectContentService extends BaseService{ - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ProjectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ProjectService.java deleted file mode 100644 index ef2a474..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ProjectService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - - -import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface ProjectService extends BaseService{ - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectProjectContentService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectProjectContentService.java deleted file mode 100644 index 0db0ebb..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectProjectContentService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectContentEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface TaskObjectProjectContentService extends BaseService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectProjectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectProjectService.java deleted file mode 100644 index 400d84b..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectProjectService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface TaskObjectProjectService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectService.java deleted file mode 100644 index fb033a0..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface TaskObjectService extends BaseService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskRemindManager.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskRemindManager.java deleted file mode 100644 index 5ef3415..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskRemindManager.java +++ /dev/null @@ -1,295 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hnac.hzinfo.core.push.enums.PushAudienceType; -import com.hnac.hzinfo.core.push.model.PushAudience; -import com.hnac.hzinfo.core.push.model.PushInfo; -import com.hnac.hzinfo.core.push.model.PushPlatform; -import com.hnac.hzinfo.inspect.task.TaskContants; -import com.hnac.hzinfo.inspect.task.entity.TaskEntity; -import com.xxl.job.core.log.XxlJobLogger; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.sms.model.SmsResponse; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.CollectionUtil; -import org.springblade.core.tool.utils.Func; -import org.springblade.resource.feign.IPushClient; -import org.springblade.resource.feign.ISmsClient; -import org.springblade.resource.vo.PushInfoVO; -import org.springblade.system.user.cache.UserCache; -import org.springblade.system.user.entity.User; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.data.redis.core.DefaultTypedTuple; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Component; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.time.format.DateTimeFormatter; -import java.util.*; -import java.util.concurrent.*; -import java.util.stream.Collectors; - -/** - * 巡检任务通知、短信提醒管理器 - * 提醒列表使用redis缓存 - * - * @author py - */ -@Slf4j -@Component -public class TaskRemindManager { - - /** - * 巡检任务开始前发送短信信息阿里云模板 - **/ - @Value("${hzims.inspect.task.templateCode.taskBegin}") - private String taskBeginTemplateCode; - - /** - * 巡检任务结束前发送短信信息阿里云模板 - **/ - @Value("${hzims.inspect.task.templateCode.taskEnd}") - private String taskEndTemplateCode; - - /** - * 巡检消息推送模板 - 极光 - **/ - @Value("${hzims.inspect.task.jgPushCode}") - private String jgPushCode; - - @Autowired - private TaskService taskService; - @Autowired - private RedisTemplate redisTemplate; - @Autowired - private ISmsClient smsClient; - @Autowired - private IPushClient pushClient; - - - /** - * 开始前提醒任务列表 - */ - final static String REMIND_TASK_BEGIN_LIST = "hzinfo:remind:begin:tasks"; - /** - * 结束前提醒任务列表 - */ - final static String REMIND_TASK_END_LIST = "hzinfo:remind:end:tasks"; - - /** - * 开始 - * 重置redis开始提醒缓存列表 - * 按照时间排序 ： 正序 - */ - public void replaceBeginTaskCacheList(List taskBegin){ - //先删除 - redisTemplate.opsForZSet().removeRange(REMIND_TASK_BEGIN_LIST,0, -1); - setTaskBeginList(taskBegin); - } - - /** - * 结束 - * 重置redis结束提醒缓存列表 - * 按照时间排序 ： 正序 - */ - public void replaceEndTaskCacheList(List taskEnd){ - //先删除 - redisTemplate.opsForZSet().removeRange(REMIND_TASK_END_LIST,0, -1); - setTaskEndList(taskEnd); - } - - /** - * 开始 - * 任务批量加入redis提醒缓存列表中 - * - */ - public void setTaskBeginList(List tasks){ - HashSet set = new HashSet(); - - for (TaskEntity task : tasks) { - DefaultTypedTuple tuple = new DefaultTypedTuple<>(task, (double) task.getStartRemindTime().toEpochSecond(ZoneOffset.of("+8"))); - set.add(tuple); - } - if(Func.isNotEmpty(set)){ - redisTemplate.opsForZSet().add(REMIND_TASK_BEGIN_LIST, set); - } - } - - /** - * 结束 - * 任务批量加入redis提醒缓存列表中 - */ - public void setTaskEndList(List tasks){ - HashSet set = new HashSet(); - for (TaskEntity task : tasks) { - DefaultTypedTuple tuple = new DefaultTypedTuple<>(task, (double) task.getEndRemindTime().toEpochSecond(ZoneOffset.of("+8"))); - set.add(tuple); - } - if(Func.isNotEmpty(set)){ - redisTemplate.opsForZSet().add(REMIND_TASK_END_LIST, set); - } - } - - - /** - * 把任务加入redis提醒缓存列表中 - * 加入的时候 按照时间排序 ： 正序 - */ - public void addTaskToCacheList(TaskEntity task){ - DateTimeFormatter dfShort = DateTimeFormatter.ofPattern("yyyy-MM-dd "); - DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - - redisTemplate.expire(REMIND_TASK_BEGIN_LIST,365,TimeUnit.DAYS); - if(task.getStartRemindTime().isAfter(LocalDateTime.parse(dfShort.format(LocalDate.now()) + "00:00:00", df))){ - redisTemplate.opsForZSet().add(REMIND_TASK_BEGIN_LIST, task, task.getStartRemindTime().toEpochSecond(ZoneOffset.of("+8"))); - log.info("--------------- key = hzinfo:remind:begin:tasks ---- size = " + redisTemplate.opsForZSet().size(REMIND_TASK_BEGIN_LIST)); - } - - if(task.getEndRemindTime().isAfter(LocalDateTime.parse(dfShort.format(LocalDate.now()) + "00:00:00", df))){ - redisTemplate.opsForZSet().add(REMIND_TASK_END_LIST, task, task.getEndRemindTime().toEpochSecond(ZoneOffset.of("+8"))); - log.info("--------------- key = hzinfo:remind:end:tasks ---- size = " + redisTemplate.opsForZSet().size(REMIND_TASK_END_LIST)); - } - } - - /** - * 任务开始前 - */ - static final int BEGIN_SEND_FLAG = 1; - /** - * 任务结束前 - */ - static final int END_SEND_FLAG = 2; - - /** - * 任务开始、结束前提醒 - */ - public void taskRemind(){ - sendMsg(BEGIN_SEND_FLAG); - sendMsg(END_SEND_FLAG); - } - - /** - * 任务开始、结束前提醒 - */ - public void cleanCache(){ - long currentTime = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")); - String key = REMIND_TASK_BEGIN_LIST; - for (int i = 0; i < 2; i++) { - if(i == 1 ){ - key = REMIND_TASK_END_LIST; - } - Set tasks = redisTemplate.opsForZSet().rangeByScore(key,0, currentTime); - if(Func.isNotEmpty(tasks)){ - for (TaskEntity task : tasks) { - //用户id为空，删除数据 - redisTemplate.opsForZSet().remove(key, task); - } - } - log.info(key + " 清空cache后 ---- size = " + redisTemplate.opsForZSet().size(key)); - } - - } - - /** - * 任务开始/结束前 - * 推送消息、发送短信 - * @param sendFlag 发送标识：任务开始前提醒 1；任务结束前提醒 2； - */ - private void sendMsg(int sendFlag){ - //redis key; 消息推送标题; 短信模板code - String key = "", title = "", templateCode = ""; - - switch (sendFlag){ - case BEGIN_SEND_FLAG: - key = REMIND_TASK_BEGIN_LIST; - title = "任务开始前提醒"; - templateCode = taskBeginTemplateCode; - break; - case END_SEND_FLAG: - key = REMIND_TASK_END_LIST; - title = "任务结束前提醒"; - templateCode = taskEndTemplateCode; - break; - default: - break; - } - - DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - long currentTime = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")); - Set tasks = redisTemplate.opsForZSet().rangeByScore(key,0, currentTime); - if(Func.isNotEmpty(tasks)){ - //若该任务已完成 则无需再进行短信推送 - List taskIds = tasks.stream().map(TaskEntity::getId).collect(Collectors.toList()); - List undoneTaskList = taskService.list(Wrappers.lambdaQuery() - .ne(TaskEntity::getStatus, TaskContants.TaskStatusEnum.FINISH_STATUS.getStatus()) - .in(TaskEntity::getId, taskIds) - ); - if(CollectionUtil.isEmpty(undoneTaskList)) { - XxlJobLogger.log("巡检短信通知列表为空；redis内取出数据为：" + JSON.toJSONString(taskIds)); - return; - } - List undoneTaskIds = undoneTaskList.stream().map(TaskEntity::getId).collect(Collectors.toList()); - for (TaskEntity task : tasks) { - if(!undoneTaskIds.contains(task.getId())) { - XxlJobLogger.log(task.getId()+"巡检任务已完成，无需推送短信"); - return; - } - XxlJobLogger.log(task.getId()+"开始推送消息！"); - // 移动端消息推送 : 使用 用户id做TAG，前端注册用户id为TAG - PushInfoVO pushInfoVO = new PushInfoVO(); - pushInfoVO.setTenantId(task.getTenantId()); - PushPlatform platform = PushPlatform.all(); - Map> audienceMap = new HashMap<>(); - audienceMap.put(PushAudienceType.TAG, Collections.singletonList(task.getUserId().toString())); - PushAudience audience = new PushAudience(false, audienceMap); - PushInfo pushInfo = new PushInfo(jgPushCode - , title - , "任务“"+ task.getPlanName() + "”的计划执行时间是：" + df.format(task.getPlanStartTime())+ " —— " + df.format(task.getPlanEndTime()) - , "" - , null - , platform - , audience); - pushInfoVO.setPushInfo(pushInfo); - - Map smsMap = new HashMap<>(3); - smsMap.put("one", task.getPlanName()); - if(sendFlag == BEGIN_SEND_FLAG){ - smsMap.put("two", df.format(task.getPlanStartTime())); - } else if(sendFlag == END_SEND_FLAG){ - smsMap.put("two", df.format(task.getPlanEndTime())); - } //smsMap.put("three", df.format(task.getPlanEndTime())); - - - String jsonParam = JSON.toJSONString(smsMap); - - User user = UserCache.getUser(task.getUserId()); - String userPhone = Func.isNotEmpty(user) ? user.getPhone() : null; - log.info("------------ 发送短信 用户手机号 = " + userPhone); - - String finalTemplateCode = templateCode; - XxlJobLogger.log(task.getId()+"开始推送短信！"); - ThreadFactory threadFactory = Executors.defaultThreadFactory(); - ThreadPoolExecutor pool = new ThreadPoolExecutor(5, 5, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingDeque(), threadFactory); - pool.execute(() -> { - if(Func.isNotEmpty(userPhone)){ - // 发送短信 - R success = smsClient.sendMessage(task.getTenantId(), finalTemplateCode, jsonParam, userPhone); - log.info("msg -- 用户手机号：" + userPhone + " ; 短信内容：" + jsonParam + " ; TenantId：" + task.getTenantId() + " ; finalTemplateCode：" + finalTemplateCode + "；返回信息 = " + (Func.isNotEmpty(success)?success.toString(): "返回为空")); - } - //推送消息给移动端 - pushClient.tenantPush(pushInfoVO); - log.info("msg -- 推送信息完成" ); - }); - - //把已发送的数据移除 - // redisTemplate.opsForZSet().remove(key, task); - log.info("已推送、发送短信后 --------------- key = " + key + " ---- size = " + redisTemplate.opsForZSet().size(key)); - } - } - } - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskResultService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskResultService.java deleted file mode 100644 index 960f773..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskResultService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.task.entity.TaskResultEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface TaskResultService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java index 4e3aa2b..6d25531 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java @@ -11,7 +11,5 @@ import java.util.List; */ public interface TaskService extends BaseService { - void inspectTaskDistribute(String param); - DutyInspectTaskVO task(String start, String end, List areas); } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskUserService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskUserService.java deleted file mode 100644 index 558a4c6..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskUserService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.task.entity.TaskUserEntity; -import org.springblade.core.mp.base.BaseService; - -import java.util.List; - -/** - * @author ysj - */ -public interface TaskUserService extends BaseService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskVideoManager.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskVideoManager.java deleted file mode 100644 index bb53251..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskVideoManager.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.ai.vo.VideoReturnDTO; -import com.hnac.hzinfo.inspect.plan.PlanContants; -import com.hnac.hzinfo.inspect.task.entity.TaskEntity; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - - -/** - * 视频巡检任务 - * 提醒列表使用redis缓存 - * @Author: py - */ -@Component -public class TaskVideoManager { - - /** - * 视频巡检任务列表 - */ - final static String VIDEO_TASK_LIST = "hzinfo:video:tasks"; - - /** - * 视频巡检 AI识别结果列表 - */ - final static String VIDEO_TASK_AI_RESULT= "hzinfo:video:ai:results"; - - @Autowired - private RedisTemplate redisTemplate; - - /** - * 把AI识别结果加入redis缓存中 - */ - public void addAiResultToMap(VideoReturnDTO returnDTO){ - redisTemplate.opsForHash().put(VIDEO_TASK_AI_RESULT, returnDTO.getVideo(), returnDTO); - } - - /** - * 从redis缓存中取出AI识别结果 - */ - public VideoReturnDTO getAiResultFromMap(String video){ - if(redisTemplate.opsForHash().hasKey(VIDEO_TASK_AI_RESULT, video)){ - return (VideoReturnDTO)redisTemplate.opsForHash().get(VIDEO_TASK_AI_RESULT, video); - } - return null; - } - - - - /** - * 把任务加入redis提醒缓存列表中 - */ - public void addTaskToVideoCacheList(TaskEntity task){ - if(task.getAutoVideo().equals(PlanContants.InspectTypeEnum.VIDEO.getVal())){ - redisTemplate.opsForHash().put(VIDEO_TASK_LIST, task.getId(), task); - } - } - - - /** - * 把任务加入redis提醒缓存列表中 - */ - public void deleteTaskFromCacheList(TaskEntity task){ - redisTemplate.opsForHash().delete(VIDEO_TASK_LIST, task.getId()); - } - - - /** - * - */ - public void deleteTaskFromCacheList(String taskId){ - redisTemplate.opsForHash().delete(VIDEO_TASK_LIST, taskId); - } - - /** - * 从缓存中取出当前时间加一分钟之前的所有数据 - */ - public List getTasksFromCacheList(){ - List tasks = new ArrayList<>(); - HashMap map = (HashMap) redisTemplate.opsForHash().entries(VIDEO_TASK_LIST); - map.forEach((id, task) ->{ - if(task.getPlanStartTime().isBefore(LocalDateTime.now().plusMinutes(1L))){ - tasks.add(task); - deleteTaskFromCacheList(id); - } - }); - return tasks; - } - - - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TemplateProjectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TemplateProjectService.java deleted file mode 100644 index d67b8df..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TemplateProjectService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - - -import com.hnac.hzinfo.inspect.obj.entity.TemplateProjectEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface TemplateProjectService extends BaseService{ - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TemplateService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TemplateService.java deleted file mode 100644 index f0e8005..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TemplateService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect; - -import com.hnac.hzinfo.inspect.obj.entity.TemplateEntity; -import org.springblade.core.mp.base.BaseService; - -/** - * @author ysj - */ -public interface TemplateService extends BaseService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ContentServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ContentServiceImpl.java deleted file mode 100644 index b182d6e..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ContentServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.ContentMapper; -import com.hnac.hzims.scheduled.service.inspect.ContentService; -import com.hnac.hzinfo.inspect.obj.entity.ContentEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class ContentServiceImpl extends BaseServiceImpl implements ContentService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectServiceImpl.java deleted file mode 100644 index 4aa787a..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.ObjectMapper; -import com.hnac.hzims.scheduled.service.inspect.ObjectService; -import com.hnac.hzinfo.inspect.obj.entity.ObjectEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - - -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class ObjectServiceImpl extends BaseServiceImpl implements ObjectService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectUserServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectUserServiceImpl.java deleted file mode 100644 index 8f09fa0..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectUserServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.ObjectUserMapper; -import com.hnac.hzims.scheduled.service.inspect.ObjectUserService; -import com.hnac.hzinfo.inspect.obj.entity.ObjectUserEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class ObjectUserServiceImpl extends BaseServiceImpl implements ObjectUserService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanObjectTemplateServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanObjectTemplateServiceImpl.java deleted file mode 100644 index 4e63cdc..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanObjectTemplateServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.PlanObjectTemplateMapper; -import com.hnac.hzims.scheduled.service.inspect.PlanObjectTemplateService; -import com.hnac.hzinfo.inspect.plan.entity.PlanObjectTemplateEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class PlanObjectTemplateServiceImpl extends BaseServiceImpl implements PlanObjectTemplateService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanOrgServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanOrgServiceImpl.java deleted file mode 100644 index 4606dad..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanOrgServiceImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.hnac.hzims.scheduled.mapper.inspect.PlanOrgMapper; -import com.hnac.hzims.scheduled.service.inspect.PlanOrgService; -import com.hnac.hzinfo.inspect.plan.entity.PlanOrgEntity; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -public class PlanOrgServiceImpl extends BaseServiceImpl implements PlanOrgService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanPositionServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanPositionServiceImpl.java deleted file mode 100644 index 2cff9b7..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanPositionServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.PlanPositionMapper; -import com.hnac.hzims.scheduled.service.inspect.PlanPositionService; -import com.hnac.hzinfo.inspect.plan.entity.PlanPositionEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class PlanPositionServiceImpl extends BaseServiceImpl implements PlanPositionService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanServiceImpl.java deleted file mode 100644 index 4ac6701..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.PlanMapper; -import com.hnac.hzims.scheduled.service.inspect.PlanService; -import com.hnac.hzinfo.inspect.plan.entity.PlanEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class PlanServiceImpl extends BaseServiceImpl implements PlanService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanUserServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanUserServiceImpl.java deleted file mode 100644 index 6364750..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanUserServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.PlanUserMapper; -import com.hnac.hzims.scheduled.service.inspect.PlanUserService; -import com.hnac.hzinfo.inspect.plan.entity.PlanUserEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class PlanUserServiceImpl extends BaseServiceImpl implements PlanUserService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectContentServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectContentServiceImpl.java deleted file mode 100644 index d71a052..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectContentServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.ProjectContentMapper; -import com.hnac.hzims.scheduled.service.inspect.ProjectContentService; -import com.hnac.hzinfo.inspect.obj.entity.ProjectContentEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class ProjectContentServiceImpl extends BaseServiceImpl implements ProjectContentService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectServiceImpl.java deleted file mode 100644 index 6da2ded..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.ProjectMapper; -import com.hnac.hzims.scheduled.service.inspect.ProjectService; -import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class ProjectServiceImpl extends BaseServiceImpl implements ProjectService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectContentServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectContentServiceImpl.java deleted file mode 100644 index f9eb13a..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectContentServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.TaskObjectProjectContentMapper; -import com.hnac.hzims.scheduled.service.inspect.TaskObjectProjectContentService; -import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectContentEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class TaskObjectProjectContentServiceImpl extends BaseServiceImpl implements TaskObjectProjectContentService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectServiceImpl.java deleted file mode 100644 index 7eeaf59..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.TaskObjectProjectMapper; -import com.hnac.hzims.scheduled.service.inspect.TaskObjectProjectService; -import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class TaskObjectProjectServiceImpl extends BaseServiceImpl implements TaskObjectProjectService { - -} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectServiceImpl.java deleted file mode 100644 index 6fdb9b1..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.TaskObjectMapper; -import com.hnac.hzims.scheduled.service.inspect.TaskObjectService; -import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class TaskObjectServiceImpl extends BaseServiceImpl implements TaskObjectService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskResultServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskResultServiceImpl.java deleted file mode 100644 index 11f66c0..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskResultServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.TaskResultMapper; -import com.hnac.hzims.scheduled.service.inspect.TaskResultService; -import com.hnac.hzinfo.inspect.task.entity.TaskResultEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class TaskResultServiceImpl extends BaseServiceImpl implements TaskResultService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java index 0aea939..a0f0c99 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java @@ -1,45 +1,17 @@ package com.hnac.hzims.scheduled.service.inspect.impl; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.google.common.collect.Lists; -import com.hnac.hzims.operational.duty.vo.ImsDutyMainFeignVO; import com.hnac.hzims.scheduled.mapper.inspect.TaskMapper; -import com.hnac.hzims.scheduled.service.inspect.*; -import com.hnac.hzims.scheduled.service.operation.business.DutyMainService; -import com.hnac.hzinfo.inspect.obj.entity.*; -import com.hnac.hzinfo.inspect.plan.PlanContants; -import com.hnac.hzinfo.inspect.plan.entity.*; -import com.hnac.hzinfo.inspect.task.TaskContants; -import com.hnac.hzinfo.inspect.task.entity.*; +import com.hnac.hzims.scheduled.service.inspect.TaskService; +import com.hnac.hzinfo.inspect.task.entity.TaskEntity; import com.hnac.hzinfo.inspect.task.vo.DutyInspectTaskVO; -import com.xxl.job.core.log.XxlJobLogger; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.CollectionUtil; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.tool.utils.Func; -import org.springblade.core.tool.utils.ObjectUtil; -import org.springblade.system.user.entity.User; -import org.springblade.system.user.feign.IUserClient; import org.springframework.stereotype.Service; -import java.time.DayOfWeek; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.time.temporal.WeekFields; -import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; @@ -52,687 +24,6 @@ import java.util.stream.Collectors; @DS("inspect") public class TaskServiceImpl extends BaseServiceImpl implements TaskService { - private final PlanService planService; - - private final ObjectService objectService; - - private final PlanOrgService planOrgService; - - private final ContentService contentService; - - private final ProjectService projectService; - - private final TemplateService templateService; - - private final DutyMainService dutyMainService; - - private final PlanUserService planUserService; - - private final TaskUserService taskUserService; - - private final ObjectUserService objectUserService; - - private final TaskResultService taskResultService; - - private final TaskObjectService taskObjectService; - - private final PlanPositionService planPostionService; - - private final ProjectContentService projectContentService; - - private final TemplateProjectService templateProjectService; - - private final TaskObjectProjectService taskObjectProjectService; - - private final PlanObjectTemplateService planObjectTemplateService; - - private final TaskObjectProjectContentService taskObjectProjectContentService; - - private final TaskVideoManager taskVideoManager; - - private final TaskRemindManager remindCacheManager; - - private final IUserClient userClient; - - /** - * 巡检任务派发 - * @param param - */ - @Override - public void inspectTaskDistribute(String param) { - // 清理无效任务 - this.close(); - - // 派发任务状态前置修改 - this.status(); - - // 遍历派发任务 - this.distribute(); - } - - - /** - * 清理无效任务 - */ - private void close() { - // 关闭超过计划结束时间 、已审核 、派发中的巡检计划 - UpdateWrapper plan = new UpdateWrapper<>(); - plan.lambda().set(PlanEntity::getStatus, Integer.valueOf(PlanContants.PlanStatusEnum.FINISH_STATUS.getStatus())) - .in(PlanEntity::getStatus, Integer.valueOf(PlanContants.PlanStatusEnum.PAUSE_STATUS.getStatus()), Integer.valueOf(PlanContants.PlanStatusEnum.CHECK_STATUS.getStatus()), Integer.valueOf(PlanContants.PlanStatusEnum.UNDERWAY_STATUS.getStatus())) - .lt(PlanEntity::getEndTime, LocalDate.now()); - this.planService.update(plan); - //关闭超过计划结束时间的巡检任务 - UpdateWrapper task = new UpdateWrapper<>(); - task.lambda().set(TaskEntity::getStatus, Integer.valueOf(TaskContants.TaskStatusEnum.UNFINISH_STATUS.getStatus())) - .ne(TaskEntity::getStatus, Integer.valueOf(TaskContants.TaskStatusEnum.FINISH_STATUS.getStatus())) - .lt(TaskEntity::getPlanEndTime, LocalDate.now()); - this.update(task); - } - - /** - * 派发状态前置 : 已审核计划 且 已过计划开始时间 - */ - private void status() { - UpdateWrapper plan = new UpdateWrapper<>(); - plan.lambda().set(PlanEntity::getStatus, Integer.valueOf(PlanContants.PlanStatusEnum.UNDERWAY_STATUS.getStatus())) - .eq(PlanEntity::getStatus, Integer.valueOf(PlanContants.PlanStatusEnum.CHECK_STATUS.getStatus())) - .le(PlanEntity::getStartTime, LocalDate.now()); - this.planService.update(plan); - } - - /** - * 派发任务 - */ - private void distribute() { - // 查询需要派发任务列表 - List plans = planService.list(Wrappers.lambdaQuery() - .eq(PlanEntity::getStatus,Integer.valueOf(PlanContants.PlanStatusEnum.UNDERWAY_STATUS.getStatus()))); - if(CollectionUtil.isEmpty(plans)){ - return; - } - plans.forEach(plan->{ - if(PlanContants.PlanCycleEnum.NEVER_CYCLE.getCycle().equals(plan.getCycle())){//计划周期每次，只需要派发一次任务 - plan.setStatus(Integer.valueOf(PlanContants.PlanStatusEnum.FINISH_STATUS.getStatus())); - this.planService.updateById(plan); - } - if(PlanContants.PlanMethodEnum.SEIZE.getMethod().equals(plan.getMethod())){ - // 抢占模式 - this.seize(plan); - }else if(PlanContants.PlanMethodEnum.CONCURRENT.getMethod().equals(plan.getMethod())){ - // 并发模式 - this.concurrent(plan); - } - }); - } - - - /** - * 抢占模式 - * @param plan - */ - private void seize(PlanEntity plan) { - // 计划班次模式 - if("4".equals(plan.getType())){ - this.seizeClass(plan); - } - // 其他模式 - this.seizeOther(plan); - } - - /** - * 并发模式 - * @param plan - */ - private void concurrent(PlanEntity plan) { - // 计划班次模式 - if("4".equals(plan.getType())){ - this.concurrentClass(plan); - } - // 其他模式 - this.concurrentOther(plan); - } - - /** - * 抢占-班次模式 - * @param plan - */ - private void seizeClass(PlanEntity plan) { - List taskUserList = Lists.newArrayList(); - - if(Func.isEmpty(plan.getExecTimeJson())){ - XxlJobLogger.log("seizeClass_巡检计划未设置值班班次: plan = " + plan); - return; - } - JSONArray array = JSONArray.parseArray(plan.getExecTimeJson()); - for (int index = 0; index < plan.getTaskTimesADay(); index++) { - // 取巡检任务执行开始、结束时间、是否下一天 - JSONObject time = array.getJSONObject(index); - plan.setExecStartTime(time.get("execStartTime").toString()); - plan.setExecEndTime(time.get("execEndTime").toString()); - if(time.containsKey("isNextDay")){ - plan.setIsNextDay(time.getBoolean("isNextDay")); - } - // 保存巡检任务 - TaskEntity task = this.saveTask(plan,1); - if(ObjectUtil.isEmpty(task) || !time.containsKey("classId")){ - XxlJobLogger.log("seizeClass_任务执行时间json数据不包含classId"); - continue; - } - // 查询值班数据 - ImsDutyMainFeignVO main = dutyMainService.mainPerson(time.getLong("classId"), DateUtil.format(LocalDate.now(),DateUtil.PATTERN_DATE)); - if(ObjectUtil.isNotEmpty(main) && CollectionUtil.isNotEmpty(main.getPersons())){ - plan.setDutyId(main.getMainId()); - main.getPersons().forEach(persons->{ - // 任务用户关联记录 - TaskUserEntity taskUser = TaskUserEntity.builder().taskId(task.getId()).userId(persons).claimStatus(TaskContants.ClaimStatusEnum.UN_COLLECT.getStatus()).build(); - taskUser.setTenantId(plan.getTenantId()); - taskUserList.add(taskUser); - //添加到提醒cache - task.setUserId(persons); - remindCacheManager.addTaskToCacheList(task); - taskVideoManager.addTaskToVideoCacheList(task); - }); - } - String reason = this.saveTaskObject(plan,task); - if(reason.equals(StringUtils.EMPTY)){ - LocalDateTime now = LocalDateTime.now(); - reason = plan.getName() + now.getYear() + "年" + now.getMonthValue() + "月" + now.getDayOfMonth() + "日的任务派发成功"; - } - XxlJobLogger.log(reason); - TaskResultEntity taskResultEntity = TaskResultEntity.builder().planId(task.getPlanId()).batchNumber(task.getBatchNumber()).reason(reason).build(); - taskResultEntity.setTenantId(plan.getTenantId()); - taskResultService.save(taskResultEntity); - } - if(taskUserList.size()>0){ - taskUserService.saveBatch(taskUserList); - } - } - - - /** - * 抢占-其他模式 - * @param plan - */ - private void seizeOther(PlanEntity plan) { - List users = this.getUsersByPlan(plan); - List taskUserList = Lists.newArrayList(); - - JSONArray timeJsonArray = null; - if(Func.isNotEmpty(plan.getExecTimeJson())){ - timeJsonArray = JSON.parseArray(plan.getExecTimeJson()); - } - for (int j = 0; j < plan.getTaskTimesADay(); j++) { - if(Func.isNotEmpty(timeJsonArray)){ - JSONObject time = timeJsonArray.getJSONObject(j); - plan.setExecStartTime(time.get("execStartTime").toString()); - plan.setExecEndTime(time.get("execEndTime").toString()); - if(time.containsKey("isNextDay")){ - plan.setIsNextDay(time.getBoolean("isNextDay")); - } - } else { - plan.setExecStartTime("00:00:00"); - plan.setExecEndTime("23:59:59"); - } - TaskEntity task = this.saveTask(plan,1); - if(task==null){continue;} - for(PlanUserEntity user:users){ - TaskUserEntity taskUser = TaskUserEntity.builder().taskId(task.getId()).userId(user.getUserId()).claimStatus(TaskContants.ClaimStatusEnum.UN_COLLECT.getStatus()).build(); - taskUser.setTenantId(plan.getTenantId()); - taskUserList.add(taskUser); - //添加到提醒cache - task.setUserId(user.getUserId()); - remindCacheManager.addTaskToCacheList(task); - taskVideoManager.addTaskToVideoCacheList(task); - } - String reason = this.saveTaskObject(plan,task); - if(reason.equals(StringUtils.EMPTY)){ - LocalDateTime now = LocalDateTime.now(); - reason = plan.getName() + now.getYear() + "年" + now.getMonthValue() + "月" + now.getDayOfMonth() + "日的任务派发成功"; - } - XxlJobLogger.log(reason); - TaskResultEntity taskResultEntity = TaskResultEntity.builder().planId(task.getPlanId()).batchNumber(task.getBatchNumber()).reason(reason).build(); - taskResultEntity.setTenantId(plan.getTenantId()); - taskResultService.save(taskResultEntity); - } - - if(taskUserList.size()>0){ - taskUserService.saveBatch(taskUserList); - } else { - XxlJobLogger.log("没有用户: plan = " + plan); - XxlJobLogger.log("SeizeTaskService...没有任务用户: plan = " + plan); - } - } - - - /** - * 并发-班次模式 - * @param plan - */ - private void concurrentClass(PlanEntity plan) { - List taskUserList = Lists.newArrayList(); - - LocalDateTime now = LocalDateTime.now(); - String defaultReason = plan.getName() + now.getYear() + "年" + now.getMonthValue() + "月" + now.getDayOfMonth() + "日的任务派发成功"; - JSONArray timeJsonArray; - if (Func.isNotEmpty(plan.getExecTimeJson())) { - timeJsonArray = JSON.parseArray(plan.getExecTimeJson()); - } else { - XxlJobLogger.log("巡检计划未设置值班班次: plan = " + plan); - return; - } - for (int j = 0; j < plan.getTaskTimesADay(); j++) { - JSONObject time = timeJsonArray.getJSONObject(j); - plan.setExecStartTime(time.get("execStartTime").toString()); - plan.setExecEndTime(time.get("execEndTime").toString()); - if (time.containsKey("isNextDay")) { - plan.setIsNextDay(time.getBoolean("isNextDay")); - } - - //获取值班用户 - if (time.containsKey("classId")) { - Long classId = time.getLong("classId"); - DateTimeFormatter dfShort = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - ImsDutyMainFeignVO mainPerson = dutyMainService.mainPerson(classId, dfShort.format(LocalDate.now())); - List ids = mainPerson.getPersons(); - plan.setDutyId(mainPerson.getMainId()); - if (Func.isNotEmpty(ids)) { - for (Long id : ids) { - TaskEntity task = saveTask(plan, ids.size()); - if (task == null) { - continue; - } - TaskUserEntity taskUser = TaskUserEntity.builder().taskId(task.getId()).userId(id).claimStatus(TaskContants.ClaimStatusEnum.UN_COLLECT.getStatus()).build(); - taskUser.setTenantId(plan.getTenantId()); - taskUserList.add(taskUser); - String reason = saveTaskObject(plan, task); - if (reason.equals(StringUtils.EMPTY)) { - reason = defaultReason; - } - - XxlJobLogger.log(reason); - TaskResultEntity taskResultEntity = TaskResultEntity.builder().planId(task.getPlanId()).batchNumber(task.getBatchNumber()).reason(reason).build(); - taskResultEntity.setTenantId(plan.getTenantId()); - taskResultService.save(taskResultEntity); - - //添加到提醒cache - task.setUserId(id); - remindCacheManager.addTaskToCacheList(task); - taskVideoManager.addTaskToVideoCacheList(task); - } - } else { - XxlJobLogger.log("获取该班次值班人员为空, plan = " + plan); - return; - } - } else { - XxlJobLogger.log("巡检计划未设置值班班次, plan = " + plan); - return; - } - } - if (taskUserList.size() > 0) { - taskUserService.saveBatch(taskUserList); - } - } - - /** - * 并发其他模式 - * @param plan - */ - private void concurrentOther(PlanEntity plan) { - LocalDateTime now = LocalDateTime.now(); - String defaultReason = plan.getName() + now.getYear() + "年" + now.getMonthValue() + "月" + now.getDayOfMonth() + "日的任务派发成功"; - List users = this.getUsersByPlan(plan); - List taskUserList = Lists.newArrayList(); - - JSONArray timeJsonArray = null; - if (Func.isNotEmpty(plan.getExecTimeJson())) { - timeJsonArray = JSON.parseArray(plan.getExecTimeJson()); - } - for (PlanUserEntity user : users) { - for (int j = 0; j < plan.getTaskTimesADay(); j++) { - if (Func.isNotEmpty(timeJsonArray)) { - JSONObject time = timeJsonArray.getJSONObject(j); - plan.setExecStartTime(time.get("execStartTime").toString()); - plan.setExecEndTime(time.get("execEndTime").toString()); - if (time.containsKey("isNextDay")) { - plan.setIsNextDay(time.getBoolean("isNextDay")); - } - } else { - plan.setExecStartTime("00:00:00"); - plan.setExecEndTime("23:59:59"); - } - TaskEntity task = saveTask(plan, users.size()); - if (task == null) { - continue; - } - TaskUserEntity taskUser = TaskUserEntity.builder().taskId(task.getId()).userId(user.getId()).claimStatus(TaskContants.ClaimStatusEnum.UN_COLLECT.getStatus()).build(); - taskUser.setTenantId(plan.getTenantId()); - taskUserList.add(taskUser); - String reason = saveTaskObject(plan, task); - if (reason.equals(StringUtils.EMPTY)) { - reason = defaultReason; - } - XxlJobLogger.log(reason); - - TaskResultEntity taskResultEntity = TaskResultEntity.builder().planId(task.getPlanId()).batchNumber(task.getBatchNumber()).reason(reason).build(); - taskResultEntity.setTenantId(plan.getTenantId()); - taskResultService.save(taskResultEntity); - - //添加到提醒cache - task.setUserId(user.getUserId()); - remindCacheManager.addTaskToCacheList(task); - taskVideoManager.addTaskToVideoCacheList(task); - } - } - if (taskUserList.size() > 0) { - taskUserService.saveBatch(taskUserList); - } else { - log.error("ConcurrentTaskServcie...没有任务用户: plan = " + plan); - XxlJobLogger.log("ConcurrentTaskServcie...没有任务用户: plan = " + plan); - } - } - - /** - * 根据巡检计划返回与计划有关的所有用户 - * @param plan 巡检计划实例 - * @return 计划相关用户集合 - */ - public List getUsersByPlan(PlanEntity plan) { - List res = new LinkedList<>(); - if(PlanContants.PlanTypeEnum.USER_TYPE.getType().equals(plan.getType()) || PlanContants.PlanTypeEnum.FREE_TYPE.getType().equals(plan.getType())){ - QueryWrapper planUserQw = new QueryWrapper<>(); - planUserQw.lambda().eq(PlanUserEntity::getPlanId, plan.getId()); - res.addAll(planUserService.list(planUserQw)); - }else if(PlanContants.PlanTypeEnum.POSITION_TYPE.getType().equals(plan.getType())){ - QueryWrapper planPositionEntityQueryWrapper = new QueryWrapper<>(); - planPositionEntityQueryWrapper.lambda().eq(PlanPositionEntity::getPlanId, plan.getId()); - planPostionService.list(planPositionEntityQueryWrapper).forEach(entity->{ - //获取该机构下所有用户列表 - List users = new ArrayList<>(); - List positionUsers = userClient.userListByPosition(entity.getPositionId()).getData(); - if(CollectionUtil.isNotEmpty(positionUsers)){ - users = positionUsers.stream().filter(user->user.getCreateDept().toString().contains(entity.getCreateDept().toString())).collect(Collectors.toList()); - } - XxlJobLogger.log("岗位信息：" + entity + "; 获取到的user:{}",users.stream().map(User::getName).collect(Collectors.joining(","))); - for(User u:users){ - res.add(PlanUserEntity.builder().planId(plan.getId()).userId(u.getId()).build()); - } - }); - }else if(PlanContants.PlanTypeEnum.ORG_TYPE.getType().equals(plan.getType())){ - QueryWrapper planOrgEntityQueryWrapper = new QueryWrapper<>(); - planOrgEntityQueryWrapper.lambda().eq(PlanOrgEntity::getPlanId, plan.getId()); - planOrgService.list(planOrgEntityQueryWrapper).forEach(entity->{ - List users = userClient.userListByDeptId(entity.getOrgId()).getData(); - for(User u:users){ - res.add(PlanUserEntity.builder().planId(plan.getId()).userId(u.getId()).build()); - } - }); - }else if(PlanContants.PlanTypeEnum.CLASS_TYPE.getType().equals(plan.getType())){ - XxlJobLogger.log("巡检计划为班次时，有单独的处理流程，不应该跑到该分支下面来, plan = " + plan); - JSONArray timeJsonArray; - if(Func.isNotEmpty(plan.getExecTimeJson())){ - timeJsonArray = JSON.parseArray(plan.getExecTimeJson()); - } - else{ - throw new ServiceException("巡检计划未设置值班班次: plan = " + plan); - } - for(int i=0;i ids = mainPerson.getPersons(); - log.info("--计划为：{}；人员ID为：{}--",plan.getName(),ids.stream().map(String::valueOf).collect(Collectors.joining(","))); - plan.setDutyId(mainPerson.getMainId()); - if(Func.isNotEmpty(ids)){ - for (Long id : ids) { - res.add(PlanUserEntity.builder().planId(plan.getId()).userId(id).build()); - } - } else { - XxlJobLogger.log("获取该班次值班人员为空, plan = " + plan); - } - } - } - } - //设置租户 - return res.stream().distinct().peek(entity-> entity.setTenantId(plan.getTenantId())).collect(Collectors.toList()); - } - - /** - * 保存巡检任务 - * @param plan 巡检计划 - * @param totalTaskNum 任务数 : 抢占任务只生成一个 - * @return 巡检任务实例 - */ - public TaskEntity saveTask(PlanEntity plan,int totalTaskNum) { - totalTaskNum = plan.getTaskTimesADay() * totalTaskNum; - TaskEntity task = new TaskEntity(); - LocalDate now = LocalDate.now(); - DateTimeFormatter dfShort = DateTimeFormatter.ofPattern("yyyy-MM-dd "); - DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - - if(PlanContants.PlanCycleEnum.NEVER_CYCLE.getCycle().equals(plan.getCycle())) { - task.setBatchNumber(now.getYear()+ "_" +now.getMonthValue()+ "_" +now.getDayOfMonth() + "N"); - task.setPlanEndTime(LocalDateTime.parse(dfShort.format(plan.getEndTime())+plan.getExecEndTime(), df)); - }else if(PlanContants.PlanCycleEnum.EVERYDAY_CYCLE.getCycle().equals(plan.getCycle())) { - task.setBatchNumber(now.getYear()+ "_" +now.getMonthValue()+ "_" +now.getDayOfMonth()); - if(Func.isNotEmpty(plan.getIsNextDay()) && plan.getIsNextDay()){ - task.setPlanEndTime(LocalDateTime.parse(dfShort.format(now.plusDays(1L)) + plan.getExecEndTime(), df)); - } else { - task.setPlanEndTime(LocalDateTime.parse(dfShort.format(now) + plan.getExecEndTime(), df)); - } - }else if(PlanContants.PlanCycleEnum.EVERYWEEK_CYCLE.getCycle().equals(plan.getCycle())) { - WeekFields weekFields = WeekFields.of(DayOfWeek.MONDAY,1); - int weeks = now.get(weekFields.weekOfYear()); - task.setBatchNumber(now.getYear()+ "_" +now.getMonthValue() + "_" +weeks + "W"); - task.setPlanEndTime(LocalDateTime.parse(dfShort.format(now.plusWeeks(1)) + plan.getExecEndTime(), df)); - }else if(PlanContants.PlanCycleEnum.EVERYMONTH_CYCLE.getCycle().equals(plan.getCycle())) { - task.setBatchNumber(now.getYear()+ "_" +now.getMonthValue()); - task.setPlanEndTime(LocalDateTime.parse(dfShort.format(now.plusMonths(1))+plan.getExecEndTime(), df)); - }else if(PlanContants.PlanCycleEnum.EVERYQUARTER_CYCLE.getCycle().equals(plan.getCycle())) { - task.setBatchNumber(now.getYear()+ "_" +now.getMonthValue() + "Q"); - task.setPlanEndTime(LocalDateTime.parse(dfShort.format(now.plusMonths(3)) + plan.getExecEndTime(), df)); - }else if(PlanContants.PlanCycleEnum.EVERYYEAR_CYCLE.getCycle().equals(plan.getCycle())){ - task.setBatchNumber(String.valueOf(now.getYear())); - task.setPlanEndTime(LocalDateTime.parse(dfShort.format(now.plusYears(1))+plan.getExecEndTime(), df)); - } - if(PlanContants.PlanCycleEnum.NEVER_CYCLE.getCycle().equals(plan.getCycle())) { - task.setPlanStartTime(LocalDateTime.parse(dfShort.format(plan.getStartTime()) + plan.getExecStartTime(), df)); - } else { - task.setPlanStartTime(LocalDateTime.parse(dfShort.format(now) + plan.getExecStartTime(), df)); - } - task.setDutyId(plan.getDutyId()); - task.setPlanId(plan.getId()); - task.setPlanName(plan.getName()); - task.setType(plan.getType()); - task.setCycle(plan.getCycle()); - task.setStatus(Integer.valueOf(TaskContants.TaskStatusEnum.INIT_STATUS.getStatus())); - task.setTenantId(plan.getTenantId()); - task.setCreateUser(plan.getCreateUser()); - task.setCreateDept(plan.getCreateDept()); - task.setAutoVideo(plan.getAutoVideo()); - task.setMessageTemplateId(plan.getMessageTemplateId()); - task.setMethod(plan.getMethod()); - task.setEndRemindFlag(true); - task.setStartRemindFlag(true); - task.setStartRemindTime(task.getPlanStartTime().minusMinutes(plan.getStartRemind())); - task.setEndRemindTime(task.getPlanEndTime().minusMinutes(plan.getEndRemind())); - int taskCount = this.count(Wrappers.query().lambda().eq(TaskEntity::getPlanId,task.getPlanId()).eq(TaskEntity::getBatchNumber, task.getBatchNumber())); - XxlJobLogger.log("该计划已生成计划批次：{},数量：{}",task.getBatchNumber(),taskCount); - if(taskCount >= totalTaskNum){ - log.info("计划id={}本周期batchNumber={}的任务已生成",plan.getId(),task.getBatchNumber()); - return null; - } - this.save(task); - return task; - } - - /** - * 保存巡检对象数据 - * @param plan 巡检计划实例 - * @param task 巡检任务实例 - * @return - */ - public String saveTaskObject(PlanEntity plan, TaskEntity task) { - String result = StringUtils.EMPTY; - List taskObjectList = Lists.newArrayList(); - // 自由模式 - if(PlanContants.PlanTypeEnum.FREE_TYPE.getType().equals(plan.getType())){ - // 查询计划用户 - List planUsers = planUserService.list(Wrappers.query().lambda().eq(PlanUserEntity::getPlanId,plan.getId())); - if(CollectionUtil.isEmpty(planUsers)){ - return result; - } - for(PlanUserEntity planUser : planUsers){ - // 查询巡检对象用户 - List objectUsers= objectUserService.list(Wrappers.query().lambda().eq(ObjectUserEntity::getUserId,planUser.getUserId())); - if(CollectionUtil.isEmpty(objectUsers)){ - break; - } - for (ObjectUserEntity objectUser : objectUsers){ - List existEntity = taskObjectList.stream().filter(taskObjectEntity -> objectUser.getObjectId().equals(taskObjectEntity.getObjectId())).collect(Collectors.toList()); - if(ObjectUtil.isNotEmpty(existEntity)){ - break; - } - // 保存巡检对象 - result = saveTaskObject(taskObjectList,task,objectUser.getObjectId(),objectUser.getTemplateId()); - if(!result.equals(StringUtils.EMPTY)){ - break; - } - } - } - }else{ - List templates = planObjectTemplateService.list(Wrappers.query().lambda().eq(PlanObjectTemplateEntity::getPlanId,plan.getId())); - for (PlanObjectTemplateEntity template : templates) { - result = saveTaskObject(taskObjectList,task,template.getObjectId(),template.getTemplateId()); - if(!result.equals(StringUtils.EMPTY)){ - break; - } - } - } - if(taskObjectList.size()>0 && result.equals(StringUtils.EMPTY)){ - taskObjectService.saveBatch(taskObjectList); - } - return result; - } - - /** - * 保存巡检对象 - * @param taskObjectList - * @param task - * @param objectId - * @param templateId - * @return - */ - private String saveTaskObject(List taskObjectList,TaskEntity task,Long objectId,Long templateId){ - String result = StringUtils.EMPTY; - ObjectEntity io = objectService.getById(objectId); - if(io == null) { - return "巡检对象id="+objectId+"找不到记录"; - } - TemplateEntity templateInfo = templateService.getById(templateId); - if(templateInfo == null) { - return "巡检模板id="+templateId+"找不到记录"; - } - TaskObjectEntity ito = new TaskObjectEntity(); - ito.setTaskId(task.getId()); - ito.setObjectId(objectId); - ito.setCode(io.getCode()); - ito.setName(io.getName()); - ito.setAddress(io.getAddress()); - ito.setLttd(io.getLttd()); - ito.setLgtd(io.getLgtd()); - ito.setCreateUser(task.getCreateUser()); - ito.setCreateDept(task.getCreateDept()); - ito.setCreateTime(task.getCreateTime()); - ito.setDuplicateRecord(templateInfo.getDuplicateRecord()); - ito.setTenantId(task.getTenantId()); - ito.setStatus(TaskContants.StatusEnum.INIT_STATUS.getStatus()); - taskObjectList.add(ito); - List projects = templateProjectService.list(Wrappers.query().lambda().eq(TemplateProjectEntity::getTemplateId,templateId)); - for (TemplateProjectEntity project : projects) { - result = saveTaskObjectProject(task, objectId, project); - if(!result.equals(StringUtils.EMPTY)){ - break; - } - } - return result; - } - - /** - * 从巡检任务、巡检计划对象模板、巡检模板项目获取信息插入巡检任务项目表以及对应的历史数据表 - * @param objectId 巡检计划对象模板实例 - * @param project 巡检模板项目实例 - * @return - */ - private String saveTaskObjectProject(TaskEntity task, Long objectId, TemplateProjectEntity project) { - String result = StringUtils.EMPTY; - ProjectEntity ip = projectService.getById(project.getProjectId()); - if(ip == null) { - return "巡检项目id="+project.getProjectId()+"找不到记录"; - } - TaskObjectProjectEntity itop = new TaskObjectProjectEntity(); - itop.setObjectId(objectId); - itop.setProjectId(ip.getId()); - itop.setTaskId(task.getId()); - itop.setName(ip.getName()); - itop.setCode(ip.getCode()); - itop.setDescription(ip.getDescription()); - itop.setCreateTime(project.getCreateTime()); - itop.setTenantId(task.getTenantId()); - itop.setCreateUser(task.getCreateUser()); - itop.setCreateDept(task.getCreateDept()); - itop.setStatus(TaskContants.StatusEnum.INIT_STATUS.getStatus()); - taskObjectProjectService.save(itop); - List contents = projectContentService.list(Wrappers.query().lambda().eq(ProjectContentEntity::getProjectId,project.getProjectId())); - for (ProjectContentEntity content : contents) { - result = saveTaskObjectProjectContent(task, objectId, content); - if(!result.equals(StringUtils.EMPTY)){ - break; - } - } - return result; - } - - /** - * 从巡检任务、巡检计划对象模板、巡检项目内容获取信息插入巡检任务内容表以及对应的历史数据表 - * @param objectId 巡检计划对象模板实例 - * @param content 巡检项目内容实例 - * @return - */ - private String saveTaskObjectProjectContent(TaskEntity task, Long objectId, ProjectContentEntity content) { - ContentEntity ioc = contentService.getById(content.getContentId()); - if(ioc == null) {return "巡检内容id="+content.getContentId()+"找不到记录";} - TaskObjectProjectContentEntity itopc = new TaskObjectProjectContentEntity(); - itopc.setTaskId(task.getId()); - itopc.setObjectId(objectId); - itopc.setProjectId(content.getProjectId()); - itopc.setContentId(content.getContentId()); - itopc.setCode(ioc.getCode()); - itopc.setName(ioc.getName()); - itopc.setDescription(ioc.getDescription()); - itopc.setCheckType(ioc.getCheckType()); - itopc.setRecordType(ioc.getRecordType()); - itopc.setCreateTime(content.getCreateTime()); - itopc.setTenantId(task.getTenantId()); - itopc.setCreateUser(task.getCreateUser()); - itopc.setCreateDept(task.getCreateDept()); - itopc.setCheckTypeSon(ioc.getCheckTypeSon()); - itopc.setCameraAddr(ioc.getCameraAddr()); - itopc.setCameraId(ioc.getCameraId()); - itopc.setClockId(ioc.getClockId()); - itopc.setOtherParam(ioc.getOtherParam()); - itopc.setStatus(TaskContants.StatusEnum.INIT_STATUS.getStatus()); - itopc.setDictType(ioc.getDictType()); - taskObjectProjectContentService.save(itopc); - return StringUtils.EMPTY; - } - /** * 时间区间机构的巡检任务数据查询 * @param start @@ -758,13 +49,13 @@ public class TaskServiceImpl extends BaseServiceImpl imp task.setInspectTaskIds(tasks.stream().map(TaskEntity::getId).map(Object::toString).collect(Collectors.joining(","))); task.setInspectTaskSum(tasks.size()); // 所有处理完成巡检任务 - List finshList = tasks.stream().filter(o-> null != o.getStatus() && o.getStatus().equals(3)).collect(Collectors.toList()); + List finshList = tasks.stream().filter(o-> null != o.getStatus() && o.getStatus().equals(4)).collect(Collectors.toList()); if(CollectionUtil.isEmpty(finshList)){ return task; } task.setInspectTaskFinish(finshList.size()); // 未执行任务数 - List notExecuteList = tasks.stream().filter(o-> null != o.getStatus() && o.getStatus().equals(0)).collect(Collectors.toList()); + List notExecuteList = tasks.stream().filter(o-> !finshList.stream().map(TaskEntity::getId).collect(Collectors.toList()).contains(o.getId())).collect(Collectors.toList()); if(CollectionUtil.isEmpty(notExecuteList)){ return task; } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskUserServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskUserServiceImpl.java deleted file mode 100644 index baf26c8..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskUserServiceImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.TaskUserMapper; -import com.hnac.hzims.scheduled.service.inspect.TaskUserService; -import com.hnac.hzinfo.inspect.task.entity.TaskUserEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class TaskUserServiceImpl extends BaseServiceImpl implements TaskUserService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateProjectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateProjectServiceImpl.java deleted file mode 100644 index f970386..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateProjectServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.TemplateProjectMapper; -import com.hnac.hzims.scheduled.service.inspect.TemplateProjectService; -import com.hnac.hzinfo.inspect.obj.entity.TemplateProjectEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class TemplateProjectServiceImpl extends BaseServiceImpl implements TemplateProjectService { - -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateServiceImpl.java deleted file mode 100644 index f4b5b41..0000000 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hnac.hzims.scheduled.service.inspect.impl; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.hnac.hzims.scheduled.mapper.inspect.TemplateMapper; -import com.hnac.hzims.scheduled.service.inspect.TemplateService; -import com.hnac.hzinfo.inspect.obj.entity.TemplateEntity; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springframework.stereotype.Service; - -/** - * @author ysj - */ -@Service -@Slf4j -@AllArgsConstructor -@DS("inspect") -public class TemplateServiceImpl extends BaseServiceImpl implements TemplateService { -} \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DefectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DefectService.java index fd9ebce..73fbb5f 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DefectService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/DefectService.java @@ -11,5 +11,4 @@ import java.util.List; */ public interface DefectService extends BaseService { - SolveHomeVO solve_count(List deptIds, String start, String end); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenanceService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenanceService.java index 2e2de53..963d895 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenanceService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/MaintenanceService.java @@ -13,8 +13,6 @@ import java.util.List; */ public interface MaintenanceService extends BaseService { - void maintenanceTaskDistribute(String param); - Integer maintenanceCount(List areas); MaintainVo maintain(String start, String end, List areas); diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/PhenomenonService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/PhenomenonService.java index 26a354e..4cc1312 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/PhenomenonService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/PhenomenonService.java @@ -1,6 +1,7 @@ package com.hnac.hzims.scheduled.service.operation.business; import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; +import com.hnac.hzims.operational.defect.vo.SolveHomeVO; import com.hnac.hzims.operational.main.vo.ShortagesVo; import com.hnac.hzims.operational.report.vo.DutyDefectVO; import org.springblade.core.mp.base.BaseService; @@ -12,6 +13,8 @@ import java.util.List; */ public interface PhenomenonService extends BaseService { + SolveHomeVO solve_count(List deptIds, String start, String end); + DutyDefectVO defect(String start, String end, List areas); ShortagesVo defectMonth(String start, String end, List list); diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DefectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DefectServiceImpl.java index 1103e13..9efd2c3 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DefectServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/DefectServiceImpl.java @@ -26,28 +26,4 @@ import java.util.stream.Collectors; @AllArgsConstructor public class DefectServiceImpl extends BaseServiceImpl implements DefectService { - /** - * 消缺数量统计 - * @param deptIds - * @param start - * @param end - * @return - */ - @Override - public SolveHomeVO solve_count(List deptIds, String start, String end) { - SolveHomeVO solve = new SolveHomeVO(); - List defects = this.list(Wrappers.lambdaQuery() - .in(OperDefectEntity::getCreateDept,deptIds) - .gt(OperDefectEntity::getCreateTime,start) - .lt(OperDefectEntity::getCreateTime,end) - ); - if(cn.hutool.core.collection.CollectionUtil.isEmpty(defects)){ - solve.setDefectCount(0); - solve.setSolveCount(0); - }else{ - solve.setDefectCount(defects.size()); - solve.setSolveCount((int) defects.stream().filter(defect-> ObjectUtil.isNotEmpty(defect.getHandleTaskId())).count()); - } - return solve; - } } \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java index ba446b0..fd7c052 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java @@ -1,44 +1,23 @@ package com.hnac.hzims.scheduled.service.operation.business.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hnac.hzims.message.dto.PlanMsgRecordDto; -import com.hnac.hzims.message.entity.config.MessageTemplateEntity; -import com.hnac.hzims.message.fegin.IMessageClient; -import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity; import com.hnac.hzims.operational.main.vo.MaintainVo; import com.hnac.hzims.operational.main.vo.RegularWorkVO; -import com.hnac.hzims.operational.maintenance.constants.MaintenanceConstant; -import com.hnac.hzims.operational.maintenance.entity.OperMaintenancePlanEntity; import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity; -import com.hnac.hzims.operational.maintenance.vo.OperMaintenanceTaskEntityVo; import com.hnac.hzims.scheduled.mapper.operation.MaintenanceMapper; -import com.hnac.hzims.scheduled.service.operation.business.MaintenancePlanService; import com.hnac.hzims.scheduled.service.operation.business.MaintenanceService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.*; -import org.springblade.flow.core.feign.IFlowClient; -import org.springframework.beans.BeanUtils; -import org.springframework.jdbc.datasource.DataSourceTransactionManager; +import org.springblade.core.tool.utils.CollectionUtil; import org.springframework.stereotype.Service; -import org.springframework.transaction.TransactionDefinition; -import org.springframework.transaction.TransactionStatus; -import org.springframework.transaction.support.DefaultTransactionDefinition; -import java.beans.Transient; -import java.time.*; -import java.time.format.DateTimeFormatter; -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ThreadPoolExecutor; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.Date; +import java.util.List; import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static org.springblade.core.tool.utils.DateUtil.PATTERN_DATE; /** * @author ysj @@ -48,157 +27,6 @@ import static org.springblade.core.tool.utils.DateUtil.PATTERN_DATE; @Slf4j public class MaintenanceServiceImpl extends BaseServiceImpl implements MaintenanceService { - private final MaintenancePlanService planService; - - private final DutyMainServiceImpl dutyMainService; - - private final IFlowClient flowClient; - - private final IMessageClient messageClient; - - private final DataSourceTransactionManager manager; - - private final ThreadPoolExecutor executor; - - /** - * 日常维护任务派发 - * @param param - */ - @Override - @Transient - public void maintenanceTaskDistribute(String param) { - // 开始时间 - Date start = DateUtil.parse(DateUtil.formatDate(DateUtil.now()), DateUtil.PATTERN_DATE); - // 结束时间 - Date end = DateUtil.parse(DateUtil.formatDate(DateUtil.plusDays(start, 1)), DateUtil.PATTERN_DATE); - // 查询日常维护计划 - List plans = planService.list(Wrappers.lambdaQuery() - .ge(OperMaintenancePlanEntity::getDisposeTime,start) - .lt(OperMaintenancePlanEntity::getDisposeTime,end) - .isNotNull(OperMaintenancePlanEntity::getCreateTaskTime) - ); - // 遍历计划列表生成相应任务 - if(CollectionUtil.isEmpty(plans)){ - return; - } - plans.forEach(plan -> { - // 生成日常任务对象 - OperMaintenanceTaskEntity task = BeanUtil.copy(plan,OperMaintenanceTaskEntity.class); - if(StringUtil.isEmpty(task.getEmCode())){ - this.taskDistribute(task,plan); - }else{ - for (String code : plan.getEmCode().split(",")) { - task.setEmCode(code); - this.taskDistribute(task,plan); - } - } - }); - } - - /** - * 日常维护任务派发 - * @param task - * @param plan - */ - private void taskDistribute(OperMaintenanceTaskEntity task, OperMaintenancePlanEntity plan) { - DefaultTransactionDefinition defaultTransactionDefinition = new DefaultTransactionDefinition(); - defaultTransactionDefinition.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); - TransactionStatus transaction = manager.getTransaction(defaultTransactionDefinition); - task.setId(null); - task.setCreateTime(new Date()); - task.setUpdateTime(new Date()); - task.setPlanId(plan.getId()); - task.setTaskCode(UUID.randomUUID().toString()); - if (task.getRefLibraryId() != 0) { - task.setCreateTime(DateUtil.now()); - } - if(ObjectUtil.isNotEmpty(plan.getDisposer())){ - task.setDisposer(plan.getDisposer().toString()); - } - //补充计划结束时间 - Instant instant = task.getDisposeTime().toInstant(); - ZoneId zoneId = ZoneId.systemDefault(); - LocalDateTime disposeTime = instant.atZone(zoneId).toLocalDateTime(); - task.setPlanEndTime(disposeTime.plusHours(task.getHours())); - //获取值班人员 - if (ObjectUtil.isNotEmpty(plan.getMaintenanceModel()) && plan.getMaintenanceModel() == 2) { - //查询值班信息 - LambdaQueryWrapper dutyWrapper = new LambdaQueryWrapper<>(); - dutyWrapper.eq(ImsDutyMainEntity::getDutyDate, DateTimeFormatter.ofPattern(PATTERN_DATE).format(disposeTime)); - dutyWrapper.eq(ImsDutyMainEntity::getClassId, plan.getImsDutyClassId()); - ImsDutyMainEntity entity = dutyMainService.getOne(dutyWrapper); - if (ObjectUtil.isEmpty(entity) || StringUtils.isEmpty(entity.getDutyPersonIds())) { - log.error("计划ID为：{}未查询到排班记录", plan.getId()); - return; - } - String userId = entity.getDutyPersonIds(); - task.setDisposer(userId.replaceAll("\\^", ",")); - } - this.save(task); - // 事务提交 - manager.commit(transaction); - //启动流程 - String processInstanceId = this.startProcess(plan.getProcDefId(), task); - //推送消息 - CompletableFuture operMaintenanceTaskEntityCompletableFuture = - CompletableFuture.runAsync(() -> { - task.setProcessInstanceId(processInstanceId); - this.updateById(task); - plan.setCreateTaskTime(new Date()); - planService.updateById(plan); - //推送消息 - this.pushTaskMessage(task.getId()); - }, executor); - //启动队列 - try { - CompletableFuture.allOf(operMaintenanceTaskEntityCompletableFuture).get(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * 开启一个流程实例 - **/ - private String startProcess(String processDefinitionKey, OperMaintenanceTaskEntity taskEntity) { - OperMaintenanceTaskEntityVo operMaintenanceTaskEntityVo = new OperMaintenanceTaskEntityVo(); - BeanUtils.copyProperties(taskEntity, operMaintenanceTaskEntityVo); - Map params = new HashMap<>(); - params.put("taskId", taskEntity.getId()); - List userIdList = Stream.of(taskEntity.getDisposer().split(",")).collect(Collectors.toList()); - String taskUsers = userIdList.stream().filter(StringUtils::isNotBlank).map("taskUser_"::concat).collect(Collectors.joining(",")); - params.put("initUserIds", taskUsers); - params.put("operMaintenanceTaskEntityVo", operMaintenanceTaskEntityVo); - return flowClient.startProcessInstanceContainNameByKey(processDefinitionKey, String.valueOf(taskEntity.getId()), taskEntity.getTitle(), params).getData().getProcessInstanceId(); - } - - /** - * 推送消息 - */ - private void pushTaskMessage(Long taskId) { - OperMaintenanceTaskEntity task = this.getById(taskId); - if(ObjectUtil.isEmpty(task)){ - return; - } - // 根据消息模板Id查询模板 - R result = messageClient.getMsgTemplateById(task.getMessageTemplateId()); - if (result.isSuccess() && ObjectUtil.isNotEmpty(result.getData())) { - Func.toLongList(",", task.getDisposer()).forEach(userId -> { - //推送消息 - ZoneId zoneId = ZoneId.systemDefault(); - PlanMsgRecordDto msg = new PlanMsgRecordDto(); - msg.setTemplateId(task.getMessageTemplateId()); - msg.setCreateUser(task.getCreateUser()); - msg.setPlanTime(LocalDateTime.ofInstant(task.getDisposeTime().toInstant(), zoneId)); - msg.setTaskId(task.getId()); - msg.setDeptId(task.getCreateDept()); - msg.setReceiver(userId); - msg.setContent("距离任务执行时间已不满一小时，请及时处理"); - messageClient.planSendMessage(msg); - }); - } - } - /** * 获取日常维护数量 * @param departList @@ -247,7 +75,7 @@ public class MaintenanceServiceImpl extends BaseServiceImpl maintainFinish = maintainList.stream().filter(o-> Func.isNotEmpty(o.getStatus()) && MaintenanceConstant.TASK_STATUS_5 == o.getStatus()) + List maintainFinish = maintainList.stream().filter(o-> "结束".equals(o.getFlowTaskName())) .map(OperMaintenanceTaskEntity::getId).collect(Collectors.toList()); if(CollectionUtil.isEmpty(maintainFinish)){ maintainVo.setMaintainFinish(0); @@ -281,7 +109,7 @@ public class MaintenanceServiceImpl extends BaseServiceImpl regularWorkFinishList = regularWorkList.stream().filter(o -> MaintenanceConstant.TASK_STATUS_5 == o.getStatus()).collect(Collectors.toList()); + List regularWorkFinishList = regularWorkList.stream().filter(o -> "结束".equals(o.getFlowTaskName())).collect(Collectors.toList()); if (CollectionUtil.isEmpty(regularWorkFinishList)) { regularWorkVO.setRegularWork(0); return regularWorkVO; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/PhenomenonServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/PhenomenonServiceImpl.java index 1dc8019..9cfa208 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/PhenomenonServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/PhenomenonServiceImpl.java @@ -1,7 +1,10 @@ package com.hnac.hzims.scheduled.service.operation.business.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hnac.hzims.operational.defect.entity.OperDefectEntity; import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; +import com.hnac.hzims.operational.defect.vo.SolveHomeVO; import com.hnac.hzims.operational.main.vo.ShortagesVo; import com.hnac.hzims.operational.report.vo.DutyDefectVO; import com.hnac.hzims.scheduled.mapper.operation.PhenomenonMapper; @@ -11,6 +14,7 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.core.tool.utils.ObjectUtil; import org.springframework.stereotype.Service; import java.time.LocalDate; @@ -28,6 +32,32 @@ import java.util.stream.Collectors; public class PhenomenonServiceImpl extends BaseServiceImpl implements PhenomenonService { /** + * 消缺数量统计 + * @param deptIds + * @param start + * @param end + * @return + */ + @Override + public SolveHomeVO solve_count(List deptIds, String start, String end) { + SolveHomeVO solve = new SolveHomeVO(); + List defects = this.list(Wrappers.lambdaQuery() + .in(OperPhenomenonEntity::getCreateDept,deptIds) + .gt(OperPhenomenonEntity::getCreateTime,start) + .lt(OperPhenomenonEntity::getCreateTime,end) + ); + if(cn.hutool.core.collection.CollectionUtil.isEmpty(defects)){ + solve.setDefectCount(0); + solve.setSolveCount(0); + }else{ + solve.setDefectCount(defects.size()); + solve.setSolveCount((int) defects.stream().filter(defect-> !ObjectUtil.isEmpty(defect.getHandleTaskId())).count()); + } + return solve; + } + + + /** * 时间范围内机构缺陷数据查询 * @param start * @param end @@ -51,7 +81,7 @@ public class PhenomenonServiceImpl extends BaseServiceImplString.valueOf(o.getId())).collect(Collectors.joining(","))); defectVO.setDefectSum(operPhenomenonList.size()); // 消缺数 - List defectList = operPhenomenonList.stream().filter(o -> (Func.isNotEmpty(o.getIsDefect()) && o.getIsDefect() == 0) || "1".equals(o.getConclusionStatus())). + List defectList = operPhenomenonList.stream().filter(defect-> !ObjectUtil.isEmpty(defect.getHandleTaskId())). map(OperPhenomenonEntity::getId).collect(Collectors.toList()); if(CollectionUtil.isEmpty(defectList)){ defectVO.setDefect(0); @@ -88,8 +118,7 @@ public class PhenomenonServiceImpl extends BaseServiceImpl shortagesList = defects.stream().filter(o -> (Func.isNotEmpty(o.getIsDefect()) && o.getIsDefect() == 0) || "1".equals(o.getConclusionStatus())). - map(OperPhenomenonEntity::getId).collect(Collectors.toList()); + List shortagesList = defects.stream().filter(defect-> !ObjectUtil.isEmpty(defect.getHandleTaskId())).map(OperPhenomenonEntity::getId).collect(Collectors.toList()); if(CollectionUtil.isEmpty(shortagesList)){ shortagesVo.setShortages(0); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/ShowServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/ShowServiceImpl.java index 3864151..28429fb 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/ShowServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/ShowServiceImpl.java @@ -80,7 +80,6 @@ public class ShowServiceImpl implements ShowService { private final OtherService otherService; private final AccessService accessService; private final TicketService ticketService; - private final DefectService defectService; private final DutyService dutyService; private final StationService stationService; private final OverDetailsService detailsService; @@ -397,7 +396,7 @@ public class ShowServiceImpl implements ShowService { }); // 消缺率 exe.execute(() -> { - SolveHomeVO solve = defectService.solve_count(areas,DateUtil.format(DateUtil.toDate(firstDateTime.toLocalDate()),DateUtil.PATTERN_DATETIME),DateUtil.format(new Date(),DateUtil.PATTERN_DATETIME)); + SolveHomeVO solve = phenomenonService.solve_count(areas,DateUtil.format(DateUtil.toDate(firstDateTime.toLocalDate()),DateUtil.PATTERN_DATETIME),DateUtil.format(new Date(),DateUtil.PATTERN_DATETIME)); if(Math.abs(solve.getSolveCount()) > 0 && Math.abs(solve.getDefectCount()) > 0){ target.setTaget_three(BigDecimal.valueOf((double)solve.getSolveCount() / solve.getDefectCount() * 100).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); }else{ diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java index a108ff0..03ed645 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/TicketServiceImpl.java @@ -15,7 +15,6 @@ import com.hnac.hzims.ticket.workTicket.vo.TicketMonthVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; import org.springframework.stereotype.Service; diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java index 7cad00b..c7638d1 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/ticket/impl/WorkTicketServiceImpl.java @@ -2,26 +2,19 @@ package com.hnac.hzims.scheduled.service.ticket.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hnac.hzims.scheduled.mapper.ticket.WorkTicketMapper; import com.hnac.hzims.scheduled.service.ticket.WorkDelayService; import com.hnac.hzims.scheduled.service.ticket.WorkPrincipalService; import com.hnac.hzims.scheduled.service.ticket.WorkTicketService; -import com.hnac.hzims.ticket.constants.TicketConstants; -import com.hnac.hzims.ticket.workTicket.entity.WorkTicketDelayEntity; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; -import com.hnac.hzims.ticket.workTicket.entity.WorkTicketPrincipalChangeEntity; import com.hnac.hzims.ticket.workTicket.vo.WorkTicketStatisticVO; import lombok.AllArgsConstructor; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.CollectionUtil; import org.springframework.stereotype.Service; import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.FutureTask; import java.util.stream.Collectors; @@ -46,32 +39,40 @@ public class WorkTicketServiceImpl extends BaseServiceImpl infoIdList = infoList.stream().map(WorkTicketInfoEntity::getId).collect(Collectors.toList()); +// List infoIdList = infoList.stream().map(WorkTicketInfoEntity::getId).collect(Collectors.toList()); work.setTotal(infoList.size()); //工作票作废 - List invalidList = infoList.stream().filter(w -> TicketConstants.FirstWorkTicketFlowStatusEnum.INVALID.getStatus().equals(w.getStatus())) + List invalidList = infoList.stream().filter(item -> "废票".equals(item.getFlowTaskName())) .collect(Collectors.toList()); work.setInvalid(CollectionUtil.isNotEmpty(invalidList) ? invalidList.size() : 0); - // 工作票完成数 - List completeList = infoList.stream().filter(w -> TicketConstants.FirstWorkTicketFlowStatusEnum.FINISH.getStatus().equals(w.getStatus())) + // 工作票结束数 + List completeList = infoList.stream().filter(item -> "结束".equals(item.getFlowTaskName())) .collect(Collectors.toList()); work.setComplete(CollectionUtil.isNotEmpty(completeList) ? completeList.size() : 0); - int transferTask = 0; - int delayTask = 0; - List moveList = workPrincipalService.list(new LambdaQueryWrapper() {{ - in(WorkTicketPrincipalChangeEntity::getTicketId, infoIdList); - }}); - if(CollectionUtil.isNotEmpty(moveList)){ - transferTask = moveList.size(); - } - List delayEntityList = workDelayService.list(Wrappers.lambdaQuery() - .in(WorkTicketDelayEntity::getTicketId, infoIdList) - ); - if(CollectionUtil.isNotEmpty(delayEntityList)){ - delayTask = delayEntityList.size(); - } - work.setDelay(delayTask); - work.setTransfer(transferTask); + // 工作票延期总数数 + List delayList = infoList.stream().filter(item -> "延期".equals(item.getInput())) + .collect(Collectors.toList()); + work.setDelay(CollectionUtil.isNotEmpty(delayList) ? delayList.size() : 0); + // 工作票移交数 + List changeList = infoList.stream().filter(item -> "转移".equals(item.getInput())) + .collect(Collectors.toList()); + work.setTransfer(CollectionUtil.isNotEmpty(changeList) ? changeList.size() : 0); +// int transferTask = 0; +// int delayTask = 0; +// List moveList = workPrincipalService.list(new LambdaQueryWrapper() {{ +// in(WorkTicketPrincipalChangeEntity::getTicketId, infoIdList); +// }}); +// if(CollectionUtil.isNotEmpty(moveList)){ +// transferTask = moveList.size(); +// } +// List delayEntityList = workDelayService.list(Wrappers.lambdaQuery() +// .in(WorkTicketDelayEntity::getTicketId, infoIdList) +// ); +// if(CollectionUtil.isNotEmpty(delayEntityList)){ +// delayTask = delayEntityList.size(); +// } +// work.setDelay(delayTask); +// work.setTransfer(transferTask); } return work; } diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ContentMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ContentMapper.xml deleted file mode 100644 index e68eb88..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ContentMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/DutyMainMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/DutyMainMapper.xml deleted file mode 100644 index 3ce9fcd..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/DutyMainMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ObjectMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ObjectMapper.xml deleted file mode 100644 index d50799a..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ObjectMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ObjectUserMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ObjectUserMapper.xml deleted file mode 100644 index 66a295e..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ObjectUserMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanMapper.xml deleted file mode 100644 index 09f72d8..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanObjectTemplateMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanObjectTemplateMapper.xml deleted file mode 100644 index 1d0d4b3..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanObjectTemplateMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanOrgMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanOrgMapper.xml deleted file mode 100644 index 667ee81..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanOrgMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanPositionMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanPositionMapper.xml deleted file mode 100644 index 7d8f0e9..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanPositionMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanUserMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanUserMapper.xml deleted file mode 100644 index 3e8602b..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanUserMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ProjectContentMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ProjectContentMapper.xml deleted file mode 100644 index 56170b0..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ProjectContentMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ProjectMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ProjectMapper.xml deleted file mode 100644 index 88668db..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ProjectMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskObjectMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskObjectMapper.xml deleted file mode 100644 index 6d89084..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskObjectMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskObjectProjectContentMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskObjectProjectContentMapper.xml deleted file mode 100644 index ad59b3e..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskObjectProjectContentMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskObjectProjectMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskObjectProjectMapper.xml deleted file mode 100644 index eb355f8..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskObjectProjectMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskResultMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskResultMapper.xml deleted file mode 100644 index e2986ad..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskResultMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskUserMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskUserMapper.xml deleted file mode 100644 index ca9da30..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskUserMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TemplateMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TemplateMapper.xml deleted file mode 100644 index 7096dd1..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TemplateMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TemplateProjectMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TemplateProjectMapper.xml deleted file mode 100644 index b4ab0b8..0000000 --- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TemplateProjectMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IContentDefinitionService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IContentDefinitionService.java index 2393be5..9960a71 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IContentDefinitionService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IContentDefinitionService.java @@ -26,7 +26,7 @@ public interface IContentDefinitionService extends BaseService list(ContentDefinitionDTO request); default LambdaQueryWrapper getQueryWrapper(ContentDefinitionEntity entity) { - LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(entity,ContentDefinitionEntity.class); + LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(ContentDefinitionEntity.class,entity); queryWrapper.eq(Func.isNotEmpty(entity.getCreateDept()), ContentDefinitionEntity::getCreateDept, entity.getCreateDept()) .eq(Func.isNotEmpty(entity.getCreateUser()), ContentDefinitionEntity::getCreateUser, entity.getCreateUser()) .eq(Func.isNotEmpty(entity.getStatus()), ContentDefinitionEntity::getStatus, entity.getStatus()).orderByDesc(ContentDefinitionEntity::getCreateTime); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/InspectOfflineServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/InspectOfflineServiceImpl.java index 226b207..353db6a 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/InspectOfflineServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/service/impl/InspectOfflineServiceImpl.java @@ -430,7 +430,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { eq(ContentEntity::getTenantId, tenantId); }}); // 返回数据 - return contents.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return contents.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } /** @@ -447,7 +447,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { eq(ObjectDangerEntity::getTenantId, tenantId); }}); // 返回数据 - return dangers.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return dangers.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } @@ -466,7 +466,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { eq(OfflineTaskEntity::getId, taskId); }}); // 返回数据 - return tasks.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return tasks.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } @@ -482,7 +482,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { List taskUsers = this.taskUserService.getOfflineTaskUser(taskIds); // 返回数据 - return taskUsers.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return taskUsers.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } /** @@ -496,7 +496,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { // 查询巡检任务 List tasks = taskService.getTaskData(taskId,currentDate); // 返回数据 - return tasks.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return tasks.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } /** @@ -510,7 +510,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { } List tasks = planService.getPlans(planIds); // 返回数据 - return tasks.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return tasks.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } @@ -527,7 +527,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { List events = eventService.list(new LambdaQueryWrapper() {{ in(EventEntity::getTaskId, taskIds); }}); - return events.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return events.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } /** @@ -543,7 +543,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { List eventAttachments = eventAttachmentService.list(new LambdaQueryWrapper() {{ in(EventAttachmentEntity::getEventId, eventIds); }}); - return eventAttachments.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return eventAttachments.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } /** @@ -559,7 +559,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { in(EventRecordEntity::getEventId, eventIds); }}); // 返回数据 - return eventRecords.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return eventRecords.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } /** @@ -574,7 +574,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { // 查询巡检任务对象 List taskObjects = taskObjectService.getExObjectData(taskIds); // 返回数据 - return taskObjects.stream().map(item -> this.convertFileOrVideo(item)).collect(Collectors.toList()); + return taskObjects.stream().map(this::convertFileOrVideo).collect(Collectors.toList()); } /** @@ -832,9 +832,6 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { List taskObjects = JsonFileUtil.readJsonFile(upload + "/HZ_ST_EX_OBJECT.json", TaskObjectSyncBO.class); List projectContents = JsonFileUtil.readJsonFile(upload + "/HZ_ST_EX_OBJECT_PROJECT_CONTENT.json", TaskObjectProjectContentBO.class); - // 内容图片 - this.batchCurrentImg(upload, eventRecords); - // 文件上传 this.batchUploadImg(upload, eventRecords); this.batchUploadImg(upload, eventAttachments); @@ -876,49 +873,6 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { } /** - * 上传内容文件 - * - * @param sourceDir - * @param data - */ - private void batchCurrentImg(String sourceDir, List data) { - if (CollectionUtil.isEmpty(data)) { - return; - } - - data.forEach(bo -> { - if (CollectionUtil.isEmpty(bo.getCurrentValues())) { - return; - } - List urls = bo.getCurrentValues().stream().map(o -> { - if (StringUtils.isBlank(o) || !o.contains("file:")) { - return null; - } - /**wxq begin**/ - String fileName = o.substring(o.lastIndexOf("/") >= 0 ? o.lastIndexOf("/") + 1 : 0); - File file = new File(sourceDir + "/" + fileName); - if (!file.exists()) { - throw new RuntimeException("文件名称为：" + fileName + "不存在，上传失败！"); - } - R r = null; - try { - MultipartFile multipartFile = this.getMultipartFile(file); - r = ossClient.putFile(multipartFile); - if (!r.isSuccess()) { - throw new RuntimeException("上传文件["+fileName+"]失败，bladex-resource报错：" + r.toString()); - } - BladeFile bladeFile = r.getData(); - return bladeFile != null ? bladeFile.getLink() : null; - } catch (Exception ex) { - throw new RuntimeException("上传文件["+fileName+"]失败，bladex-resource报错：" + r.toString(), ex); - } - }).filter(StringUtils::isNotBlank).collect(Collectors.toList()); - bo.setCurrentValues(urls); - }); - - } - - /** * 上传文件 * * @param sourceDir @@ -955,7 +909,7 @@ public class InspectOfflineServiceImpl implements IOfflineDataService { } catch (Exception ex) { throw new RuntimeException("上传文件["+fileName+"]失败，bladex-resource报错：" + r.toString(), ex); } - }).filter(StringUtils::isNotBlank).collect(Collectors.toList()); + }).filter(o -> StringUtils.isNotBlank(o)).collect(Collectors.toList()); bo.setFiles(urls); }); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/sync/EventRecordSyncBO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/sync/EventRecordSyncBO.java index 1cc9c64..c90b919 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/sync/EventRecordSyncBO.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/sync/EventRecordSyncBO.java @@ -40,20 +40,4 @@ public class EventRecordSyncBO extends EventRecordEntity implements SyncBO { super.setFileUrl(urls.get(0)); } } - - @Override - public List getCurrentValues() { - return new ArrayList() {{ - if (StringUtil.isNotBlank(getCurrentValue())) { - add(getCurrentValue()); - } - }}; - } - - @Override - public void setCurrentValues(List urls) { - if (CollectionUtil.isNotEmpty(urls)) { - super.setCurrentValue(urls.get(0)); - } - } } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/sync/SyncBO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/sync/SyncBO.java index f03fd08..628053e 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/sync/SyncBO.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/sync/SyncBO.java @@ -13,15 +13,6 @@ public interface SyncBO { } default void setFiles(List urls) { - - } - - default List getCurrentValues() { - return null; - } - - default void setCurrentValues(List urls) { - } Object getPrimaryKey(); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java index b7d0859..1ee6546 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/RouteController.java @@ -63,11 +63,11 @@ public class RouteController extends BladeController { operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, action = "查询巡检路径管理列表") - public R> list(@ApiIgnore @RequestParam Map st_re_route, Query query) { + public R> list(@ApiIgnore @RequestParam Map st_re_route, Query query) { QueryWrapper queryWrapper = Condition.getQueryWrapper(st_re_route, RouteEntity.class); queryWrapper.orderByDesc("create_time", "update_time"); IPage pages = st_re_routeService.page(Condition.getPage(query), queryWrapper); - return R.data(BladePage.of(pages)); + return R.data(pages); } /** diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/EventController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/EventController.java index de43b4c..66e24cb 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/EventController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/EventController.java @@ -17,7 +17,6 @@ import com.hnac.hzinfo.inspect.task.vo.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; @@ -25,11 +24,11 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.core.tool.utils.SpringUtil; import org.springblade.core.tool.utils.StringUtil; import org.springblade.flow.core.constant.ProcessConstant; import org.springblade.flow.core.feign.IFlowClient; import org.springblade.system.feign.IDictClient; -import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -53,17 +52,11 @@ public class EventController{ /** * 获取巡检情况列表信息 */ - @GetMapping(value = "/list") + @RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST}) @ApiOperation(value = "任务查看弹窗下面的列表 巡检情况列表信息分页", notes = "传入taskId") - public R> eventList(@RequestParam Long taskId, @SpringQueryMap Query query, - @SpringQueryMap BladeUser bladeUser) { - if (bladeUser == null) { - bladeUser = new BladeUser(); - bladeUser.setTenantId("200000"); - } + public R> list(Long taskId, Query query, BladeUser bladeUser) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery().eq(EventEntity::getTaskId,taskId).orderByDesc(EventEntity::getCreateTime); - IPage pages = eventService.page(Condition.getPage(query), - (!BladeConstant.ADMIN_TENANT_ID.equals(bladeUser.getTenantId())) ? + IPage pages = eventService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.eq(EventEntity::getTenantId, bladeUser.getTenantId()).orderByDesc(EventEntity::getCreateTime) : queryWrapper); IPage resultPages = new Page<>(pages.getCurrent(), pages.getSize(),pages.getTotal()); @@ -92,7 +85,7 @@ public class EventController{ result.add(EventListVO.builder().id(entity.getId()).objectName(objectName).projectName(projectName).isProblem(entity.getIsProblem()).checkInTime(entity.getCreateTime()).build()); }); resultPages.setRecords(result); - return R.data(BladePage.of(resultPages)); + return R.data(resultPages); } /** diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java index fb68146..3309ca8 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java @@ -24,7 +24,7 @@ import com.hnac.hzinfo.inspect.task.service.IEventService; import com.hnac.hzinfo.inspect.task.service.ITaskService; import com.hnac.hzinfo.inspect.task.service.ITaskUserService; import com.hnac.hzinfo.inspect.task.vo.TaskListQuery; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectVO; import com.hnac.hzinfo.inspect.task.vo.TaskVo; import com.hnac.hzinfo.inspect.utils.Condition; import io.swagger.annotations.*; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/feign/InspectTaskReportClient.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/feign/InspectTaskReportClient.java index b018474..1fbca6a 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/feign/InspectTaskReportClient.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/feign/InspectTaskReportClient.java @@ -131,7 +131,7 @@ public class InspectTaskReportClient implements IInspectTaskReportClient { if(CollectionUtil.isEmpty(taskList)){ return R.data(dutyInspectTaskVO); } - dutyInspectTaskVO.setInspectTaskIds(taskList.stream().map(TaskEntity::getId).map(id->id.toString()).collect(Collectors.joining(","))); + dutyInspectTaskVO.setInspectTaskIds(taskList.stream().map(TaskEntity::getId).map(Object::toString).collect(Collectors.joining(","))); dutyInspectTaskVO.setInspectTaskSum(taskList.size()); // 所有处理完成巡检任务 List finshList = taskList.stream().filter(o-> null != o.getStatus() && o.getStatus().equals(3)).collect(Collectors.toList()); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/TaskJob.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/TaskJob.java index 2f6f69b..dc413e6 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/TaskJob.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/TaskJob.java @@ -106,7 +106,7 @@ public class TaskJob { UpdateWrapper uwTask = new UpdateWrapper<>(); uwTask.lambda().set(TaskEntity::getStatus, Integer.valueOf(TaskStatusEnum.UNFINISH_STATUS.getStatus())) .ne(TaskEntity::getStatus, Integer.valueOf(TaskStatusEnum.FINISH_STATUS.getStatus())) - .lt(TaskEntity::getPlanEndTime, LocalDate.now()); + .lt(TaskEntity::getPlanEndTime, LocalDateTime.now()); taskService.update(uwTask); } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/ConcurrentTaskServcie.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/ConcurrentTaskServcie.java index 8dd37ee..ad2a840 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/ConcurrentTaskServcie.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/ConcurrentTaskServcie.java @@ -105,8 +105,8 @@ public class ConcurrentTaskServcie extends TaskJobService implements ITaskJobSer //添加到提醒cache task.setUserId(user.getUserId()); - remindCacheManager.addTaskToCacheList(task); - taskVideoManager.addTaskToVideoCacheList(task); +// remindCacheManager.addTaskToCacheList(task); +// taskVideoManager.addTaskToVideoCacheList(task); } } if (taskUserList.size() > 0) { diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/SeizeTaskService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/SeizeTaskService.java index e499c96..be17cef 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/SeizeTaskService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/SeizeTaskService.java @@ -88,8 +88,8 @@ public class SeizeTaskService extends TaskJobService implements ITaskJobService taskUserList.add(this.getTaskUser(user.getUserId(),task.getId(),plan.getTenantId())); //添加到提醒cache task.setUserId(user.getUserId()); - remindCacheManager.addTaskToCacheList(task); - taskVideoManager.addTaskToVideoCacheList(task); +// remindCacheManager.addTaskToCacheList(task); +// taskVideoManager.addTaskToVideoCacheList(task); } String reason = this.distributeTaskObjs(plan,task); if(reason.equals(StringUtils.EMPTY)){ diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.java index be9aae9..6366203 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.java @@ -3,7 +3,7 @@ package com.hnac.hzinfo.inspect.task.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity; import com.hnac.hzinfo.inspect.task.vo.TaskObjectOfflineVO; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.xml b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.xml index a940162..9c34318 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.xml +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectMapper.xml @@ -3,7 +3,7 @@ - + @@ -13,14 +13,14 @@ - + - + diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.java index e568a98..5576f33 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.java @@ -2,7 +2,7 @@ package com.hnac.hzinfo.inspect.task.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectOfflineVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectOfflineVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.xml b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.xml index f75d728..b7716f6 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.xml +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskObjectProjectMapper.xml @@ -15,7 +15,7 @@ - SELECT * from hz_st_ex_object_project where IS_DELETED = 0 AND task_id IN diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectContentService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectContentService.java index d0a2ef0..12008f7 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectContentService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectContentService.java @@ -1,6 +1,6 @@ package com.hnac.hzinfo.inspect.task.service; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectContentVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectContentVO; import org.springblade.core.mp.base.BaseService; import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectContentEntity; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectService.java index 1f49aec..64628ae 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectProjectService.java @@ -1,6 +1,6 @@ package com.hnac.hzinfo.inspect.task.service; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectOfflineVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectOfflineVO; import org.springblade.core.mp.base.BaseService; import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectService.java index 66a1265..469e963 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskObjectService.java @@ -1,7 +1,7 @@ package com.hnac.hzinfo.inspect.task.service; import com.hnac.hzinfo.inspect.task.vo.TaskObjectOfflineVO; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectVO; import org.springblade.core.mp.base.BaseService; import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskService.java index 5715b8b..7f62c5a 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskService.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/ITaskService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hnac.hzims.vo.SafeCheckStatisticVO; import com.hnac.hzims.vo.VoteChartVo; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO; import com.hnac.hzinfo.inspect.task.dto.TaskDTO; import com.hnac.hzinfo.inspect.task.entity.InspectionTaskSMS; import com.hnac.hzinfo.inspect.task.entity.TaskEntity; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectContentServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectContentServiceImpl.java index daf4e6c..0beb398 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectContentServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectContentServiceImpl.java @@ -1,13 +1,16 @@ package com.hnac.hzinfo.inspect.task.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; +import com.hnac.hzims.operational.station.entity.StationEntity; import com.hnac.hzims.operational.station.feign.IStationClient; import com.hnac.hzinfo.datasearch.analyse.IAnalyseDataSearchClient; import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; import com.hnac.hzinfo.datasearch.real.po.RealDataSearchPO; import com.hnac.hzinfo.inspect.obj.entity.ContentEntity; import com.hnac.hzinfo.inspect.obj.services.ContentService; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectContentVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectContentVO; import com.hnac.hzinfo.sdk.v5.redis.RedisClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -18,9 +21,15 @@ import com.hnac.hzinfo.inspect.task.service.ITaskObjectProjectContentService; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.core.tool.utils.ObjectUtil; +import org.springblade.core.tool.utils.StringUtil; import org.springframework.stereotype.Service; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.List; +import java.util.Optional; /** * 服务实现类 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectServiceImpl.java index 1004aa1..b115b5c 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectProjectServiceImpl.java @@ -1,6 +1,6 @@ package com.hnac.hzinfo.inspect.task.service.impl; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectOfflineVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectOfflineVO; import org.springblade.core.mp.base.BaseServiceImpl; import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity; import com.hnac.hzinfo.inspect.task.mapper.TaskObjectProjectMapper; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectServiceImpl.java index 3643624..d421097 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskObjectServiceImpl.java @@ -7,7 +7,8 @@ import com.hnac.hzinfo.inspect.task.mapper.TaskObjectMapper; import com.hnac.hzinfo.inspect.task.service.ITaskObjectProjectContentService; import com.hnac.hzinfo.inspect.task.service.ITaskObjectService; import com.hnac.hzinfo.inspect.task.vo.TaskObjectOfflineVO; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectContentVO; +import com.hnac.hzinfo.inspect.task.vo.TaskObjectVO; import lombok.AllArgsConstructor; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.CollectionUtil; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java index a710273..61b1c82 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java @@ -16,9 +16,6 @@ import com.hnac.hzims.safeproduct.feign.IImsMonCameraInfoClient; import com.hnac.hzims.vo.SafeCheckStatisticVO; import com.hnac.hzims.vo.VoteChartVo; import com.hnac.hzinfo.inspect.ai.service.IRobotService; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectContentVO; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectProjectVO; -import com.hnac.hzinfo.inspect.areamonthly.vo.TaskObjectVO; import com.hnac.hzinfo.inspect.obj.ObjContants; import com.hnac.hzinfo.inspect.obj.services.IObjectDangerService; import com.hnac.hzinfo.inspect.plan.PlanContants; @@ -548,8 +545,13 @@ public class TaskServiceImpl extends BaseServiceImpl imp .filter(Func::isNotEmpty).map(String::valueOf).collect(Collectors.joining(",")); // 获取巡检任务人员名称 String userNames = taskUserList.stream().filter(Func::isNotEmpty).map(TaskUserEntity::getUserId).filter(Func::isNotEmpty) - .map(UserCache::getUser).map(user -> Optional.ofNullable(user).map(User::getName).orElse("")) - .collect(Collectors.joining(",")); + .map(userId -> { + User user = UserCache.getUser(userId); + if(ObjectUtil.isEmpty(user)){ + return ""; + } + return user.getName(); + }).collect(Collectors.joining(",")); taskVo.setUserIds(userIds); taskVo.setUserNames(userNames); // 获取机器人信息 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/EventListVO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/EventListVO.java new file mode 100644 index 0000000..89c396b --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/EventListVO.java @@ -0,0 +1,49 @@ +package com.hnac.hzinfo.inspect.task.vo; + +import java.io.Serializable; +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.springframework.format.annotation.DateTimeFormat; + +@ApiModel(value = "巡检情况列表") +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class EventListVO implements Serializable { + + private static final long serialVersionUID = 3596553809412766823L; + + @ApiModelProperty(value = "eventId") + private Long id; + + @ApiModelProperty(value = "巡检对象名称") + private String objectName; + @ApiModelProperty(value = "巡检项目名称") + private String projectName; + + /** + * 是否问题 0:否 1 是 默认0 + */ + @ApiModelProperty(value = "是否问题 0:否 1 是 默认0") + private String isProblem; + + @DateTimeFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @ApiModelProperty(value = "登记时间") + private Date checkInTime; +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectContentVO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectContentVO.java new file mode 100644 index 0000000..3f129b5 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectContentVO.java @@ -0,0 +1,138 @@ +package com.hnac.hzinfo.inspect.task.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 任务对象项目内容 + * @author ninglong + * @create 2020-08-24 8:55 + */ +@Setter +@Getter +@ApiModel(value = "任务对象项目内容") +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class TaskObjectProjectContentVO implements Serializable { + + /** + * 内容ID + */ + @ApiModelProperty(value = "内容ID") + private Long contentId; + + /** + * 内容名称 + */ + @ApiModelProperty(value = "内容名称") + private String name; + /** + * 检测标准 + */ + @ApiModelProperty(value = "检测标准") + private String description; + + /** + * 完成标识 + */ + @ApiModelProperty(value = "完成标识 0 不可用 1 可用") + private String available; + /** + * 检测类型 + */ + @ApiModelProperty(value = "检测类型") + private String checkType; + /** + * 记录类型 + */ + @ApiModelProperty(value = "记录类型") + private String recordType; + + /** + * 内容当前状态 0 异常 1 正常 + */ + @ApiModelProperty(value = "内容当前状态 0 异常 1 正常 ") + private String currentStatus; + /** + * 内容当前值 + */ + @ApiModelProperty(value = "内容当前值") + private String currentValue; + + /** + * 文件地址 + */ + @ApiModelProperty(value = "文件地址") + private String fileUrl; + + /** + * 表针识别，表盘ID + */ + @JsonSerialize(nullsUsing = NullSerializer.class) + @ApiModelProperty(value = "表针识别，表盘ID") + private Long clockId; + + /** + * 视频巡检摄像机ID + */ + @JsonSerialize(nullsUsing = NullSerializer.class) + @ApiModelProperty(value = "视频巡检摄像机ID") + private Long cameraId; + + /** + * 检测类型子类 + */ + @ApiModelProperty(value = "检测类型子类") + private String checkTypeSon; + + /** + * 开关/灯/表盘在摄像机可视面二维坐标位置，例如：2,1 表示第三行第二列，行列均从0开始记录,默认 0,0，如果有多张图则：0,0,1( 最后一位表示所在图片，最后一位1表示第二张图)，默认0,0,0 + */ + @ApiModelProperty(value = "开关/灯/表盘在摄像机可视面二维坐标位置，例如：2,1 表示第三行第二列，行列均从0开始记录,默认 0,0，如果有多张图则：0,0,1( 最后一位表示所在图片，最后一位1表示第二张图)，默认0,0,0") + private String cameraAddr; + + + /** + * 其他参数，例如多联断路器内断路器的个数 + */ + @ApiModelProperty(value = "其他参数，例如多联断路器内断路器的个数") + private String otherParam; + + /** + * 校验值，用来判断当前值是否正确：枚举数据通过 “ , ”隔开, 区间通过~隔开 + */ + @ApiModelProperty(value = "校验值，用来判断当前值是否正确：枚举数据通过 “ , ”隔开, 区间通过~隔开") + private String checkVal; + + /** + * 记值方式为选择时选择值 + */ + @ApiModelProperty(value = "记值方式为选择时选择值") + private String dictType; + + @ApiModelProperty(value = "实时数据") + private String realData; + + @ApiModelProperty(value = "实时数据采集时间") + private String gatherTime; + + @ApiModelProperty(value = "绑定物模型属性标识") + private String attrSignage; + + @ApiModelProperty(value = "绑定物模型属性名称") + private String attrName; + + @ApiModelProperty(value = "设备编号") + private String emCode; + +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectOfflineVO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectOfflineVO.java new file mode 100644 index 0000000..5bf8aa6 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectOfflineVO.java @@ -0,0 +1,51 @@ +package com.hnac.hzinfo.inspect.task.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springblade.core.tenant.mp.TenantEntity; + + +/** + * 实体类 + * + * @author Chill + */ +@Data +public class TaskObjectProjectOfflineVO extends TenantEntity { + + private static final long serialVersionUID = 1L; + + /** + * 任务ID + */ + @ApiModelProperty(value = "任务ID") + private Long taskId; + /** + * 对象ID + */ + @ApiModelProperty(value = "对象ID") + private Long objectId; + /** + * 项目ID + */ + @ApiModelProperty(value = "项目ID") + private Long projectId; + + + /** + * 目标编码 + */ + @ApiModelProperty(value = "目标编码") + private String code; + /** + * 目标名称 + */ + @ApiModelProperty(value = "目标名称") + private String name; + + /** + * 目标描述 + */ + @ApiModelProperty(value = "目标描述") + private String description; +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectVO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectVO.java new file mode 100644 index 0000000..7a36742 --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectProjectVO.java @@ -0,0 +1,34 @@ +package com.hnac.hzinfo.inspect.task.vo; + +import com.google.common.collect.Lists; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +import java.io.Serializable; +import java.util.List; + +/** + * 任务对象项目 + * @author ninglong + * @create 2020-08-24 8:52 + */ +@Getter +@Setter +@ApiModel(value = "任务对象项目") +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class TaskObjectProjectVO implements Serializable { + + @ApiModelProperty(value = "任务对象项目ID") + private Long projectId; + @ApiModelProperty(value = "任务对象项目名称") + private String projectName; + @ApiModelProperty(value = "项目状态") + private Integer status; + + @Builder.Default + @ApiModelProperty(value = "任务对象项目内容") + private List contents = Lists.newArrayList(); +} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectVO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectVO.java new file mode 100644 index 0000000..040e03c --- /dev/null +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskObjectVO.java @@ -0,0 +1,61 @@ +package com.hnac.hzinfo.inspect.task.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.google.common.collect.Lists; +import com.hnac.hzims.safeproduct.entity.DangerSourceEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; +import org.springblade.core.tool.utils.ObjectUtil; + +import java.io.Serializable; +import java.util.List; + +/** + * 任务对象 + * @author ninglong + * @create 2020-08-24 8:51 + */ +@Setter +@Getter +@ApiModel(value = "任务对象") +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class TaskObjectVO implements Serializable { + /** + * 任务ID + */ + @ApiModelProperty(value = "任务ID") + private Long taskId; + + @ApiModelProperty(value = "任务对象ID") + private Long objId; + @ApiModelProperty(value = "任务对象名称") + private String objName; + @ApiModelProperty(value = "对象状态") + private Integer status; + + /** + * 是否重复记录 0 不允许 1允许 + */ + @ApiModelProperty(value = "是否重复记录 0 不允许 1允许") + private String duplicateRecord; + + @ApiModelProperty(value = "排序") + private Integer order; + + @ApiModelProperty(value = "巡检对象危险点信息") + private List dangers; + + @Builder.Default + @ApiModelProperty(value = "任务对象项目") + private List projects = Lists.newArrayList(); + + public Integer getOrder() { + if(ObjectUtil.isEmpty(this.order)){ + return 1; + } + return order; + } +} diff --git a/hzims-service/message/pom.xml b/hzims-service/message/pom.xml index 56dd88f..b3856f8 100644 --- a/hzims-service/message/pom.xml +++ b/hzims-service/message/pom.xml @@ -88,6 +88,7 @@ org.springblade blade-system-api + 5.0.2-SNAPSHOT diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java index c718ab3..c7a93ff 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java @@ -90,7 +90,7 @@ public class MessageClient extends BladeController implements IMessageClient{ entity.setDeptName(Func.isNotEmpty(entity.getDeptName()) ? entity.getDeptName() : this.getDeptNameById(entity.getDeptId())); entity.setMessageId(IdWorker.getId()); entity.setPusher(userId.toString()); - entity.setPusherName(Optional.ofNullable(UserCache.getUser(userId)).map(User::getName).orElse(null)); + //entity.setPusherName(Optional.ofNullable(UserCache.getUser(userId)).map(User::getName).orElse(null)); entity.setPushType(MessageConstants.IMMEDIATELY); entity.setAccount(userId.toString()); entity.setPlanTime(LocalDateTime.now()); @@ -98,11 +98,11 @@ public class MessageClient extends BladeController implements IMessageClient{ entity.setCreateDept(entity.getDeptId()); return entity; }).collect(Collectors.toList()); - boolean isSave = recordService.saveBatch(messages); + /*boolean isSave = recordService.saveBatch(messages); if(isSave){ return R.data(recordService.sendWxMessageByUser(request,messages)); - } - return R.data(false); + }*/ + return R.data(recordService.sendWxMessageByUser(request,messages)); } @PostMapping(PLAN_SEND_MESSAGE) diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java index bf9b069..6ab12eb 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MessagePushRecordServiceImpl.java @@ -394,19 +394,15 @@ public class MessagePushRecordServiceImpl extends BaseServiceImpl records) { - Map param = new HashMap(); - param.put("templateId",message.getTemplateId()); - param.put("skip",message.getSkipUrl()); - param.put("map",message.getMap()); - param.put("userIds", Arrays.stream(message.getUserIds().split(",")).collect(Collectors.toList())); + WxMessageServiceImpl service = SpringUtil.getBean(WxMessageServiceImpl.class); - boolean isSend = service.send(param); - if (isSend) { + boolean isSend = service.send(message); + /*if (isSend) { this.update(Wrappers.lambdaUpdate() .set(MessagePushRecordEntity::getPushTime, LocalDateTime.now()) .set(MessagePushRecordEntity::getStatus, MessageConstants.PUSH_SUCCESS) .in(MessagePushRecordEntity::getId, records.stream().map(MessagePushRecordEntity::getId).collect(Collectors.toList()))); - } + }*/ return isSend; } diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/WxMessageServiceImpl.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/WxMessageServiceImpl.java index 337983d..aea5845 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/WxMessageServiceImpl.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/WxMessageServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.hnac.hzims.message.MessageConstants; import com.hnac.hzims.message.dto.AppPushDto; import com.hnac.hzims.message.dto.PushDto; +import com.hnac.hzims.message.dto.WxMessageDTO; import com.hnac.hzims.message.entity.MessagePushRecordEntity; import com.hnac.hzims.message.log.aspect.SaveLog; import com.hnac.hzims.message.service.IMessageService; @@ -16,6 +17,7 @@ import com.hnac.hzinfo.core.push.model.PushPlatform; import com.hnac.hzinfo.core.push.model.PushResponse; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.logger.BladeLogger; import org.springblade.core.secure.utils.AuthUtil; @@ -24,6 +26,9 @@ import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.resource.feign.IPushClient; import org.springblade.resource.vo.PushInfoVO; +import org.springblade.system.entity.PushTemplate; +import org.springblade.system.feign.IWxPushClient; +import org.springblade.system.vo.WxPushFeignVO; import org.springframework.stereotype.Service; import java.io.*; @@ -38,6 +43,7 @@ import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.FutureTask; import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; /** * @author hx @@ -48,6 +54,7 @@ import java.util.concurrent.atomic.AtomicReference; public class WxMessageServiceImpl implements IMessageService { private final IPushClient pushClient; + private final IWxPushClient wxPushClient; private final BladeLogger logger; private final ExecutorService appMessagePushExecutor; @@ -75,50 +82,13 @@ public class WxMessageServiceImpl implements IMessageService { return false; } - public boolean send(Map param) { - OutputStream out = null; - try{ - URL serverUrl = new URL("https://3d.hnaccloud.com/api/blade-system/wxPush/sendPush"); - HttpURLConnection conn = (HttpURLConnection) serverUrl.openConnection(); - conn.setRequestMethod("GET"); - conn.setRequestProperty("Content-type", "application/json"); - //必须设置false，否则会自动redirect到重定向后的地址 - conn.setInstanceFollowRedirects(false); - conn.connect(); - String result = responseFormat(conn); - //获取输出流 - out = conn.getOutputStream(); - log.error("send_wx_message_param: {}",param.toString()); - //输出流里写入POST参数 - out.write(param.toString().getBytes()); - out.flush(); - out.close(); - }catch (Exception ex){ - log.error("send_wx_message_error: {} ", ex.getMessage()); - } - return false; - } - - /*** - * 获取返回的内容 - * @param connection - * @return - */ - private String responseFormat(HttpURLConnection connection) { - StringBuilder stringBuilder = new StringBuilder(); - //将返回的输入流转换成字符串 - try ( - InputStream inputStream = connection.getInputStream(); - InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8); - BufferedReader bufferedReader = new BufferedReader(inputStreamReader) - ) { - String str; - while ((str = bufferedReader.readLine()) != null) { - stringBuilder.append(str); - } - } catch (IOException e) { - return null; - } - return stringBuilder.toString(); - } + public boolean send(WxMessageDTO message) { + PushTemplate template = new PushTemplate(); + template.setTemplateId(message.getTemplateId()); + template.setSkipUrl(message.getSkipUrl()); + template.setMap(message.getMap()); + template.setUserIds(Arrays.stream(message.getUserIds().split(",")).collect(Collectors.toList())); + R result = wxPushClient.sendPushTemplateByUserId(template); + return result.isSuccess(); + } } diff --git a/hzims-service/operational/pom.xml b/hzims-service/operational/pom.xml index 03d3536..ea3b0b7 100644 --- a/hzims-service/operational/pom.xml +++ b/hzims-service/operational/pom.xml @@ -139,7 +139,6 @@ org.springblade blade-user-api - 5.0.1.RELEASE diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java index 561085b..b95aca3 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java @@ -340,13 +340,13 @@ public class OperAccessTaskServiceImpl extends BaseServiceImpl materials) { + public void updateMaterials(Long planId, Long taskId, List materials) { if (CollectionUtils.isEmpty(materials)) { materials = new ArrayList<>(); } //查询已经存在的检修库明细，并删除部分需要删除的 List existsDetails = materialService.list(new LambdaQueryWrapper() {{ - eq(OperAccessMaterialEntity::getPlanId, planId); + eq(Func.isNotEmpty(planId),OperAccessMaterialEntity::getPlanId, planId); eq(OperAccessMaterialEntity::getTaskId, taskId); eq(OperAccessMaterialEntity::getIsDeleted, 0L); }}); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.java index 0c55878..c989ecc 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.java @@ -20,5 +20,5 @@ public interface AlarmHandleMapper extends UserDataScopeBaseMapper selectHandlePage(IPage page,@Param("param") HandleQueryVo param); - List handles(@Param("types") List types,@Param("alarm") Integer alarm,@Param("start") String start,@Param("end") String end); + List handles(@Param("types") List types,@Param("start") String start,@Param("end") String end); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.xml index ec557f8..18304a2 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.xml +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.xml @@ -51,9 +51,6 @@ and handler.create_time between #{start} and #{end} - - and type = #{alarm} - and (detail.DELAY_TIME > #{end} or detail.DELAY_TIME is null) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/HistoryAbnormalAlarmService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/HistoryAbnormalAlarmService.java index 8ab23c1..ca936c6 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/HistoryAbnormalAlarmService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/HistoryAbnormalAlarmService.java @@ -37,5 +37,4 @@ public interface HistoryAbnormalAlarmService extends BaseService alarmData(AlarmDataPageVo page,Query query); List queryStationName(); - } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AlarmHandleServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AlarmHandleServiceImpl.java index a151d74..9daebb3 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AlarmHandleServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/AlarmHandleServiceImpl.java @@ -151,9 +151,13 @@ public class AlarmHandleServiceImpl extends BaseServiceImpl handles(List types,Integer alarm) { + public List handles(List types,Integer isEarly) { + if(AbnormalAlarmConstant.INTELLIGENCE_ALARM.equals(isEarly)){ + String end = DateUtil.format(new Date(),DateUtil.PATTERN_DATETIME); + return this.baseMapper.handles(types,null,end); + } String start = DateUtil.format(new Date(),DateUtil.PATTERN_DATE) + " 00:00:00"; String end = DateUtil.format(new Date(),DateUtil.PATTERN_DATETIME); - return this.baseMapper.handles(types,alarm,start,end); + return this.baseMapper.handles(types,start,end); } } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java index 71ba8b5..554173d 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java @@ -35,6 +35,7 @@ import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.ObjectUtil; import org.springframework.beans.factory.annotation.Value; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import java.lang.reflect.Field; @@ -42,6 +43,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** @@ -59,6 +61,8 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl voList = historyAbnormalAlarmVos.parallelStream().peek(s -> s.setTimes((s.getEndTime().getTime() - s.getStartTime().getTime()))).collect(Collectors.toList()); //次数统计 Map timesList = voList.stream().collect(Collectors.groupingBy(HistoryAbnormalAlarmEntity::getStationName, - Collectors.counting())); + Collectors.counting())); //时间统计 Map durationList = voList.stream().collect(Collectors.groupingBy(HistoryAbnormalAlarmEntity::getStationName, - Collectors.summingLong(HistoryAbnormalAlarmVo::getTimes))); + Collectors.summingLong(HistoryAbnormalAlarmVo::getTimes))); List res = new ArrayList<>(); for (Map.Entry entry : durationList.entrySet()) { //累计时长 @@ -141,8 +145,8 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl page = Condition.getPage(query); page.setTotal(res.size()); if (entityIsNull(query)) { @@ -209,6 +213,10 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl wrapper = Wrappers.lambdaQuery(); wrapper.eq(StationEntity::getServeType,HomePageConstant.HYDROPOWER_SERVETYPE); @@ -261,11 +269,12 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl> timely(@ApiParam(value = "机构Id", required = true) @RequestParam Long deptId, - @ApiParam(value = "类型", required = true) @RequestParam Integer type) { - return R.data(service.timely(deptId,type)); + public R> timely(@ApiParam(value = "机构Id", required = true) @RequestParam Long deptId) { + return R.data(service.timely(deptId)); } @ApiLog diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/DeviceDataController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/DeviceDataController.java index a448691..89e98c5 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/DeviceDataController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/controller/DeviceDataController.java @@ -42,4 +42,11 @@ public class DeviceDataController { public R> history(AnalyzeDataCondition analyzeDataCondition) { return service.history(analyzeDataCondition); } + + @ApiOperation("微信消息推送测试") + @PostMapping("/sendWxMessage") + @ApiOperationSupport(order = 1) + public R sendWxMessage() { + return service.sendWxMessage(); + } } \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/AreaDutyService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/AreaDutyService.java index 83d8ce1..2b03344 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/AreaDutyService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/AreaDutyService.java @@ -14,7 +14,7 @@ public interface AreaDutyService { AreaDutyVo duty(Long deptId); - List timely(Long deptId,Integer type); + List timely(Long deptId); List asset(Long deptId); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/DeviceDataService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/DeviceDataService.java index 6726c14..c69fe0a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/DeviceDataService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/DeviceDataService.java @@ -19,4 +19,6 @@ public interface DeviceDataService { R> real(RealDataSearchPO search); R> history(AnalyzeDataCondition analyzeDataCondition); + + R sendWxMessage(); } \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/AreaDutyServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/AreaDutyServiceImpl.java index 1a75a11..0913098 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/AreaDutyServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/AreaDutyServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.hnac.hzims.equipment.vo.EminfoAndEmParamVo; import com.hnac.hzims.fdp.feign.IFdpMonitorClient; import com.hnac.hzims.operational.access.dto.AccessTaskV4DTO; @@ -42,6 +43,7 @@ import java.time.Duration; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.*; +import java.util.concurrent.*; import java.util.stream.Collectors; /** @@ -78,6 +80,8 @@ public class AreaDutyServiceImpl implements AreaDutyService { private final RedisTemplate redisTemplate; + private static ScheduledExecutorService pool = new ScheduledThreadPoolExecutor(5, new ThreadFactoryBuilder().setNameFormat("area-duty-pool-%d").build(), new ThreadPoolExecutor.AbortPolicy()); + /** * 区域值班数据 * @param deptId @@ -98,25 +102,44 @@ public class AreaDutyServiceImpl implements AreaDutyService { * @return */ @Override - public List timely(Long deptId,Integer type) { + public List timely(Long deptId) { Calendar calendar = Calendar.getInstance(); String start = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATETIME); + calendar.add(Calendar.HOUR_OF_DAY,-calendar.get(Calendar.HOUR_OF_DAY)); + calendar.add(Calendar.MINUTE,-calendar.get(Calendar.MINUTE)); + calendar.add(Calendar.SECOND,-calendar.get(Calendar.SECOND)); calendar.add(Calendar.DAY_OF_MONTH,1); String end = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATETIME); - switch (type){ - case 1: - return this.early(deptId); - case 2: - return this.inspection(start,end,deptId); - case 3: - return this.overhaul(start,end,deptId); - case 4: - return this.maintenance(start,end,deptId); - case 5: - return this.regular(deptId); - default: - return new ArrayList<>(); + List timelys = new ArrayList<>(); + CountDownLatch countDownLatch = new CountDownLatch(5); + pool.execute(()->{ + timelys.addAll(this.early(deptId)); + countDownLatch.countDown(); + }); + pool.execute(()->{ + timelys.addAll(this.inspection(start,end,deptId)); + countDownLatch.countDown(); + }); + pool.execute(()->{ + timelys.addAll(this.overhaul(start,end,deptId)); + countDownLatch.countDown(); + }); + pool.execute(()->{ + timelys.addAll(this.maintenance(start,end,deptId)); + countDownLatch.countDown(); + }); + pool.execute(()->{ + timelys.addAll(this.regular(deptId)); + countDownLatch.countDown(); + }); + // 等待所有线程执行完成 + try { + countDownLatch.await(); + } catch (InterruptedException e) { + e.printStackTrace(); + Thread.currentThread().interrupt(); } + return timelys.stream().sorted(Comparator.comparing(AreaTimelyVo::getColour).thenComparing(AreaTimelyVo::getTime).reversed()).collect(Collectors.toList()); } @@ -151,20 +174,11 @@ public class AreaDutyServiceImpl implements AreaDutyService { AreaTimelyVo timely = new AreaTimelyVo(); timely.setEventId(early.getFaultId()); timely.setContent(early.getFinfo()); - timely.setDeptName("未知"); - if(!StringUtil.isEmpty(early.getStation())){ - List names = stations.stream().filter(o->o.getCode().equals(early.getStation())).map(StationEntity::getName).collect(Collectors.toList()); - if(CollectionUtil.isNotEmpty(names)){ - timely.setDeptName(names.get(0)); - } - } + timely.setDeptName(early.getStation()); timely.setTime(early.getCreateTime()); - int sum = this.eventToHours(LocalDateTime.parse(early.getCreateTime(),DateUtil.DATETIME_FORMATTER)); - timely.setSum(sum); + //int sum = this.eventToHours(LocalDateTime.parse(early.getCreateTime(),DateUtil.DATETIME_FORMATTER)); + timely.setType("智能预警"); timely.setColour(0); - if(sum > 12){ - timely.setColour(1); - } return timely; }).collect(Collectors.toList()); } @@ -188,12 +202,9 @@ public class AreaDutyServiceImpl implements AreaDutyService { timely.setDeptName(result.getData().getDeptName()); } timely.setTime(expire.getPlanEndTime().format(DateUtil.DATETIME_FORMATTER)); - int sum = this.eventToHours(expire.getPlanEndTime()); - timely.setSum(sum); - timely.setColour(0); - if(sum < 12){ - timely.setColour(1); - } + //int sum = this.eventToHours(expire.getPlanEndTime()); + timely.setType("巡检任务"); + timely.setColour(2); return timely; }).collect(Collectors.toList()); } @@ -222,12 +233,9 @@ public class AreaDutyServiceImpl implements AreaDutyService { timely.setDeptName(result.getData().getDeptName()); } timely.setTime(DateUtil.format(overhaul.getPlanEndTime(),DateUtil.PATTERN_DATETIME)); - int sum = this.eventToHours(LocalDateTime.ofInstant(overhaul.getPlanEndTime().toInstant(), ZoneId.systemDefault())); - timely.setSum(sum); - timely.setColour(0); - if(sum < 12){ - timely.setColour(1); - } + //int sum = this.eventToHours(LocalDateTime.ofInstant(overhaul.getPlanEndTime().toInstant(), ZoneId.systemDefault())); + timely.setType("检修任务"); + timely.setColour(2); return timely; }).collect(Collectors.toList()); } @@ -257,11 +265,8 @@ public class AreaDutyServiceImpl implements AreaDutyService { } timely.setTime(DateUtil.format(maintenance.getPlanEndTime(),DateUtil.PATTERN_DATETIME)); int sum = this.eventToHours(maintenance.getPlanEndTime()); - timely.setSum(sum); - timely.setColour(0); - if(sum < 12){ - timely.setColour(1); - } + timely.setType("日常维护"); + timely.setColour(2); return timely; }).collect(Collectors.toList()); } @@ -307,12 +312,12 @@ public class AreaDutyServiceImpl implements AreaDutyService { asset.setDevices(entry.getValue().stream().map(value->{ AreaAssetDeviceVo item = new AreaAssetDeviceVo(); item.setDeptId(entry.getKey()); - item.setDeviceCode(value.getEmCode()); - item.setDeviceName(value.getName()); + item.setDeptName(asset.getDeptName()); // 状态 HydropowerUnitRealVo real = reals.stream().filter(o->o.getDeviceCode().equals(value.getEmCode())).min(Comparator.comparing(HydropowerUnitRealVo::getDeviceCode)).get(); - item.setStatus(2); - if(ObjectUtil.isNotEmpty(real) && Math.abs(real.getActivePower()) > 0){ + if(ObjectUtil.isEmpty(real)){ + item.setStatus(2); + }else if(Math.abs(real.getActivePower()) > 0){ item.setStatus(1); } return item; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/DeviceDataServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/DeviceDataServiceImpl.java index cc96c56..91c2a11 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/DeviceDataServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/census/service/impl/DeviceDataServiceImpl.java @@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.esotericsoftware.minlog.Log; import com.hnac.hzims.equipment.vo.EminfoAndEmParamVo; +import com.hnac.hzims.message.dto.WxMessageDTO; +import com.hnac.hzims.message.fegin.IMessageClient; import com.hnac.hzims.operational.census.service.DeviceDataService; import com.hnac.hzims.operational.census.vo.RealVo; import com.hnac.hzinfo.datasearch.PointData; @@ -15,10 +17,13 @@ import com.hnac.hzinfo.datasearch.real.po.RealDataSearchPO; import com.hnac.hzinfo.sdk.analyse.AnalyseDataSearchClient; import com.hnac.hzinfo.sdk.core.response.HzPage; import com.hnac.hzinfo.sdk.core.response.Result; +import io.swagger.annotations.ApiModelProperty; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.mp.support.QueryField; +import org.springblade.core.mp.support.SqlCondition; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.StringUtil; @@ -26,6 +31,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; +import javax.validation.constraints.NotNull; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -42,6 +49,8 @@ public class DeviceDataServiceImpl implements DeviceDataService { private final AnalyseDataSearchClient analyseDataSearchClient; + private final IMessageClient messageClient; + /** * 实时数据 * @param search @@ -67,4 +76,44 @@ public class DeviceDataServiceImpl implements DeviceDataService { Result> result = analyseDataSearchClient.getAnalyzeDataByAnalyzeCode(analyzeDataCondition); return R.data(result.getData()); } + + /** + * 微信消息推送测试 + * @return + */ + @Override + public R sendWxMessage() { + WxMessageDTO message = new WxMessageDTO(); + // 模板Id + message.setTemplateId("hIgINCsjpG-gyCKh8wzwBWjR-hkbjkNLFTXQEsnR_Z8"); + // 微信消息跳转地址 + message.setSkipUrl("http://baidu.com"); + // 机构Id + message.setDeptId(200000010709L); + // 业务关键字 + message.setBusinessKey("wx_message_test"); + // 业务分类关键字 + message.setBusinessClassify("wx_message_test"); + // 任务Id + message.setTaskId(1686044105416650753L); + // 微信参数键值对 + HashMap map = new HashMap<>(); + map.put("thing18","云南维西拉波洛水电站"); + map.put("thing5","1号机组"); + map.put("thing11","拉波洛电站数据_1号机组PLC.(D182)机组故障_分"); + map.put("thing14","故障"); + map.put("time2","2023-08-28 16:08:19"); + message.setMap(map); + // 消息内容 + message.setContent("杨胜军在测试微信消息推送"); + // 消息主题 + message.setSubject("微信公众号推送消息测试"); + // 推送用户 + message.setUserIds("1678930425282785281,1696056255481344002,1696073993931157505"); + // 创建用户 + message.setCreateUser(1394936547620040706L); + // 租户Id + message.setTenantId("200000"); + return messageClient.sendWxMessage(message); + } } \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java index 9cb52a5..27e4d92 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hnac.hzims.equipment.feign.IEmInfoClient; import com.hnac.hzims.equipment.vo.EminfoAndEmParamVo; import com.hnac.hzims.fdp.feign.IFdpMonitorClient; @@ -24,6 +25,7 @@ import com.hnac.hzims.operational.config.service.StAlamRecordService; import com.hnac.hzims.operational.config.service.StFocusPropertiesService; import com.hnac.hzims.operational.config.vo.*; import com.hnac.hzims.operational.main.service.IMainSystemMonitoringService; +import com.hnac.hzims.operational.main.vo.RealDeviceVo; import com.hnac.hzims.operational.main.vo.SoeDataVo; import com.hnac.hzims.operational.station.entity.StationEntity; import com.hnac.hzims.operational.station.service.IStationService; @@ -739,10 +741,17 @@ public class StAlamRecordServiceImpl extends BaseServiceImpl handles = handleService.handles(Collections.singletonList(AbnormalAlarmConstant.EARLY_WARNING),AbnormalAlarmConstant.INTELLIGENCE_ALARM); Map map = stations.stream().collect(Collectors.toMap(StationEntity::getCode,StationEntity::getName)); - return list.stream().filter(fault -> map.containsKey(fault.getStation())).peek(o-> o.setStationName(map.get(o.getStation()))).collect(Collectors.toList()); + return list.stream().filter(fault -> map.containsKey(fault.getStation())).peek(record -> { + record.setStationName(map.get(record.getStation())); + if(CollectionUtil.isEmpty(handles)){ + record.setIsHandle(false); + }else{ + record.setIsHandle(handles.stream().map(AlarmHandleEntity::getAlarmId).collect(Collectors.toList()).contains(String.valueOf(record.getFaultId()))); + } + }).sorted(Comparator.comparing((FaultVo::getIsHandle)).reversed().thenComparing(FaultVo::getCreateTime).reversed()).collect(Collectors.toList()); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/FaultVo.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/FaultVo.java index 74a0f60..a76ef46 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/FaultVo.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/vo/FaultVo.java @@ -27,4 +27,6 @@ public class FaultVo { private String info; private String name; + + private Boolean isHandle; } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperPhenomenonServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperPhenomenonServiceImpl.java index 2624f0a..4032dff 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperPhenomenonServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperPhenomenonServiceImpl.java @@ -547,8 +547,7 @@ public class OperPhenomenonServiceImpl extends BaseServiceImplString.valueOf(o.getId())).collect(Collectors.joining(","))); defectVO.setDefectSum(operPhenomenonList.size()); // 消缺数 - List defectList = operPhenomenonList.stream().filter(o -> (Func.isNotEmpty(o.getIsDefect()) && o.getIsDefect() == 0) || "1".equals(o.getConclusionStatus())). - map(OperPhenomenonEntity::getId).collect(Collectors.toList()); + List defectList = operPhenomenonList.stream().filter(defect -> !ObjectUtil.isEmpty(defect.getHandleTaskId())).map(OperPhenomenonEntity::getId).collect(Collectors.toList()); if(CollectionUtil.isEmpty(defectList)){ defectVO.setDefect(0); return defectVO; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainReportController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainReportController.java index 105b5dd..f8520ed 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainReportController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainReportController.java @@ -9,14 +9,12 @@ import com.hnac.hzims.operational.access.constants.AccessConstants; import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity; import com.hnac.hzims.operational.access.service.IOperAccessTaskService; import com.hnac.hzims.operational.defect.constants.DefectConstant; -import com.hnac.hzims.operational.defect.entity.OperDefectEntity; +import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; import com.hnac.hzims.operational.defect.service.IOperDefectService; +import com.hnac.hzims.operational.defect.service.IOperPhenomenonService; import com.hnac.hzims.operational.main.bo.OperationalReportBO; -import com.hnac.hzims.operational.main.service.IMainReportService; import com.hnac.hzims.operational.main.vo.DefectReportVO; import com.hnac.hzims.operational.main.vo.OperationalReportVO; -import com.hnac.hzims.operational.report.vo.PersonalMonthReportVO; -import com.hnac.hzims.operational.report.vo.StationReportAllVO; import com.hnac.hzims.operational.maintenance.constants.MaintenanceConstant; import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity; import com.hnac.hzims.operational.maintenance.service.IOperMaintenanceTaskService; @@ -55,7 +53,7 @@ public class MainReportController extends BladeController { private final IOperMaintenanceTaskService maintenanceTaskService; private final IOperAccessTaskService accessTaskService; - + private final IOperPhenomenonService operPhenomenonService; @ApiLog @ApiOperationSupport(order = 10) @@ -68,16 +66,16 @@ public class MainReportController extends BladeController { Date startTime = DateUtil.parse(startDate, DateUtil.PATTERN_DATE); Date endTime = DateUtil.plusDays(DateUtil.parse(endDate, DateUtil.PATTERN_DATE), 1); - List list = defectService.list(new LambdaQueryWrapper() {{ - gt(OperDefectEntity::getCreateTime, startTime); - le(OperDefectEntity::getCreateTime, endTime); + List list = operPhenomenonService.list(new LambdaQueryWrapper() {{ + ge(OperPhenomenonEntity::getCreateTime, startTime); + le(OperPhenomenonEntity::getCreateTime, endTime); }}); if (CollectionUtil.isEmpty(list)) { return R.data(new HashMap<>()); } //按照日期将查询结果分类 - Map> map = list.stream().collect(Collectors.groupingBy(o -> DateUtil.formatDate(o.getCreateTime()))); + Map> map = list.stream().collect(Collectors.groupingBy(o -> DateUtil.formatDate(o.getCreateTime()))); Map data = new TreeMap<>(); Date date = DateUtil.plusDays(startTime, 0); do { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainWorkBenchController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainWorkBenchController.java index baa7595..9f5cf5a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainWorkBenchController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/controller/MainWorkBenchController.java @@ -87,12 +87,19 @@ public class MainWorkBenchController extends BladeController { * 根据用户权限获取路由 * * @return - */ @ApiLog @ApiOperationSupport(order = 50) @ApiOperation("获取路由") @PostMapping("/getHomePageWorkBench") public R getHomePageWorkBench(@Valid @RequestBody RoutingParamVo vo) { return R.data(workBenchService.getHomePageWorkBench(vo)); + }*/ + + @ApiLog + @ApiOperationSupport(order = 60) + @ApiOperation("首页工作台路由") + @PostMapping("/getHomePageWorkBench") + public R homeStagingRoute(@Valid @RequestBody RoutingParamVo vo) { + return R.data(workBenchService.route(vo)); } } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainWorkBenchMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainWorkBenchMapper.java index 173a0cc..76449c6 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainWorkBenchMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainWorkBenchMapper.java @@ -26,4 +26,6 @@ public interface MainWorkBenchMapper extends UserDataScopeBaseMapper stationTypes,List deptList,@Param("excludeDept") Long excludeDept,@Param("ascriptionUser") Long ascriptionUser); List selectMainWorkBenchByTypes(@Param(value = "type") String type,@Param(value = "refDomains") List refDomains,@Param("refTerminal") String refTerminal,@Param("stationTypes") List stationTypes); + + List stagingRoute(@Param("terminal") String terminal,@Param("types") List types,@Param("category") int category); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainWorkBenchMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainWorkBenchMapper.xml index b5b700f..9d43528 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainWorkBenchMapper.xml +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainWorkBenchMapper.xml @@ -94,5 +94,15 @@ order by ord - + diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IMainWorkBenchService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IMainWorkBenchService.java index cc9e0cd..f52a203 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IMainWorkBenchService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/IMainWorkBenchService.java @@ -38,4 +38,5 @@ public interface IMainWorkBenchService extends BaseService InDustryVo getHomePageWorkBench(RoutingParamVo vo); + InDustryVo route(RoutingParamVo vo); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AppHomeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AppHomeServiceImpl.java index e750044..e9a531c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AppHomeServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AppHomeServiceImpl.java @@ -539,6 +539,7 @@ public class AppHomeServiceImpl implements IAppHomeService { e.printStackTrace(); Thread.currentThread().interrupt(); } + pool.shutdown(); // 任务完成率 int taskSum = item.getDefectSum() + item.getInspectionTaskCount() + item.getMaintenanceTaskCount() + item.getOverhaulTaskCount(); int finishSum = item.getSolvedCount() + item.getInspectionTaskFinishCount() + item.getMaintenanceTaskFinishCount() + item.getOverhaulTaskFinishCount(); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java index 592fae1..f09e610 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java @@ -491,10 +491,12 @@ public class AreaMonthReportServiceImpl implements IAreaMonthReportService { ticketChartCell.setTicketName(value.getFileName()); if (value.getTicketType() == 2) { List yearTicketCollect = Optional.ofNullable(yearTicket.getData()).orElse(new ArrayList<>()).stream() + .filter(s -> s.getSignageCode() != null) .filter(s -> stationId.equals(s.getSignageCode())) .filter(s -> s.getType().equals(value.getType())).collect(Collectors.toList()); List monthTicketCollect = Optional.ofNullable(monthTicket.getData()).orElse(new ArrayList<>()).stream() - .filter(s -> s.getSignageCode().equals(stationId)) + .filter(s -> s.getSignageCode() != null) + .filter(s -> stationId.equals(s.getSignageCode())) .filter(s -> s.getType().equals(value.getType())).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(yearTicketCollect)) { //年合格率和数量 @@ -521,10 +523,12 @@ public class AreaMonthReportServiceImpl implements IAreaMonthReportService { } if (value.getTicketType() == 1) { List yearOperateCollect = Optional.ofNullable(yearOperateTicket.getData()).orElse(new ArrayList<>()).stream() + .filter(s -> s.getSignageCode() != null) .filter(s -> stationId.equals(s.getSignageCode())) .filter(s -> s.getTicketType().equals(value.getType())).collect(Collectors.toList()); List monthOperateCollect = Optional.ofNullable(monthOperateTicket.getData()).orElse(new ArrayList<>()).stream() - .filter(s -> s.getSignageCode().equals(stationId)) + .filter(s -> s.getSignageCode() != null) + .filter(s -> stationId.equals(s.getSignageCode())) .filter(s -> s.getTicketType().equals(value.getType())).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(yearOperateCollect)) { //年合格率和数量 @@ -590,8 +594,8 @@ public class AreaMonthReportServiceImpl implements IAreaMonthReportService { ticketMap2.put("info", "合格率"); ticketMap.put("ticketMon" + ticketType, String.valueOf(chartCell.getTicketMon())); ticketMap.put("ticketYear" + ticketType, String.valueOf(chartCell.getTicketYear())); - ticketMap2.put("ticketMon" + ticketType, chartCell.getTicketMonPerc()* 100 + "%"); - ticketMap2.put("ticketYear" + ticketType, chartCell.getTicketYeaPercr()* 100 + "%"); + ticketMap2.put("ticketMon" + ticketType, new BigDecimal(chartCell.getTicketMonPerc()).multiply(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue() + "%"); + ticketMap2.put("ticketYear" + ticketType,new BigDecimal(chartCell.getTicketYeaPercr()).multiply(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue()+ "%"); } ticketListRes.add(ticketMap); ticketListRes.add(ticketMap2); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomeServiceImpl.java index 717f72e..f047a22 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomeServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HomeServiceImpl.java @@ -474,6 +474,7 @@ public class HomeServiceImpl implements HomeService { e.printStackTrace(); Thread.currentThread().interrupt(); } + exe.shutdown(); return target; } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java index f64551f..500ecd8 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java @@ -26,6 +26,7 @@ import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.system.entity.Dept; import org.springblade.system.feign.ISysClient; +import org.springblade.system.user.cache.UserCache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -176,7 +177,7 @@ public class MainWorkBenchServiceImpl extends BaseServiceImpl list = this.baseMapper.selectMainWorkBenchByType(deptCategory.toString(), null, vo.getRefTerminal(), stations.stream().map(StationEntity::getType).collect(Collectors.toList()), deptList,dept.getId(),user.getUserId()); + List list = this.baseMapper.selectMainWorkBenchByType(deptCategory.toString(), null, vo.getRefTerminal(), stations.stream().map(StationEntity::getType).distinct().collect(Collectors.toList()), deptList,dept.getId(),user.getUserId()); // 路由列表包含指定用户，过滤非指定用户数据 boolean isDesign = CollectionUtil.isNotEmpty(list.stream().filter(o->StringUtils.isNotEmpty(o.getAscriptionUser())).collect(Collectors.toList())); if(isDesign){ @@ -187,4 +188,79 @@ public class MainWorkBenchServiceImpl extends BaseServiceImpl stations = stationService.list(); + if(CollectionUtil.isEmpty(stations)){ + return new InDustryVo(); + } + List types = stations.stream().map(StationEntity::getType).distinct().collect(Collectors.toList()); + // 用户权限机构 + R> result = sysClient.getDeptByCurrentUser(); + if(!result.isSuccess() || CollectionUtil.isEmpty(result.getData())){ + return new InDustryVo(); + } + // 首页分类 + int category = this.userCategory(result.getData()); + List routes = this.baseMapper.stagingRoute(terminal,types,category); + if(CollectionUtil.isEmpty(routes)){ + return new InDustryVo(); + } + // 所属机构 + List depts = result.getData().stream().map(o->o.getId().toString()).collect(Collectors.toList()); + // 所属用户 + String user = AuthUtil.getUserId().toString(); + InDustryVo dustry = new InDustryVo(); + MainWorkBenchExtendVo workBench = new MainWorkBenchExtendVo(); + if(CollectionUtil.isEmpty(routes.stream().filter(o->StringUtils.isNotEmpty(o.getRefDept())).collect(Collectors.toList())) && + CollectionUtil.isEmpty(routes.stream().filter(o->StringUtils.isNotEmpty(o.getAscriptionUser())).collect(Collectors.toList()))){ + // 设置结果集 + workBench.setMainWorkBenchEntityList(routes); + }else if(CollectionUtil.isEmpty(routes.stream().filter(o->StringUtils.isNotEmpty(o.getRefDept())).collect(Collectors.toList()))){ + // 设置结果集 + workBench.setMainWorkBenchEntityList(routes.stream().filter(o->StringUtils.isNotEmpty(o.getAscriptionUser()) && o.getAscriptionUser().contains(user)).collect(Collectors.toList())); + }else{ + // 设置结果集 + workBench.setMainWorkBenchEntityList(routes.stream().filter(o->{ + if(StringUtils.isEmpty(o.getRefDept())){ + return false; + } + for(String deptId: depts) { + if (o.getRefDept().contains(deptId)) { + return true; + } + } + return false; + }).collect(Collectors.toList())); + } + if(CollectionUtil.isEmpty(workBench.getMainWorkBenchEntityList())){ + workBench.setMainWorkBenchEntityList(routes.stream().filter(o-> StringUtils.isEmpty(o.getAscriptionUser()) && StringUtils.isEmpty(o.getRefDept())).collect(Collectors.toList())); + } + dustry.setMainWorkBenchExtendVo(workBench); + return dustry; + } + + /** + * 用户所属机构分类 + * @return + */ + private int userCategory(List depts) { + Dept dept = depts.stream().min(Comparator.comparing(Dept::getDeptCategory)).get(); + if(ObjectUtil.isEmpty(dept)){ + return HomePageConstant.STATION; + } + return dept.getDeptCategory(); + } } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java index b4d081e..3f35b46 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java @@ -94,7 +94,7 @@ public class MaintenanceTaskCreateTask { //生成日常巡检任务并插入数据库 for (int i = startIndex; i < endIndex; i++) { - this.generateTaskByPlan(planEntities.get(i)); + this.generateTaskByPlan(planEntities.get(i),true); } Thread.sleep(1000); @@ -110,18 +110,18 @@ public class MaintenanceTaskCreateTask { * @param planEntity * @return */ - public void generateTaskByPlan(OperMaintenancePlanEntity planEntity) { + public void generateTaskByPlan(OperMaintenancePlanEntity planEntity,Boolean flag) { OperMaintenanceTaskEntity taskEntity = BeanUtil.copy(planEntity,OperMaintenanceTaskEntity.class); //拆分设备 每个设备生成一条任务 if(StringUtil.isNotBlank(planEntity.getEmCode())){ List emCodeList = Arrays.asList(planEntity.getEmCode().split(",")); for(String emCode : emCodeList){ taskEntity.setEmCode(emCode); - maintenanceService.fillTask(taskEntity,planEntity); + maintenanceService.fillTask(taskEntity,planEntity,flag); } } else { - maintenanceService.fillTask(taskEntity,planEntity); + maintenanceService.fillTask(taskEntity,planEntity,flag); } } @@ -195,9 +195,11 @@ public class MaintenanceTaskCreateTask { Map params = new HashMap() {{ put("taskId", taskEntity.getId()); String userId = taskEntity.getDisposer(); - List userIdList = Stream.of(userId.split(",")).collect(Collectors.toList()); - String taskUsers = userIdList.stream().filter(o -> StringUtils.isNotBlank(o)).map(s -> "taskUser_".concat(s)).collect(Collectors.joining(",")); - put("initUserIds", taskUsers); + List userIds = Stream.of(userId.split(",")).collect(Collectors.toList()); + Stream.iterate(0, i -> i + 1).limit(5).forEach(index -> { + String key = index == 0 ? "initUserIds" : "initUserIds".concat(String.valueOf(index)); + put(key,index + 1 > userIds.size() ? "" : "taskUser_".concat(userIds.get(index))); + }); put("operMaintenanceTaskEntityVo",vo); }}; R flowResult = flowClient.startProcessInstanceContainNameByKey(processDefinitionKey, String.valueOf(taskEntity.getId()), taskEntity.getTitle(), params); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/MaintenanceService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/MaintenanceService.java index c370508..d58df2a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/MaintenanceService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/MaintenanceService.java @@ -38,5 +38,5 @@ public interface MaintenanceService { * @param taskEntity * @param finalPlanEntity */ - void fillTask(OperMaintenanceTaskEntity taskEntity, OperMaintenancePlanEntity finalPlanEntity); + void fillTask(OperMaintenanceTaskEntity taskEntity, OperMaintenancePlanEntity finalPlanEntity,Boolean flag); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java index 8983c96..445c4e7 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java @@ -6,10 +6,10 @@ import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.google.common.collect.Lists; import com.hnac.hzims.common.utils.DateUtil; import com.hnac.hzims.message.MessageConstants; import com.hnac.hzims.message.dto.BusinessMessageDTO; -import com.hnac.hzims.message.dto.MessagePushRecordDto; import com.hnac.hzims.message.dto.PlanMsgRecordDto; import com.hnac.hzims.message.entity.config.MessageTemplateEntity; import com.hnac.hzims.message.fegin.IMessageClient; @@ -34,8 +34,6 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.*; import org.springblade.flow.core.feign.IFlowClient; import org.springblade.system.feign.ISysClient; -import org.springblade.system.user.cache.UserCache; -import org.springblade.system.user.entity.User; import org.springframework.beans.BeanUtils; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.stereotype.Service; @@ -51,7 +49,6 @@ import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; import java.util.concurrent.ThreadPoolExecutor; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -273,13 +270,13 @@ public class MaintenanceServiceImpl implements MaintenanceService { //拆分设备 每个设备生成一条任务 if (StringUtil.isNotBlank(finalPlanEntity.getEmCode())) { log.info("finalPlanEntity.getEmCode() : {}", finalPlanEntity.getEmCode()); - List emCodeList = Arrays.asList(finalPlanEntity.getEmCode().split(",")); + String[] emCodeList = finalPlanEntity.getEmCode().split(","); for (String emCode : emCodeList) { taskEntity.setEmCode(emCode); - this.fillTask(taskEntity, finalPlanEntity); + this.fillTask(taskEntity, finalPlanEntity,false); } } else { - this.fillTask(taskEntity, finalPlanEntity); + this.fillTask(taskEntity, finalPlanEntity,false); } } @@ -291,7 +288,7 @@ public class MaintenanceServiceImpl implements MaintenanceService { * @param taskEntity * @param finalPlanEntity */ - public void fillTask(OperMaintenanceTaskEntity taskEntity, OperMaintenancePlanEntity finalPlanEntity) { + public void fillTask(OperMaintenanceTaskEntity taskEntity, OperMaintenancePlanEntity finalPlanEntity,Boolean flag) { DefaultTransactionDefinition defaultTransactionDefinition = new DefaultTransactionDefinition(); defaultTransactionDefinition.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); TransactionStatus transaction = dataSourceTransactionManager.getTransaction(defaultTransactionDefinition); @@ -327,7 +324,7 @@ public class MaintenanceServiceImpl implements MaintenanceService { taskService.save(taskEntity); dataSourceTransactionManager.commit(transaction); //启动流程 - String processInstanceId = this.startProcess(finalPlanEntity.getProcDefId(), taskEntity); + String processInstanceId = this.startProcess(finalPlanEntity.getProcDefId(), taskEntity,flag); //推送消息 CompletableFuture operMaintenanceTaskEntityCompletableFuture = CompletableFuture.runAsync(() -> { @@ -354,28 +351,29 @@ public class MaintenanceServiceImpl implements MaintenanceService { * * @author xiashandong **/ - private String startProcess(String processDefinitionKey, OperMaintenanceTaskEntity taskEntity) { + private String startProcess(String processDefinitionKey, OperMaintenanceTaskEntity taskEntity,Boolean flag) { OperMaintenanceTaskEntityVo operMaintenanceTaskEntityVo = new OperMaintenanceTaskEntityVo(); BeanUtils.copyProperties(taskEntity, operMaintenanceTaskEntityVo); Map params = new HashMap<>(); params.put("taskId", taskEntity.getId()); - List userIdList = Stream.of(taskEntity.getDisposer().split(",")).collect(Collectors.toList()); - String taskUsers = userIdList.stream().filter(o -> StringUtils.isNotBlank(o)).map(s -> { - return "taskUser_".concat(s); - }).collect(Collectors.joining(",")); - params.put("initUserIds", taskUsers); + if(flag){ + params.put("startFlowUserId", taskEntity.getCreateUser().toString()); + } + List userIds = Stream.of(taskEntity.getDisposer().split(",")).collect(Collectors.toList()); + Stream.iterate(0, i -> i + 1).limit(5).forEach(index -> { + String key = index == 0 ? "initUserIds" : "initUserIds".concat(String.valueOf(index)); + params.put(key,index + 1 > userIds.size() ? "" : "taskUser_".concat(userIds.get(index))); + }); params.put("operMaintenanceTaskEntityVo", operMaintenanceTaskEntityVo); - return flowClient.startProcessInstanceContainNameByKey(processDefinitionKey, String.valueOf(taskEntity.getId()), taskEntity.getTitle(), params).getData().getProcessInstanceId(); } + /* + 推送日常维护任务消息 - /** - * 推送日常维护任务消息 - * - * @return void + @return void * @Param taskEntity 日常维护任务 - **/ + */ private void pushTaskMessage(OperMaintenanceTaskEntity taskEntity) { log.info("开始保存{}的日常维护消息推送记录", taskEntity.getDisposer()); R templateR = messageClient.getMsgTemplateById(taskEntity.getMessageTemplateId()); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenancePlanServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenancePlanServiceImpl.java index 59297a6..2099a87 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenancePlanServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenancePlanServiceImpl.java @@ -108,7 +108,7 @@ public class OperMaintenancePlanServiceImpl extends BaseServiceImpl { try{ - schedule.generateTaskByPlan(planEntity); + schedule.generateTaskByPlan(planEntity,false); //更新任务派发时间 this.update(new LambdaUpdateWrapper().set(OperMaintenancePlanEntity::getCreateTaskTime,new Date()) .eq(OperMaintenancePlanEntity::getId,planEntity.getId())); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperPersonalMonthReportServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperPersonalMonthReportServiceImpl.java index 0bcc2e0..a401ebf 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperPersonalMonthReportServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperPersonalMonthReportServiceImpl.java @@ -7,15 +7,14 @@ import com.hnac.hzims.operational.access.service.IOperAccessTaskService; import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; import com.hnac.hzims.operational.defect.service.IOperPhenomenonService; import com.hnac.hzims.operational.duty.service.IImsDutyMainService; -import com.hnac.hzims.operational.main.common.ExcelData; import com.hnac.hzims.operational.main.vo.DutyPersonalReportVO; -import com.hnac.hzims.operational.report.vo.PersonalMonthReportVO; -import com.hnac.hzims.operational.report.vo.PersonalMonthsReportVO; import com.hnac.hzims.operational.maintenance.constants.MaintenanceConstant; import com.hnac.hzims.operational.maintenance.entity.OperMaintenanceTaskEntity; import com.hnac.hzims.operational.maintenance.service.IOperMaintenanceTaskService; import com.hnac.hzims.operational.report.constants.ReportConstant; import com.hnac.hzims.operational.report.service.IOperPersonalMonthReportService; +import com.hnac.hzims.operational.report.vo.PersonalMonthReportVO; +import com.hnac.hzims.operational.report.vo.PersonalMonthsReportVO; import com.hnac.hzinfo.inspect.gather.entity.TaskGatherEntity; import com.hnac.hzinfo.inspect.gather.feign.IInspectGatherClient; import com.hnac.hzinfo.inspect.task.TaskContants; @@ -28,6 +27,7 @@ import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.ObjectUtil; import org.springframework.beans.BeanUtils; +import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; @@ -36,10 +36,14 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.io.InputStream; import java.net.URLEncoder; import java.text.DateFormat; import java.text.SimpleDateFormat; -import java.time.*; +import java.time.Duration; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAdjusters; import java.util.*; @@ -119,8 +123,14 @@ public class OperPersonalMonthReportServiceImpl implements IOperPersonalMonthRep PersonalMonthReportVO personalMonthReportVO = this.getPersonalMonthReport(month, AuthUtil.getUserId()); if(ObjectUtil.isNotEmpty(personalMonthReportVO)){ int currentRowNum = 0; - ExcelData ed = new ExcelData(); - XSSFWorkbook readWb = ed.getWb(); + XSSFWorkbook readWb = new XSSFWorkbook(); + try { + ClassPathResource classPathResource = new ClassPathResource("files/运维月度报表-个人报表.xlsx"); + InputStream inputStream =classPathResource.getInputStream(); + readWb = new XSSFWorkbook(inputStream); + } catch (Exception e) { + e.printStackTrace(); + } XSSFSheet readSheet = readWb.getSheet("个人月度报告"); String title = Optional.ofNullable(personalMonthReportVO).map(PersonalMonthReportVO :: getStationName).orElse("")+month+"月个人月总结报告"; readSheet.getRow(currentRowNum).getCell(0).setCellValue(title); @@ -178,7 +188,7 @@ public class OperPersonalMonthReportServiceImpl implements IOperPersonalMonthRep RequestAttributes requestAttributes = RequestContextHolder.currentRequestAttributes(); HttpServletResponse response = ((ServletRequestAttributes)requestAttributes).getResponse(); readWb.setSheetHidden(0,true); - readWb.setSheetHidden(1,true); +// readWb.setSheetHidden(1,true); String filename = "("+month+")个人月度报告"; // 设置头信息 response.setCharacterEncoding("UTF-8"); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java index a804f77..ccf516a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java @@ -441,7 +441,6 @@ public class StationServiceImpl extends BaseServiceImpl getStationType(Integer serveType, List typeList, List departIdList,boolean make) { return this.list(new LambdaQueryWrapper() {{ - eq(StationEntity::getIsDeleted, 0); if (ObjectUtil.isNotEmpty(serveType)) { eq(StationEntity::getServeType, serveType); } diff --git a/hzims-service/operational/src/main/resources/files/运维月度报表-个人报表.xlsx b/hzims-service/operational/src/main/resources/files/运维月度报表-个人报表.xlsx new file mode 100644 index 0000000..a5b7438 Binary files /dev/null and b/hzims-service/operational/src/main/resources/files/运维月度报表-个人报表.xlsx differ diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/controller/WorkAreaController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/controller/WorkAreaController.java new file mode 100644 index 0000000..b8de9d9 --- /dev/null +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/controller/WorkAreaController.java @@ -0,0 +1,63 @@ +package com.hnac.hzims.safeproduct.workarea.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hnac.hzims.safeproduct.workarea.entity.WorkArea; +import com.hnac.hzims.safeproduct.workarea.service.WorkAreaService; +import com.hnac.hzims.safeproduct.workarea.vo.WorkAreaQueryVo; +import lombok.RequiredArgsConstructor; +import org.springblade.core.tool.api.R; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RequiredArgsConstructor +@RestController +@RequestMapping("/workarea") +public class WorkAreaController { + + @Autowired + WorkAreaService workAreaService; + + /** + * 分页查询 + */ + @GetMapping("/listPage/{page}/{size}") + public R listPage(@PathVariable Long page, + @PathVariable Long size, + WorkAreaQueryVo workAreaQueryVo) { + Page pageParam = new Page<>(page, size); + IPage resultParams = + workAreaService.selectPage(pageParam, + workAreaQueryVo); + return R.data(resultParams); + } + + /** + * 新增工作区域数据 + */ + @PostMapping("/save") + public R save(@RequestBody WorkArea workArea) { + workAreaService.saveWorkArea(workArea); + return R.success("新增成功"); + } + + + /** + * 更新工作区域数据 + */ + @PutMapping("/update") + public R update(@RequestBody WorkArea workArea) { + workAreaService.updateWorkArea(workArea); + return R.success("修改成功"); + } + + + /** + * 删除工作区域数据 + */ + @DeleteMapping("/remove/{id}") + public R remove(@PathVariable Long id) { + workAreaService.removeById(id); + return R.success("删除成功"); + } +} diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/mapper/WorkAreaMapper.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/mapper/WorkAreaMapper.java new file mode 100644 index 0000000..f3e3dba --- /dev/null +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/mapper/WorkAreaMapper.java @@ -0,0 +1,7 @@ +package com.hnac.hzims.safeproduct.workarea.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hnac.hzims.safeproduct.workarea.entity.WorkArea; + +public interface WorkAreaMapper extends BaseMapper { +} diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/service/WorkAreaService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/service/WorkAreaService.java new file mode 100644 index 0000000..645db2d --- /dev/null +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/service/WorkAreaService.java @@ -0,0 +1,22 @@ +package com.hnac.hzims.safeproduct.workarea.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.hnac.hzims.safeproduct.workarea.entity.WorkArea; +import com.hnac.hzims.safeproduct.workarea.vo.WorkAreaQueryVo; + +public interface WorkAreaService extends IService { + + /** + * 分页查询 + * @param pageParam + * @param workAreaQueryVo + * @return + */ + IPage selectPage(Page pageParam, WorkAreaQueryVo workAreaQueryVo); + + void saveWorkArea(WorkArea workArea); + + void updateWorkArea(WorkArea workArea); +} diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/service/impl/WorkAreaServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/service/impl/WorkAreaServiceImpl.java new file mode 100644 index 0000000..52f07e5 --- /dev/null +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/workarea/service/impl/WorkAreaServiceImpl.java @@ -0,0 +1,93 @@ +package com.hnac.hzims.safeproduct.workarea.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hnac.hzims.safeproduct.workarea.entity.WorkArea; +import com.hnac.hzims.safeproduct.workarea.mapper.WorkAreaMapper; +import com.hnac.hzims.safeproduct.workarea.service.WorkAreaService; +import com.hnac.hzims.safeproduct.workarea.vo.WorkAreaQueryVo; +import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.tool.utils.ObjectUtil; +import org.springblade.system.cache.SysCache; +import org.springblade.system.entity.Dept; +import org.springblade.system.user.cache.UserCache; +import org.springblade.system.user.entity.User; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class WorkAreaServiceImpl extends ServiceImpl implements WorkAreaService { + + @Override + public IPage selectPage(Page pageParam, WorkAreaQueryVo workAreaQueryVo) { + String areaName = workAreaQueryVo.getAreaName(); + Long directOpId = workAreaQueryVo.getDirectOpId(); + Long leadOpId = workAreaQueryVo.getLeadOpId(); + Long departId = workAreaQueryVo.getDepartId(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotBlank(areaName)) { + queryWrapper.like(WorkArea::getAreaName,areaName); + } + if (ObjectUtil.isNotEmpty(directOpId)) { + queryWrapper.eq(WorkArea::getDirectOpId, directOpId); + } + if (ObjectUtil.isNotEmpty(leadOpId)) { + queryWrapper.eq(WorkArea::getLeadOpId, leadOpId); + } + if (ObjectUtil.isNotEmpty(departId)) { + queryWrapper.eq(WorkArea::getDepartId, departId); + } + IPage workAreaIPage = baseMapper.selectPage(pageParam, queryWrapper); + + //翻译 + List records = workAreaIPage.getRecords(); + records.stream().forEach(workArea -> { + User directOp = UserCache.getUser(workArea.getDirectOpId()); + String directOpName = directOp.getName(); + User leadOp = UserCache.getUser(workArea.getLeadOpId()); + String leadOpName = leadOp.getName(); + Dept dept = SysCache.getDept(workArea.getDepartId()); + String deptName = dept.getDeptName(); + workArea.setDirectOpName(directOpName); + workArea.setLeadOpName(leadOpName); + workArea.setDepartName(deptName); + }); + + return workAreaIPage; + } + + @Override + public void saveWorkArea(WorkArea workArea) { + checkOpAndDept(workArea); + this.save(workArea); + } + + @Override + public void updateWorkArea(WorkArea workArea) { + checkOpAndDept(workArea); + this.updateById(workArea); + } + + /** + * 校验员工id、部门id是否存在 + * @param workArea + */ + private void checkOpAndDept(WorkArea workArea) { + Long directOpId = workArea.getDirectOpId(); + Long leadOpId = workArea.getLeadOpId(); + Long departId = workArea.getDepartId(); + User user = UserCache.getUser(directOpId); + User user1 = UserCache.getUser(leadOpId); + if (user == null || user1 == null) { + throw new ServiceException("员工不存在，保存失败"); + } + Dept dept = SysCache.getDept(departId); + if (dept == null) { + throw new ServiceException("部门不存在，保存失败"); + } + } +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClient.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClient.java index e8a2dd7..5b93bba 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClient.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClient.java @@ -1,6 +1,7 @@ package com.hnac.hzims.ticket.allTicket.fegin; import com.google.common.collect.Lists; +import com.hnac.hzims.ticket.allTicket.dto.TicketStatisticDTO; import com.hnac.hzims.ticket.allTicket.service.TicketInfoStatisticService; import com.hnac.hzims.ticket.allTicket.vo.DoublePassRateVO; import com.hnac.hzims.ticket.allTicket.vo.DoublePassVO; @@ -10,6 +11,7 @@ import com.hnac.hzims.ticket.twoTicket.service.IFirstWorkTicketService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.StringUtil; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; @@ -70,4 +72,9 @@ public class TicketInfoAllClient implements ITicketInfoAllClient { public List getDoublePassQuantity(Map stationMap, LocalDateTime firstDateTime, LocalDateTime now) { return standardTicketInfoService.getDoublePassQuantity(stationMap,firstDateTime,now); } + + @Override + public R getTicketPassRate(TicketStatisticDTO ticketStatisticDTO) { + return null; + } } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/ITicketInfoAlService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/ITicketInfoAlService.java new file mode 100644 index 0000000..274fb7c --- /dev/null +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/ITicketInfoAlService.java @@ -0,0 +1,4 @@ +package com.hnac.hzims.ticket.allTicket.service; + +public interface ITicketInfoAlService { +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/StandardTicketInfoMapper.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/StandardTicketInfoMapper.java index 704ce9f..cf61c9f 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/StandardTicketInfoMapper.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/StandardTicketInfoMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity; import com.hnac.hzims.ticket.standardTicket.vo.OperateTicketStatisticVO; +import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; import com.hnac.hzims.vo.SafeCheckStatisticVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -55,4 +56,6 @@ public interface StandardTicketInfoMapper extends UserDataScopeBaseMapper selectPages(Page searchPage, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List selectTicketList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/xml/StandardTicketInfoMapper.xml b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/xml/StandardTicketInfoMapper.xml index 6996bd2..8b7359a 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/xml/StandardTicketInfoMapper.xml +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/xml/StandardTicketInfoMapper.xml @@ -82,4 +82,9 @@ hzims_ticket_info_evaluate tie on sti.id = tie.ticket_id ${ew.customSqlSegment} + diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java index 4da8447..f67d3ea 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java @@ -28,16 +28,14 @@ import com.hnac.hzims.ticket.standardTicket.vo.OperateTicketStatisticVO; import com.hnac.hzims.ticket.standardTicket.vo.StandardTicketInfoVO; import com.hnac.hzims.ticket.standardTicket.vo.StandardTicketMeasureVO; import com.hnac.hzims.ticket.standardTicket.wrapper.StandardTicketInfoWrapper; -import com.hnac.hzims.ticket.twoTicket.vo.ticket.StandardTicketCountQueryVo; -import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountQueryVo; import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketInfoVo; import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketMeasureVo; +import com.hnac.hzims.ticket.twoTicket.vo.ticket.StandardTicketCountQueryVo; import com.hnac.hzims.ticket.utils.ExcelUtil; import com.hnac.hzims.ticket.utils.PdfUtils; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; import com.hnac.hzims.ticket.workTicket.service.IWorkTicketInfoService; import com.hnac.hzims.ticket.workTicket.vo.TicketMonthVO; -import com.hnac.hzims.ticket.workTicket.vo.WorkTicketInfoVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -680,7 +678,7 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl operateTicketReportStatistic = this.baseMapper.getOperateTicketReportStatistic(startDate, endDate, deptIdList); if (CollectionUtil.isNotEmpty(operateTicketReportStatistic)) { //已完成数量 - int ticketInfoCompleteNum = operateTicketReportStatistic.stream().filter(ticket -> TicketConstants.StandardTicketStatusEnum.END.getStatus().equals(ticket.getStatus())).collect(Collectors.toList()).size(); + int ticketInfoCompleteNum = operateTicketReportStatistic.stream().filter(item -> "结束".equals(item.getFlowTaskName())).collect(Collectors.toList()).size(); //合格数量 int ticketInfoQualifiedNum = operateTicketReportStatistic.stream().filter(ticket -> Func.isNotEmpty(ticket.getEvaluation()) && 1 == ticket.getEvaluation().intValue()).collect(Collectors.toList()).size(); //计算合格率 diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java index b207705..441dad5 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/FirstWorkTicketServiceImpl.java @@ -47,7 +47,6 @@ import org.springblade.system.user.entity.User; import org.springblade.system.user.feign.IUserClient; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -58,7 +57,6 @@ import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** @@ -885,13 +883,12 @@ public class FirstWorkTicketServiceImpl extends BaseServiceImpl workTicketReportStatistic = this.baseMapper.getWorkTicketReportStatistic(startDate, endDate, deptIdList); if(CollectionUtil.isNotEmpty(workTicketReportStatistic)) { // 工作票完成数量 - int ticketInfoCompleteNum = workTicketReportStatistic.stream().filter( - ticket-> WorkTicketConstants.FirstWorkTicketStatusEnum.FINISH.getStatus().equals(ticket.getStatus()) - ).collect(Collectors.toList()).size(); + int ticketInfoCompleteNum = workTicketReportStatistic.stream().filter(item -> "结束".equals(item.getFlowTaskName())) + .collect(Collectors.toList()).size(); // 工作票未完成数量 int ticketInfoStartNum = workTicketReportStatistic.size() - ticketInfoCompleteNum; // 延期数量统计 - int ticketInfoDelayNum = workTicketReportStatistic.stream().filter(ticket -> Func.isNotEmpty(ticket.getDelayId())) + int ticketInfoDelayNum = workTicketReportStatistic.stream().filter(item -> "延期".equals(item.getInput())) .collect(Collectors.toList()).size(); // 合格数量统计 int ticketInfoQualifiedNum = workTicketReportStatistic.stream().filter(ticket -> Func.isNotEmpty(ticket.getEvaluation()) && ticket.getEvaluation().intValue() == 1) diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/WorkTicketInfoMapper.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/WorkTicketInfoMapper.java index 8f931f5..1133d28 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/WorkTicketInfoMapper.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/WorkTicketInfoMapper.java @@ -67,4 +67,7 @@ public interface WorkTicketInfoMapper extends UserDataScopeBaseMapper queryWrapper); List getWorkTicketBill(@Param("path") String path, @Param("startTime") String startTime, @Param("endTime") String endTime); + + @UserDataAuth + List selectTicketList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/xml/WorkTicketInfoMapper.xml b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/xml/WorkTicketInfoMapper.xml index 2d8173d..0261275 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/xml/WorkTicketInfoMapper.xml +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/xml/WorkTicketInfoMapper.xml @@ -106,4 +106,11 @@ GROUP BY info.EM_CODE,info.`type` + + + diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java index 67950c1..d8c63a5 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java @@ -178,4 +178,6 @@ public interface IWorkTicketInfoService extends BaseService listByTicketWithKeyword(Page entityPage, TicketCountQueryVo ticketCountQueryVo); + + } diff --git a/hzims-service/ticket/src/main/resources/application.yml b/hzims-service/ticket/src/main/resources/application.yml index 2af9d8e..a69f0f3 100644 --- a/hzims-service/ticket/src/main/resources/application.yml +++ b/hzims-service/ticket/src/main/resources/application.yml @@ -56,16 +56,3 @@ swagger: # flowId: sid-6358A80D-F592-4875-B281-A5B14A0EA39E # segment: 工作票延期 - -xxl: - job: - accessToken: '' - admin: - addresses: http://192.168.1.20:7009/xxl-job-admin - executor: - appname: hzims-ticket - ip: 192.168.1.3 - logpath: /data/applogs/xxl-job/jobhandler - logretentiondays: -1 - port: 28601 - diff --git a/hzims-service/ticket/src/main/resources/db/2.0.0.sql b/hzims-service/ticket/src/main/resources/db/2.0.0.sql index ecd99b4..ed7ad42 100644 --- a/hzims-service/ticket/src/main/resources/db/2.0.0.sql +++ b/hzims-service/ticket/src/main/resources/db/2.0.0.sql @@ -157,3 +157,17 @@ update hzims_standard_ticket_info set flow_task_name = '终止' where status = alter table hzims_ticket_count add wrong_ticket_num int null comment '错票数量'; alter table hzims_ticket_count add percent_pass_ticket varchar(50) null comment '合格率'; + +-- 两票开票视图 +create or replace view v_hzims_ticket_info as +select hzims_ticket_info.* from +(select `id`, `process_instance_id`, `type`, `company`, `code`, `task_type`, `task_id`, `task_name`, `plan_start_time`, + `plan_end_time`, `status`,`tenant_id`, `create_user`, `create_time`, `update_user`, `update_time`, `is_deleted`, + `create_dept`,`flow_description` + from hzims_work_ticket_info + union all + select `id`, `process_instance_id`, `ticket_type` type, `company`, `code`, `task_type`, `task_id`, `task_name`, + `start_time` plan_start_time, `end_time` plan_end_time, `status`,`tenant_id`, `create_user`, `create_time`, + `update_user`, `update_time`, `is_deleted`, `create_dept`,`flow_description` + from hzims_standard_ticket_info +) hzims_ticket_info where hzims_ticket_info.IS_DELETED = 0; diff --git a/pom.xml b/pom.xml index 0e4b066..02336a9 100644 --- a/pom.xml +++ b/pom.xml @@ -46,11 +46,6 @@ org.springblade - blade-starter-datascope - ${bladex.project.version} - - - org.springblade blade-system-api ${bladex.project.version}