Merge remote-tracking branch 'origin/master'

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
+//@Aspect
-@Component
+//@Component
 @Slf4j
 public class SysLogAspect {
 

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 = "检测类型子类")

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;
+
+}

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;
+
+}

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<DoublePassVO> getDoublePassQuantity(@RequestParam(value = "stationMap") Map<String,String> stationMap,
 											 @RequestParam(value = "firstDateTime") LocalDateTime firstDateTime,
 											 @RequestParam(value = "now") LocalDateTime now);
+
+	@GetMapping(GET_TICKET_PASS_RATE)
+	R<DoublePassRateVO> getTicketPassRate(TicketStatisticDTO ticketStatisticDTO);
 }

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<DoublePassVO> getDoublePassQuantity(Map<String, String> stationMap, LocalDateTime firstDateTime, LocalDateTime now) {
 		return null;
 	}
+
+	@Override
+	public R<DoublePassRateVO> getTicketPassRate(TicketStatisticDTO ticketStatisticDTO) {
+		return null;
+	}
 }

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/services/IContentDefinitionService.java

@@ -26,13 +26,10 @@ public interface IContentDefinitionService extends BaseService<ContentDefinition
     List<ContentDefinitionVO> list(ContentDefinitionDTO request);
 
     default LambdaQueryWrapper<ContentDefinitionEntity> getQueryWrapper(ContentDefinitionEntity entity) {
-        LambdaQueryWrapper<ContentDefinitionEntity> queryWrapper = Condition.getQueryWrapper(entity,ContentDefinitionEntity.class);
+        LambdaQueryWrapper<ContentDefinitionEntity> 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)
+                .eq(Func.isNotEmpty(entity.getStatus()), ContentDefinitionEntity::getStatus, entity.getStatus()).orderByDesc(ContentDefinitionEntity::getCreateTime);
-                .eq(Func.isNotEmpty(entity.getCheckType()),ContentDefinitionEntity::getCheckType,entity.getCheckType())
-                .eq(Func.isNotEmpty(entity.getRecordType()),ContentDefinitionEntity::getRecordType,entity.getRecordType())
-                .like(Func.isNotEmpty(entity.getName()),ContentDefinitionEntity::getName,entity.getName());
         return queryWrapper;
     }
 

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/TaskJob.java

@@ -106,7 +106,7 @@ public class TaskJob {
     	UpdateWrapper<TaskEntity> 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);
     }
 

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);
+//				remindCacheManager.addTaskToCacheList(task);
-				taskVideoManager.addTaskToVideoCacheList(task);
+//				taskVideoManager.addTaskToVideoCacheList(task);
 			}
 		}
 		if (taskUserList.size() > 0) {

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);
+//				remindCacheManager.addTaskToCacheList(task);
-				taskVideoManager.addTaskToVideoCacheList(task);
+//				taskVideoManager.addTaskToVideoCacheList(task);
 			}
 			String reason  = this.distributeTaskObjs(plan,task);
 			if(reason.equals(StringUtils.EMPTY)){

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskCreateTask.java

@@ -195,17 +195,11 @@ public class MaintenanceTaskCreateTask {
 		Map<String,Object> params = new HashMap<String, Object>() {{
 			put("taskId", taskEntity.getId());
 			String userId = taskEntity.getDisposer();
-			String[] userArr = taskEntity.getDisposer().split(",");
+			List<String> userIds = Stream.of(userId.split(",")).collect(Collectors.toList());
-			for(int index = 0; index < userArr.length ; index++){
+			Stream.iterate(0, i -> i + 1).limit(5).forEach(index -> {
-				if(index > 4){
+				String key = index == 0 ? "initUserIds" : "initUserIds".concat(String.valueOf(index));
-					continue;
+				put(key,index + 1 > userIds.size() ? "" :  "taskUser_".concat(userIds.get(index)));
-				}
+			});
-				if(index > 0){
-					put("initUserIds" + index , "taskUser_".concat(userArr[index]));
-				}else{
-					put("initUserIds", "taskUser_".concat(userArr[index]));
-				}
-			}
 			put("operMaintenanceTaskEntityVo",vo);
 		}};
 		R<BladeFlow> flowResult = flowClient.startProcessInstanceContainNameByKey(processDefinitionKey, String.valueOf(taskEntity.getId()), taskEntity.getTitle(), params);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceServiceImpl.java

@@ -6,6 +6,7 @@ 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;
@@ -50,6 +51,7 @@ import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.springblade.core.tool.utils.DateUtil.PATTERN_DATE;
 
@@ -357,22 +359,15 @@ public class MaintenanceServiceImpl implements MaintenanceService {
         if(flag){
             params.put("startFlowUserId", taskEntity.getCreateUser().toString());
         }
-        String[] userArr = taskEntity.getDisposer().split(",");
+        List<String> userIds = Stream.of(taskEntity.getDisposer().split(",")).collect(Collectors.toList());
-        for(int index = 0; index < userArr.length ; index++){
+        Stream.iterate(0, i -> i + 1).limit(5).forEach(index -> {
-            if(index > 4){
+            String key = index == 0 ? "initUserIds" : "initUserIds".concat(String.valueOf(index));
-                continue;
+            params.put(key,index + 1 > userIds.size() ? "" :  "taskUser_".concat(userIds.get(index)));
-            }
+        });
-            if(index > 0){
-                params.put("initUserIds" + index , "taskUser_".concat(userArr[index]));
-            }else{
-                params.put("initUserIds", "taskUser_".concat(userArr[index]));
-            }
-        }
         params.put("operMaintenanceTaskEntityVo", operMaintenanceTaskEntityVo);
         return flowClient.startProcessInstanceContainNameByKey(processDefinitionKey, String.valueOf(taskEntity.getId()), taskEntity.getTitle(), params).getData().getProcessInstanceId();
     }
 
-
     /*
       推送日常维护任务消息
 

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<DoublePassVO> getDoublePassQuantity(Map<String, String> stationMap, LocalDateTime firstDateTime, LocalDateTime now) {
 		return standardTicketInfoService.getDoublePassQuantity(stationMap,firstDateTime,now);
 	}
+
+	@Override
+	public R<DoublePassRateVO> getTicketPassRate(TicketStatisticDTO ticketStatisticDTO) {
+		return null;
+	}
 }

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 {
+}

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<Standa
 	 */
     Page<StandardTicketInfoEntity> selectPages(Page<StandardTicketInfoEntity> searchPage,
 											   @Param(Constants.WRAPPER) QueryWrapper<StandardTicketInfoEntity> queryWrapper);
+
+	List<Map> selectTicketList(@Param(Constants.WRAPPER) QueryWrapper<StandardTicketInfoEntity> queryWrapper);
 }

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}
     </select>
+    <select id="selectTicketList" resultType="java.util.Map">
+        select ti.*,tie.`status` isPass from hzims_standard_ticket_info ti
+        left join hzims_ticket_info_evaluate tie on ti.id = tie.ticket_id and tie.is_deleted = 0
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/WorkTicketInfoMapper.java

@@ -67,4 +67,7 @@ public interface WorkTicketInfoMapper extends UserDataScopeBaseMapper<WorkTicket
                                            @Param(Constants.WRAPPER) QueryWrapper<WorkTicketInfoEntity> queryWrapper);
 
     List<WorkTicketBillVO> getWorkTicketBill(@Param("path") String path, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    @UserDataAuth
+    List<Map> selectTicketList(@Param(Constants.WRAPPER) QueryWrapper<WorkTicketInfoEntity> queryWrapper);
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/xml/WorkTicketInfoMapper.xml

@@ -106,4 +106,11 @@
         </where>
         GROUP BY info.EM_CODE,info.`type`
     </select>
+    <select id="selectTicketList" resultType="java.util.Map">
+        select ti.*,tie.`status` isPass from hzims_work_ticket_info ti
+        left join hzims_ticket_info_evaluate tie on ti.id = tie.ticket_id and tie.is_deleted = 0
+        ${ew.customSqlSegment}
+    </select>
+
+
 </mapper>

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java

@@ -178,4 +178,6 @@ public interface IWorkTicketInfoService extends BaseService<WorkTicketInfoEntity
 	 * @return
 	 */
 	IPage<WorkTicketInfoVO> listByTicketWithKeyword(Page<WorkTicketInfoEntity> entityPage, TicketCountQueryVo ticketCountQueryVo);
+
+
 }

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
-

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;