1.概览大屏右侧-使用登记统计提交修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DPStatisticsServiceImpl.java

@@ -66,7 +66,7 @@ public class DPStatisticsServiceImpl {
         //2.2 x轴数据构造
         result.put("xdata", this.getXData(equipmentCategoryDtos));
         //2.3 y轴数据构造
-        this.buildYData(result, legendDataDtos, dpFilterParamDto, equipmentCategoryDtos);
+        this.buildYData(result, dpFilterParamDto, equipmentCategoryDtos);
         return result;
     }
 
@@ -78,7 +78,7 @@ public class DPStatisticsServiceImpl {
         return legendDataDtos;
     }
 
-    private void buildYData(Map<String, Object> result, List<LegendDataDto> legendDataDtos, DPFilterParamDto dpFilterParamDto, List<EquipmentCategoryDto> equipmentCategoryDtos) {
+    private void buildYData(Map<String, Object> result, DPFilterParamDto dpFilterParamDto, List<EquipmentCategoryDto> equipmentCategoryDtos) {
         // 待统计的数据本来sql可以单独统计，但是要求气瓶单独从压力容器里拎出来，与八大类同级，故java处理
         // 1.新增登记统计
         result.put("newDevice", this.getNewDeviceCountData(dpFilterParamDto, equipmentCategoryDtos));

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionApplicationEquipMapper.java

 package com.yeejoin.amos.boot.module.jyjc.api.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectTimeCountDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationEquip;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jyjc.api.model.DPFilterParamDto;
 
 import java.util.List;
 
@@ -18,6 +18,7 @@ public interface JyjcInspectionApplicationEquipMapper extends BaseMapper<JyjcIns
 
     /**
      * 检验检测次数统计维度按照设备种类、检验类型进行统计
+     *
      * @param dpFilterParamDto g过滤条件
      * @return 统计列表
      */

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/DPFilterParamDto.java

-package com.yeejoin.amos.boot.module.jyjc.api.model;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * 大屏筛选过滤对象
- *
- * @author Administrator
- */
-@Data
-public class DPFilterParamDto {
-    /**
-     * 区域
-     */
-    @NotBlank(message = "区域编码不能为空！")
-    private String cityCode;
-
-    /**
-     * 数据统计的开始日期
-     */
-    private String beginDate;
-
-    /**
-     * 数据统计的结束日期
-     */
-    private String endDate;
-}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/DPStatisticsController.java

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
-import com.yeejoin.amos.boot.module.jyjc.api.model.DPFilterParamDto;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.DPStatisticsServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/CmWorkflowServiceImpl.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 
 import com.alibaba.fastjson.JSONObject;
-
 import com.yeejoin.amos.boot.module.jyjc.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/DPStatisticsServiceImpl.java

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectTimeCountDto;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.BizTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationEquipMapper;
-import com.yeejoin.amos.boot.module.jyjc.api.model.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import org.apache.commons.lang3.StringUtils;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationAttachmentServiceImpl.java

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationAttachment;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationAttachmentMapper;
-import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationAttachmentService;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationAttachmentModel;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
+import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationAttachmentService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
 
 /**

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationEquipServiceImpl.java

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationEquip;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationEquipMapper;
-import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationEquipService;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
+import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationEquipService;
+import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.Collections;
 import java.util.List;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationNoAcceptLogServiceImpl.java

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationNoAcceptLog;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationNoAcceptLogMapper;
-import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationNoAcceptLogService;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationNoAcceptLogModel;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
+import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationNoAcceptLogService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
 
 /**

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationPushLogServiceImpl.java

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationPushLog;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationPushLogMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
-import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationPushLogService;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationPushLogModel;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
+import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationPushLogService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
 import java.util.Map;
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultAttachmentServiceImpl.java

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultAttachment;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionResultAttachmentMapper;
-import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultAttachmentService;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultAttachmentModel;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
+import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultAttachmentService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
 
 /**

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultParamServiceImpl.java

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jyjc.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultParam;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionResultParamMapper;
-import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultParamService;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultParamModel;
+import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultParamService;
 import com.yeejoin.amos.boot.module.jyjc.biz.util.JsonUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
+import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.ArrayList;
 import java.util.List;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultServiceImpl.java

@@ -18,7 +18,6 @@ import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultAttachme
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultParam;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.BizTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.EquipCategoryEnum;
-import com.yeejoin.amos.boot.module.jyjc.api.enums.JYJCTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.ResultStatusEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionResultMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultDataModel;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/RuleCommonServiceImpl.java

@@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.component.emq.EmqKeeper;
+
 import java.util.Arrays;
 import java.util.List;
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/WorkflowHelper.java

@@ -5,13 +5,11 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.jyjc.biz.feign.WorkflowFeignClient;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.AjaxResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.util.ArrayList;