Skip to content

A
amos-boot-biz
Commit 4620c88f authored by tianbo's avatar tianbo
Browse files
Options

Merge branch 'develop_tzs_register_to_0715' into develop_tzs_register

# Conflicts: # amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/CylinderStatisticsMapper.xml
parents 9bb6d0bf 28fce548
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1800 additions and 348 deletions
amos-boot-biz-common/pom.xml
View file @ 4620c88f
......@@ -15,7 +15,7 @@
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-component-security</artifactId>
<version>1.7.13-SNAPSHOT</version>
<version>1.10.8-TZS</version>
</dependency>
<dependency>
<groupId>org.typroject</groupId>
......
amos-boot-data/amos-boot-data-accessapi/pom.xml
View file @ 4620c88f
......@@ -171,7 +171,6 @@
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.7.22</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.yeejoin</groupId>-->
......@@ -182,6 +181,7 @@
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-component-security</artifactId>
<version>${amos.version}</version>
</dependency>
</dependencies>
<build>
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/AlertCalledMapper.xml
View file @ 4620c88f
......@@ -657,7 +657,7 @@
a.call_time AS callTime,
a.emergency_call AS emergencyCall,
a.device_id AS deviceId,
(SELECT ibjui.ADDRESS from idx_biz_jg_use_info ibjui where ibjui.RECORD = a.equipment_id) as elevatorAddress,
ibjui.ADDRESS as elevatorAddress,
CONCAT(a.city,a.district) AS address,
a.alarm_type AS alertType,
a.alert_source AS alertSource,
......@@ -673,6 +673,7 @@
END AS alertStatus
FROM
tz_alert_called a
left join idx_biz_jg_use_info ibjui on ibjui.RECORD = a.equipment_id
WHERE a.is_delete = 0 and a.father_alert is null
and a.biz_org_code like concat(#{orgCode}, '%')
<if test="dto.workOrderNumber != null and dto.workOrderNumber != ''">
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/AlertCalledController.java
View file @ 4620c88f
......@@ -10,9 +10,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
import com.yeejoin.amos.boot.module.common.biz.service.impl.MaintenanceCompanyServiceImpl;
import com.yeejoin.amos.boot.module.elevator.api.enums.SourcesInfoEnum;
......@@ -57,6 +59,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
* 警情接警填报记录
......@@ -862,5 +865,4 @@ public class AlertCalledController extends BaseController {
page.setSize(pageSize);
return ResponseHelper.buildResponse(iAlertCalledService.getAlertCalledRecords(page, alertCalledQueryDto, cityCode));
}
}
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertCalledServiceImpl.java
View file @ 4620c88f
......@@ -15,17 +15,9 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
import com.yeejoin.amos.boot.module.elevator.api.dto.*;
import com.yeejoin.amos.boot.module.elevator.api.entity.AlertCalled;
import com.yeejoin.amos.boot.module.elevator.api.entity.AlertFormValue;
import com.yeejoin.amos.boot.module.elevator.api.entity.DispatchPaper;
import com.yeejoin.amos.boot.module.elevator.api.entity.DispatchTask;
import com.yeejoin.amos.boot.module.elevator.api.entity.Elevator;
import com.yeejoin.amos.boot.module.elevator.api.entity.RepairConsult;
import com.yeejoin.amos.boot.module.elevator.api.entity.TzsCitInfo;
import com.yeejoin.amos.boot.module.elevator.api.entity.VoiceRecordFile;
import com.yeejoin.amos.boot.module.elevator.api.entity.*;
import com.yeejoin.amos.boot.module.elevator.api.enums.AlertStageEnums;
import com.yeejoin.amos.boot.module.elevator.api.enums.DispatchPaperEnums;
import com.yeejoin.amos.boot.module.elevator.api.enums.EquipmentClassifityEnum;
......@@ -51,6 +43,7 @@ import org.springframework.core.io.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.DateUtil;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
......@@ -1262,23 +1255,33 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
data.put("operater", r.getDescription());
records.add(data);
});
// 监管码
HashMap<String, Object> qrcode = new HashMap<>();
if (!ObjectUtils.isEmpty(alertCalledFormVo.getAlertCalledDto())) {
qrcode.put("value", alertCalledFormVo.getAlertCalledDto().getRegistrationCode());
}
// 96333码
HashMap<String, Object> qrcode2 = new HashMap<>();
HashMap<String, Object> qrcode = new HashMap<>();
if (!ObjectUtils.isEmpty(alertCalledFormVo.getAlertCalledDto())) {
qrcode2.put("value", alertCalledFormVo.getAlertCalledDto().getDeviceId());
qrcode.put("title", "96333码");
qrcode.put("value", alertCalledFormVo.getAlertCalledDto().getDeviceId());
try {
String problemTime = DateUtil.formatDate(new Date(), DateUtil.Y_M_D_HMS);
qrcode.put("text", DateUtil.formatDate(DateUtil.smartFormat(problemTime), "yyyy-MM-dd"));
qrcode.put("subtext", DateUtil.formatDate(DateUtil.smartFormat(problemTime), "HH:mm:ss"));
String color;
if (alertCalledFormVo.getAlertCalledDto().getAlertStatus()) {
color = "green";
} else {
color = "red";
}
qrcode.put("color", color);
} catch (Exception e) {
e.printStackTrace();
}
}
datas.put("datas", records);
datas.put("title", "处置记录");
datas.put("renderType", "timeline");
keyinfoData.put("title", ObjectUtils.isEmpty(useUnitMap.get("useUnitName")) ? null : String.valueOf(useUnitMap.get("useUnitName")));
keyinfoData.put("keyParams", jsonData);
keyinfoData.put("infoRecords", datas);
keyinfoData.put("qrcode", qrcode);
keyinfoData.put("qrcode2", qrcode2);
return keyinfoData;
}
......@@ -1308,4 +1311,5 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
}
return parseArray(json, FormValue.class);
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/resources/json/emergencyInformation.json
View file @ 4620c88f
......@@ -36,7 +36,7 @@
},
{
"key": "useUnitName",
"label": "单位名称",
"label": "使用单位",
"type": "text"
},
{
......
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/pom.xml
View file @ 4620c88f
......@@ -25,7 +25,6 @@
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.8.16</version>
</dependency>
</dependencies>
</project>
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DPFilterParamDto.java
View file @ 4620c88f
......@@ -40,4 +40,13 @@ public class DPFilterParamDto {
* 1生产单位 2使用单位 3充装单位 4检验检测机构
*/
private String companyType;
/**
* 监管单位名称（接收单位/管辖机构）
*/
private String superviseUnitName;
/**
* 企业单位名称（发起单位/使用单位）
*/
private String companyName;
}
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DPFilterParamForDateDto.java 0 → 100644
View file @ 4620c88f
package com.yeejoin.amos.boot.module.common.api.dto;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* 大屏筛选过滤对象
*
* @author Administrator
*/
@Data
public class DPFilterParamForDateDto {
/**
* 数据统计的开始日期
*/
private String beginDate;
/**
* 数据统计的结束日期
*/
private String endDate;
}
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DPFilterParamForDetailDto.java 0 → 100644
View file @ 4620c88f
package com.yeejoin.amos.boot.module.common.api.dto;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* 大屏筛选过滤对象
*
* @author Administrator
*/
@Data
public class DPFilterParamForDetailDto {
/**
* 区域
*/
@NotBlank(message = "区域编码不能为空！")
private String cityCode;
/**
* 业务类型
*/
private String businessType;
/**
* 时间筛选
*/
private DPFilterParamForDateDto timeSearchOne;
/**
* 当前页
*/
private int current = 1;
/**
* 每页大小
*/
private int size = 20;
/**
* 左侧树选中值
*/
private String treeValue;
/**
* 设备类别
*/
private String equCategoryCode;
/**
* 监管单位名称（接收单位/管辖机构）
*/
private String superviseUnitName;
/**
* 企业单位名称（发起单位/使用单位）
*/
private String companyName;
/**
* 维保单位名称
*/
private String maintenanceCompanyName;
/**
* 地市名称
*/
private String regionName;
/**
* 报警类型code
*/
private String typeCode;
/**
* 警情来源code
*/
private String alertSourceCode;
/**
* 警情类型code
*/
private String alertTypeCode;
/**
* 气瓶充装异常情况（0:正常，1：异常）
*/
private String anomalyType;
}
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/LegendDataDto.java
View file @ 4620c88f
......@@ -19,4 +19,9 @@ public class LegendDataDto {
* 图列名称
*/
private String value;
/**
* 统计类型：bar-柱状图；line-折线图
*/
private String chartType;
}
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/BusinessTypeEnum.java 0 → 100644
View file @ 4620c88f
package com.yeejoin.amos.boot.module.common.api.enums;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
public enum BusinessTypeEnum {
AZGZ("azgz","安装告知"),
JDJY("jdjy","监督检验"),
SYDJ("sydj","使用登记"),
DQJY("dqjy","定期检验"),
BGDJ("bgdj","变更登记"),
ZXBX("zxbx","注销报销");
private BusinessTypeEnum(String code, String name){
this.code=code;
this.name=name;
}
private String code;
private String name;
public String getCode() {
return code;
}
public String getName() {
return name;
}
public static List<HashMap<String,Object>> getEnumList() {
List<HashMap<String, Object>> list = new ArrayList<>();
for (BusinessTypeEnum testEnum : EnumSet.allOf(BusinessTypeEnum.class)) {
HashMap<String, Object> map = new HashMap<>();
map.put("title",testEnum.name);
map.put("value",testEnum.code);
list.add(map);
}
return list;
}
}
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/IssueMainBodyEnum.java
View file @ 4620c88f
......@@ -9,14 +9,12 @@ import java.util.List;
@Getter
public enum IssueMainBodyEnum {
//个人
//个人1
PERSON("个人","1"),
//企业
COMPANY("企业","2"),
//设备
EQUIPMENT("设备","3"),
;
EQUIPMENT("设备","3");
String name;
String code;
......
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/JYJCBusinessTypeEnum.java 0 → 100644
View file @ 4620c88f
package com.yeejoin.amos.boot.module.common.api.enums;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
public enum JYJCBusinessTypeEnum {
DQJY("DQJY","定期检验"),
SCJY("SCJY","首次检验"),
AZJDJY("AZJDJY","安装监督检验"),
GZJDJY("GZJDJY","改造监督检验"),
WXJDJY("WXJDJY","维修监督检验"),
DTJC("DTJC","电梯检测");
private JYJCBusinessTypeEnum(String code, String name){
this.code=code;
this.name=name;
}
private String code;
private String name;
public String getCode() {
return code;
}
public String getName() {
return name;
}
public static List<HashMap<String,Object>> getEnumList() {
List<HashMap<String, Object>> list = new ArrayList<>();
for (JYJCBusinessTypeEnum testEnum : EnumSet.allOf(JYJCBusinessTypeEnum.class)) {
HashMap<String, Object> map = new HashMap<>();
map.put("title",testEnum.name);
map.put("value",testEnum.code);
list.add(map);
}
return list;
}
}
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/ReginStepEnum.java
View file @ 4620c88f
......@@ -47,4 +47,13 @@ public enum ReginStepEnum {
return regionModel;
}).collect(Collectors.toList());
}
public static List<RegionModel> getOne(String code) {
return Arrays.stream(ReginStepEnum.values()).filter(e -> e.getCode().equals(code)).map(e -> {
RegionModel regionModel = new RegionModel();
regionModel.setRegionCode(Integer.parseInt(e.getCode()));
regionModel.setRegionName(e.getName());
return regionModel;
}).collect(Collectors.toList());
}
}
amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/api/service/CylinderFillingMessageService.java
View file @ 4620c88f
......@@ -33,15 +33,17 @@ public class CylinderFillingMessageService extends BaseService<CylinderFillingMe
public IPage<CylinderFillingMessageModel> getUploadCylinderLogs(PageParam pageParam, String regionCode) {
CompanyModel result = Privilege.companyClient.queryByCompanyCode(regionCode).getResult();
Page<CylinderFillingMessageModel> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
IPage<CylinderFillingMessageModel> uploadCylinderLogsByOrgCode = getUploadCylinderLogsByOrgCode(page, result.getOrgCode());
List<String> appIds = uploadCylinderLogsByOrgCode.getRecords().stream().map(CylinderFillingMessageModel::getAppId).collect(Collectors.toList()).stream().filter(x -> !ValidationUtil.isEmpty(x)).distinct().collect(Collectors.toList());
if(appIds.size() > 0){
List<TzBaseEnterpriseInfoDto> tzBaseEnterpriseInfoDtos = iTzBaseEnterpriseInfoService.queryByAppId(appIds);
if (!ValidationUtil.isEmpty(tzBaseEnterpriseInfoDtos)){
Map<String, String> map = tzBaseEnterpriseInfoDtos.stream().collect(Collectors.toMap(TzBaseEnterpriseInfoDto::getAppId, TzBaseEnterpriseInfoDto::getUseUnitCode));
uploadCylinderLogsByOrgCode.getRecords().forEach(x -> {
x.setUseUnitCode(map.get(x.getAppId()));
});
if(result != null){
IPage<CylinderFillingMessageModel> uploadCylinderLogsByOrgCode = getUploadCylinderLogsByOrgCode(page, result.getOrgCode());
List<String> appIds = uploadCylinderLogsByOrgCode.getRecords().stream().map(CylinderFillingMessageModel::getAppId).collect(Collectors.toList()).stream().filter(x -> !ValidationUtil.isEmpty(x)).distinct().collect(Collectors.toList());
if(appIds.size() > 0){
List<TzBaseEnterpriseInfoDto> tzBaseEnterpriseInfoDtos = iTzBaseEnterpriseInfoService.queryByAppId(appIds);
if (!ValidationUtil.isEmpty(tzBaseEnterpriseInfoDtos)){
Map<String, String> map = tzBaseEnterpriseInfoDtos.stream().collect(Collectors.toMap(TzBaseEnterpriseInfoDto::getAppId, TzBaseEnterpriseInfoDto::getUseUnitCode));
uploadCylinderLogsByOrgCode.getRecords().forEach(x -> {
x.setUseUnitCode(map.get(x.getAppId()));
});
}
}
}
return page;
......
amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml
View file @ 4620c88f
......@@ -96,7 +96,7 @@
<where>
<if
test="tzBaseEnterpriseInfoDto.unitType!=null and tzBaseEnterpriseInfoDto.unitType!='' ">
AND unit_type = #{tzBaseEnterpriseInfoDto.unitType}
AND unit_type LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.unitType},'%')
</if>
<if
test="tzBaseEnterpriseInfoDto.useUnit!=null and tzBaseEnterpriseInfoDto.useUnit!='' ">
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/converter/ChargingMediumConverter.java
View file @ 4620c88f
......@@ -28,6 +28,7 @@ public class ChargingMediumConverter implements Converter<String> {
EXCEL_TO_JAVA_MAP.put("氩气", "ARGON");
EXCEL_TO_JAVA_MAP.put("液氩", "LIQUID_ARGON");
EXCEL_TO_JAVA_MAP.put("液氮", "LIQUID_NITROGEN");
EXCEL_TO_JAVA_MAP.put("溶解乙炔", "DISSOLVE_ACETYLENE");
JAVA_TO_EXCEL_MAP.put("LIQUEFIED_NATURAL_GAS", "液化天然气");
JAVA_TO_EXCEL_MAP.put("LIQUEFIED_PETROLEUM_GAS", "液化石油气");
......@@ -43,6 +44,7 @@ public class ChargingMediumConverter implements Converter<String> {
JAVA_TO_EXCEL_MAP.put("ARGON", "氩气");
JAVA_TO_EXCEL_MAP.put("LIQUID_ARGON", "液氩");
JAVA_TO_EXCEL_MAP.put("LIQUID_NITROGEN", "液氮");
JAVA_TO_EXCEL_MAP.put("DISSOLVE_ACETYLENE", "溶解乙炔");
}
@Override
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipInfoCylinderExcelDto.java
View file @ 4620c88f
......@@ -179,7 +179,7 @@ public class EquipInfoCylinderExcelDto extends BaseDto {
@ApiModelProperty(value = "型号")
private String modelNumber;
@ExcelProperty(value = "充装介质", index = 31, converter = ChargingMediumConverter.class)
@ExcelProperty(value = "充装介质", index = 31)
@ApiModelProperty(value = "充装介质")
@NotBlank(message = "充装介质不能为空")
private String chargingMedium;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgScrapCancelDto.java
View file @ 4620c88f
......@@ -10,7 +10,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
......@@ -143,8 +142,9 @@ public class JgScrapCancelDto extends BaseDto {
@ApiModelProperty(value = "申请日期，接收查询参数")
private String applicationDate;
@ApiModelProperty(value = "使用登记证id，多个逗号分割")
private String registrationManageId;
@ApiModelProperty(value = "创建人")
private String createUserName;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationDto.java
View file @ 4620c88f
......@@ -90,6 +90,9 @@ public class JgUseRegistrationDto extends BaseDto {
@ApiModelProperty(value = "创建人ID")
private String createUserId;
@ApiModelProperty(value = "创建人姓名")
private String createUserName;
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgScrapCancel.java
View file @ 4620c88f
......@@ -184,4 +184,10 @@ public class JgScrapCancel extends BaseEntity {
@TableField(value = "other_accessories")
private String otherAccessories;
/**
* 创建人
*/
@TableField("create_user_name")
private String createUserName;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistration.java
View file @ 4620c88f
......@@ -134,6 +134,12 @@ public class JgUseRegistration extends BaseEntity {
private String createUserId;
/**
* 创建人姓名
*/
@TableField("create_user_name")
private String createUserName;
/**
* 创建时间
*/
@TableField("create_date")
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistrationManage.java
View file @ 4620c88f
......@@ -177,4 +177,22 @@ public class JgUseRegistrationManage extends BaseEntity {
@TableField("is_scrap")
private String isScrap;
/**
* 气瓶数量
*/
@TableField("gas_num")
private Integer gasNum;
/**
* 容积
*/
@TableField("volume")
private String volume;
/**
* 充装介质
*/
@TableField("filling_medium")
private String fillingMedium;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/CylinderTypeEnum.java
View file @ 4620c88f
......@@ -7,9 +7,9 @@ import lombok.Getter;
@AllArgsConstructor
public enum CylinderTypeEnum {
CYLINDER("瓶", "2300"),
SEAMLESS_CYLINDER("无缝气瓶(车用)", "2310"),
WELDED_CYLINDER("焊接气瓶(车用)", "2320"),
SPECIAL_CYLINDER("特种气瓶(车用)", "23T0");
SEAMLESS_CYLINDER("无缝气瓶", "2310"),
WELDED_CYLINDER("焊接气瓶", "2320"),
SPECIAL_CYLINDER("特种气瓶", "23T0");
private final String name;
private final String code;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/UseRegisterCancelEquipEnum.java 0 → 100644
View file @ 4620c88f
package com.yeejoin.amos.boot.module.jg.api.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Getter
@AllArgsConstructor
/**
* 使用登记审批完成后作废流程
* 设备需要修改为未纳管类别
*/
public enum UseRegisterCancelEquipEnum {
ldsqzj("流动式起重机", "4400"),
jdgycl("机动工业车辆", "5100"),
fglylyggcl("非公路用旅游观光车辆", "5200"),
qp("气瓶", "2300");
private final String name;
private final String code;
public static String getMessage(String code) {
for (UseRegisterCancelEquipEnum constants : values()) {
if (constants.getCode().equals(code)) {
return constants.getName();
}
}
return null;
}
public static List<String> getCodes() {
List<String> codes = new ArrayList<>();
for (UseRegisterCancelEquipEnum constants : values()) {
codes.add(constants.getCode());
}
return codes;
}
public static Map<Integer,String> getName=new HashMap<>();
public static Map<String,Integer> getCode=new HashMap<>();
static {
for (ConstructionEnum e : ConstructionEnum.values()){
getName.put(e.code, e.name);
getCode.put(e.name, e.code);
}
}
public String getCode() {
return code;
}
public String getName() {
return name;
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java
View file @ 4620c88f
......@@ -2,8 +2,10 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
import com.yeejoin.amos.boot.module.jg.api.bo.JgBizCountDataBO;
import com.yeejoin.amos.boot.module.jg.api.dto.ReportAnalysisSearchDTO;
import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
......@@ -113,7 +115,7 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
* @param useRegistrationCode
* @return
*/
Integer useRegistrationCertificateAccountUnique(String useRegistrationCode);
Integer useRegistrationCertificateAccountUnique(@Param("useRegistrationCode") String useRegistrationCode,@Param("equipId") String equipId);
/**
* 查询维保超期的设备
......@@ -130,6 +132,12 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
* @return 统计数量数组
*/
List<Long> countBizFinishedNumForDP(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
List<Long> countBizFinishedNumForDPAZGZ(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
List<Long> countBizFinishedNumForDPJDJY(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
List<Long> countBizFinishedNumForDPSYDJ(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
List<Long> countBizFinishedNumForDPDQJY(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
List<Long> countBizFinishedNumForDPBGDJ(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
List<Long> countBizFinishedNumForDPZXBX(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
/**
* 大屏大屏业务全过程统计流程中(包括已经完成)的单据
......@@ -139,7 +147,26 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
* @return 统计数量数组
*/
List<Long> countAllInFlowingForDPNoFinishedBizData(@Param("orgCode")String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
List<Long> countAllInFlowingForDPNoFinishedBizDataAZGZ(@Param("orgCode")String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
List<Long> countAllInFlowingForDPNoFinishedBizDataJDJY(@Param("orgCode")String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
List<Long> countAllInFlowingForDPNoFinishedBizDataSYDJ(@Param("orgCode")String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
List<Long> countAllInFlowingForDPNoFinishedBizDataDQJY(@Param("orgCode")String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
List<Long> countAllInFlowingForDPNoFinishedBizDataBGDJ(@Param("orgCode")String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
List<Long> countAllInFlowingForDPNoFinishedBizDataZXBX(@Param("orgCode")String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
List<Map<String, String>> getOrgCodesByCompanyCodes(@Param("regionCodes") List<Integer> regionCodes);
/**
* 大屏业务全过程统计已经完成的列表
*
* @param orgCode 行政区划对应公司的orgCode
* @param dpFilterParamForDetailDto 过滤条件
* @return 统计数量数组
*/
Page<Map<String,Object>> countBizFinishedNumForDPList(@Param("page") Page<Map<String,Object>> page, @Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamForDetailDto);
Page<Map<String,Object>> countBizFinishedNumForDPListAZGZ(@Param("page") Page<Map<String,Object>> page, @Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamForDetailDto);
Page<Map<String,Object>> countBizFinishedNumForDPListJDJY(@Param("page") Page<Map<String,Object>> page, @Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamForDetailDto);
Page<Map<String,Object>> countBizFinishedNumForDPListSYDJ(@Param("page") Page<Map<String,Object>> page, @Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamForDetailDto);
Page<Map<String,Object>> countBizFinishedNumForDPListDQJY(@Param("page") Page<Map<String,Object>> page, @Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamForDetailDto);
Page<Map<String,Object>> countBizFinishedNumForDPListBGDJ(@Param("page") Page<Map<String,Object>> page, @Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamForDetailDto);
Page<Map<String,Object>> countBizFinishedNumForDPListZXBX(@Param("page") Page<Map<String,Object>> page, @Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamForDetailDto);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/SafetyProblemTracingMapper.xml
View file @ 4620c88f
......@@ -49,6 +49,9 @@
<if test="problemModel.regionCode != null and problemModel.regionCode != ''">
and spt.region_code like CONCAT(#{problemModel.regionCode}, '%')
</if>
<if test="problemModel.problemStatusCode != null and problemModel.problemStatusCode != ''">
and spt.problem_status_code = #{problemModel.problemStatusCode}
</if>
</where>
order by spt.create_date desc
</select>
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgInstallationNoticeController.java
View file @ 4620c88f
......@@ -8,23 +8,19 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeEqMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletResponse;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
......@@ -67,16 +63,9 @@ public class JgInstallationNoticeController extends BaseController {
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新安装告知", notes = "根据sequenceNbr更新安装告知")
public ResponseModel<JgInstallationNoticeDto> updateBySequenceNbrJgInstallationNotice(@RequestParam String submitType, @RequestBody Map<String, Object> model, @RequestParam(value = "op", required = false) String op) {
JgInstallationNoticeDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("installationInfo")), JgInstallationNoticeDto.class, true);
// installationInfo.setEquList(((LinkedHashMap<?, ?>) model.get("installationInfo")).get("equListDesc").toString());
if (Objects.isNull(installationInfo)) {
throw new IllegalArgumentException("参数installationInfo不能为空");
}
Object o = ((LinkedHashMap<?, ?>) model.get("installationInfo")).get("proxyStatementAttachment");
Object o1 = ((LinkedHashMap<?, ?>) model.get("installationInfo")).get("installContractAttachment");
Object o2 = ((LinkedHashMap<?, ?>) model.get("installationInfo")).get("otherAccessories");
installationInfo.setProxyStatementAttachmentList((List<Map<String, Object>>) o);
installationInfo.setInstallContractAttachmentList((List<Map<String, Object>>) o1);
installationInfo.setOtherAccessoriesList((List<Map<String, Object>>) o2);
return ResponseHelper.buildResponse(iJgInstallationNoticeService.updateInstallationNotice(submitType, installationInfo, op));
}
......@@ -175,7 +164,5 @@ public class JgInstallationNoticeController extends BaseController {
@GetMapping(value = "/historyDataRepair")
public ResponseModel<Boolean> historyDataRepair() {
return ResponseHelper.buildResponse(iJgInstallationNoticeService.historyDataRepair());
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java
View file @ 4620c88f
......@@ -147,18 +147,7 @@ public class JgUseRegistrationController extends BaseController {
@GetMapping(value = "/getMessage")
public ResponseModel<Map<String, Object>> getMessage() {
ReginParams selectedOrgInfo = getSelectedOrgInfo();
HashMap<String, Object> map = new HashMap<>();
String companyType = selectedOrgInfo.getCompany().getCompanyType();
if ("个人主体".equals(companyType)) {
String[] code = selectedOrgInfo.getCompany().getCompanyCode().split("_");
map.put("useUnitCreditCode", code.length > 1 ? code[1] : code[0]);
String[] companyName = selectedOrgInfo.getCompany().getCompanyName().split("_");
map.put("useUnitName", companyName.length > 1 ? companyName[1] : companyName[0]);
} else {
map.put("useUnitCreditCode", selectedOrgInfo.getCompany().getCompanyCode());
map.put("useUnitName", selectedOrgInfo.getCompany().getCompanyName());
}
return ResponseHelper.buildResponse(map);
return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getUnitInfo(selectedOrgInfo));
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationManageController.java
View file @ 4620c88f
......@@ -44,10 +44,10 @@ public class JgUseRegistrationManageController extends BaseController {
* 将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/brushHistoryCertificate")
@ApiOperation(httpMethod = "GET", value = "将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中", notes = "将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中")
public ResponseModel<Boolean> brushHistoryCertificate() {
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.brushHistoryCertificate());
@PostMapping(value = "/brushHistoryCertificate")
@ApiOperation(httpMethod = "POST", value = "将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中", notes = "将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中")
public ResponseModel<Boolean> brushHistoryCertificate(@RequestParam(value = "brushType") String brushType) {
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.brushHistoryCertificate(brushType));
}
......@@ -194,7 +194,10 @@ public class JgUseRegistrationManageController extends BaseController {
if (company.getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
if (ValidationUtil.isEmpty(dto.getUseUnitCreditCode())) {
// 不传的话取当前登录单位的统一信用代码
dto.setUseUnitCreditCode(company.getCompanyCode());
// 个人主体特殊处理
dto.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
company.getCompanyCode().split("_")[1] :
company.getCompanyCode());
}
} else {
dto.setReceiveCompanyCode(company.getCompanyCode());
......
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/CmWorkflowServiceImpl.java
View file @ 4620c88f
......@@ -39,6 +39,7 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
try {
log.info("开始请求工作流启动接口:/start/batch,请求参数：{}", JSONObject.toJSONString(params));
processTasks = workFlowFeignService.startForBatch(params).getResult();
log.info("请求工作流接口startBatch结束，返回结果：{}", JSONObject.toJSONString(processTasks));
} catch (InnerInvokException e) {
//拦截无审核人异常信息
String devMessage = getErrorMessage(e);
......@@ -70,17 +71,18 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
try {
if(PASS_OPERATE.equals(operate)){
// 通过操作
log.info("开始请求工作流完成任务接口:/complete/standard/{taskId},请求参数：{},{}", taskId, JSONObject.toJSONString(data));
log.info("开始请求工作流-完成任务-接口:/complete/standard/{taskId},请求参数：{},{},{}", taskId, operate, JSONObject.toJSONString(data));
processTaskDTO = workFlowFeignService.completeByTaskFroStandard(taskId, data).getResult();
} else if(REJECT_OPERATE.equals(operate)) {
// 驳回操作
log.info("开始请求工作流驳回任务接口:/reject/{taskId},请求参数：{},{}", taskId, JSONObject.toJSONString(data));
log.info("开始请求工作流-驳回任务-接口:/reject/{taskId},请求参数：{},{},{}", taskId, operate, JSONObject.toJSONString(data));
processTaskDTO = workFlowFeignService.reject(taskId, data).getResult();
} else {
// 执行普通节点（提交）
log.info("开始请求工作流完成任务接口:/complete/standard/{taskId},请求参数：{},{}", taskId, JSONObject.toJSONString(data));
log.info("开始请求工作流完成任务接口:/complete/standard/{taskId},请求参数：{},{},{}", taskId, operate, JSONObject.toJSONString(data));
processTaskDTO = workFlowFeignService.completeByTaskFroStandard(taskId, data).getResult();
}
log.info("请求工作流接口completeOrReject结束，返回结果：{}", JSONObject.toJSONString(processTaskDTO));
} catch (InnerInvokException e) {
//拦截无审核人异常信息
String devMessage = getErrorMessage(e);
......@@ -96,7 +98,9 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
@Override
public ProcessTaskDTO rollBack(String processInstanceId) {
log.info("开始请求工作流撤回接口:/rollBack/standard/{processInstanceId},请求参数：{}", processInstanceId);
return FeignUtil.remoteCall(() -> workFlowFeignService.rollBackTask(processInstanceId));
ProcessTaskDTO processTaskDTO = FeignUtil.remoteCall(() -> workFlowFeignService.rollBackTask(processInstanceId));
log.info("请求工作流接口rollBack结束，返回结果：{}", JSONObject.toJSONString(processTaskDTO));
return processTaskDTO;
}
......@@ -106,6 +110,7 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
try {
log.info("开始请求工作流转办任务接口:/assign/{taskVo},请求参数：{}", taskVo);
processTaskDTO = workFlowFeignService.assign(taskVo).getResult();
log.info("请求工作流接口assign结束，返回结果：{}", JSONObject.toJSONString(processTaskDTO));
} catch (InnerInvokException e) {
//拦截无审核人异常信息
String devMessage = getErrorMessage(e);
......@@ -125,6 +130,7 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
try {
log.info("开始请求工作流终止流程接口:/stopProcess/{processInstanceId},请求参数：{}，{}", processInstanceId, stopReason);
processTaskDTO = workFlowFeignService.stopProcess(processInstanceId, stopReason).getResult();
log.info("请求工作流接口stopProcess结束，返回结果：{}", JSONObject.toJSONString(processTaskDTO));
} catch (InnerInvokException e) {
//拦截无审核人异常信息
String devMessage = getErrorMessage(e);
......
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/CommonServiceImpl.java
View file @ 4620c88f
......@@ -2125,8 +2125,8 @@ public class CommonServiceImpl implements ICommonService {
* @param useRegistrationCode 登记证编号
* @return true ： 已经存在 false ：不存在
*/
public Boolean useRegistrationCertificateAccountUnique(String useRegistrationCode) {
Integer count = commonMapper.useRegistrationCertificateAccountUnique(useRegistrationCode);
public Boolean useRegistrationCertificateAccountUnique(String useRegistrationCode, String equipId) {
Integer count = commonMapper.useRegistrationCertificateAccountUnique(useRegistrationCode, equipId);
if (count > 0) {
return true;
}
......
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/JgChangeRegistrationNameServiceImpl.java
View file @ 4620c88f
......@@ -227,7 +227,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
map.put("SEQUENCE_NBR", jsonObject.get("sequenceNbr"));
equipList.add(map);
}
this.repeatUsedEquipCheck(equipList, reginParams.getCompany().getCompanyCode());
this.repeatUsedEquipCheck(equipList,
CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
reginParams.getCompany().getCompanyCode().split("_")[1] :
reginParams.getCompany().getCompanyCode());
}
List<ProcessTaskDTO> processTasks = new ArrayList<>();
// 判断当前是否为提交
......@@ -262,6 +265,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
convertField(model);
BeanUtils.copyProperties(model, dto);
dto.setApplyNo(applyNo);
dto.setApplyDate(new Date());
dto.setCreateDate(new Date());
dto.setNextExecutorIds(String.join(",", roleListNext));
dto.setInstanceStatus(String.join(",", roleListAll));
......@@ -271,7 +275,6 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
dto.setNextTaskId(nextTaskId);
dto.setNextExecuteUserIds(nextUserIds);
dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass()));
dto.setApplyDate(new Date());
} else {
dto.setAuditStatus(String.valueOf(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getPass()));
}
......@@ -443,7 +446,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
equipList.add(map);
}
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
this.repeatUsedEquipCheck(equipList, reginParams.getCompany().getCompanyCode());
this.repeatUsedEquipCheck(equipList,
CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
reginParams.getCompany().getCompanyCode().split("_")[1] :
reginParams.getCompany().getCompanyCode());
}
if ("1".equals(submitType)) {
//发起流程
......@@ -1052,4 +1058,4 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
SortVo sortMap = commonService.sortFieldConversion(sort);
return this.baseMapper.getListPage(page, sortMap, dto, roleIds, companyCode, RequestContext.getExeUserId());
}
}
\ No newline at end of file
}
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/JgChangeRegistrationReformServiceImpl.java
View file @ 4620c88f
......@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.jg.api.dto.*;
import com.yeejoin.amos.boot.module.jg.api.entity.*;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
import com.yeejoin.amos.boot.module.jg.api.mapper.*;
......@@ -161,9 +162,12 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
}
private void checkForRepeatUsedEquip(JSONObject map, String equId, ReginParams reginParams) {
CompanyBo company = reginParams.getCompany();
if (!ObjectUtils.isEmpty(map.get("submit"))) {
EquipUsedCheckStrategyContext.getUsedStrategy(BUSINESS_TYPE_KEY)
.equipRepeatUsedCheck(equId, reginParams.getCompany().getCompanyCode());
.equipRepeatUsedCheck(equId, CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
company.getCompanyCode().split("_")[1] :
company.getCompanyCode());
}
}
......@@ -187,6 +191,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
public List<Map<String, Object>> save(JSONObject map) {
try {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
String companyCode = CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
reginParams.getCompany().getCompanyCode().split("_")[1] : reginParams.getCompany().getCompanyCode();
UseInfo useInfo = new UseInfo();
String equipId = map.get("record").toString();
LambdaQueryWrapper<UseInfo> lambda = new QueryWrapper<UseInfo>().lambda();
......@@ -201,7 +207,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
String supervisoryCode = otherInfo.getSupervisoryCode();
jgChangeRegistrationReform.setSupervisoryCode(supervisoryCode);
jgChangeRegistrationReform.setUseUnitName(ObjectUtils.isEmpty(useInfo.getUseUnitName()) ? reginParams.getCompany().getCompanyName() : useInfo.getUseUnitName());
jgChangeRegistrationReform.setUseUnitCreditCode(ObjectUtils.isEmpty(useInfo.getUseUnitCreditCode()) ? reginParams.getCompany().getCompanyCode() : useInfo.getUseUnitCreditCode());
jgChangeRegistrationReform.setUseUnitCreditCode(ObjectUtils.isEmpty(useInfo.getUseUnitCreditCode()) ? companyCode : useInfo.getUseUnitCreditCode());
if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
jgChangeRegistrationReform.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
}
......@@ -213,11 +219,11 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
jgChangeRegistrationReform.setRenovationSupervisioninspectionCertificate(JSONObject.toJSONString(map.get("renovationSupervisioninspectionCertificate")));
}
// 使用单位提交
jgChangeRegistrationReform.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
jgChangeRegistrationReform.setUseUnitCreditCode(companyCode);
if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))) {
jgChangeRegistrationReform.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
} else {
jgChangeRegistrationReform.setInspectUnitCreditCode(reginParams.getCompany().getCompanyCode());
jgChangeRegistrationReform.setInspectUnitCreditCode(companyCode);
}
if (!ObjectUtils.isEmpty(map.get("inspectOrgName"))) {
jgChangeRegistrationReform.setInspectUnitName(map.get("inspectOrgName").toString());
......
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/JgChangeRegistrationTransferServiceImpl.java
View file @ 4620c88f
......@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.module.jg.api.common.StringUtil;
import com.yeejoin.amos.boot.module.jg.api.dto.*;
import com.yeejoin.amos.boot.module.jg.api.entity.*;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
import com.yeejoin.amos.boot.module.jg.api.mapper.*;
......@@ -181,7 +182,10 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
}
if ("1".equals(submitType)) {
this.repeatUsedEquipCheck(registrationIdList, reginParams.getCompany().getCompanyCode());
this.repeatUsedEquipCheck(registrationIdList,
CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
reginParams.getCompany().getCompanyCode().split("_")[1] :
reginParams.getCompany().getCompanyCode());
}
//查询证下的设备
......@@ -264,7 +268,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
//注册登记日期
oldTransfer.setRegDate(new Date());
//使用机构
oldTransfer.setUseUnitCreditCode(company.getCompanyCode());
oldTransfer.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
company.getCompanyCode().split("_")[1] : company.getCompanyCode());
oldTransfer.setUseUnitName(company.getCompanyName());
//录入单位统一信用代码
oldTransfer.setInputUnitNo(company.getCompanyCode());
......
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/JgChangeRegistrationUnitServiceImpl.java
View file @ 4620c88f
......@@ -16,6 +16,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.jg.api.dto.*;
import com.yeejoin.amos.boot.module.jg.api.entity.*;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
import com.yeejoin.amos.boot.module.jg.api.mapper.*;
......@@ -394,8 +395,12 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
if (SUBMIT_TYPE_FLOW.equals(submitType)) {
//如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
CompanyBo company = reginParams.getCompany();
deviceList.forEach(jsonObject -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
.equipRepeatUsedCheck(String.valueOf(jsonObject.get("SEQUENCE_NBR")), reginParams.getCompany().getCompanyCode()));
.equipRepeatUsedCheck(String.valueOf(jsonObject.get("SEQUENCE_NBR")),
CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
company.getCompanyCode().split("_")[1] :
company.getCompanyCode()));
}
return noticeDto;
}
......@@ -415,8 +420,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
JgChangeRegistrationUnitDto model,
String type,
ReginParams reginParams) {
String orgCode;
orgCode = reginParams.getCompany().getCompanyCode();
String orgCode = reginParams.getCompany().getCompanyCode();
if (CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType())) {
orgCode = reginParams.getCompany().getCompanyCode().split("_")[1];
}
String companyType = reginParams.getCompany().getCompanyType();
String currentUserId = reginParams.getUserModel().getUserId();
SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
......@@ -603,7 +610,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
model.setStatus(taskName[0]);
}
model.setNewUseUnitName(reginParams.getCompany().getCompanyName());
model.setNewUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
model.setNewUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
reginParams.getCompany().getCompanyCode().split("_")[1] :
reginParams.getCompany().getCompanyCode());
if (!CollectionUtils.isEmpty(nextExecutorUserIds)) {
model.setNextExecuteUserIds(nextExecutorUserIds.get(0));
}
......@@ -702,8 +711,12 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
if (SUBMIT_TYPE_FLOW.equals(submitType)) {//放在最后面防止前面有异常
//如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
CompanyBo company = reginParams.getCompany();
deviceList.forEach(jsonObject -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
.equipRepeatUsedCheck(String.valueOf(jsonObject.get("SEQUENCE_NBR")), reginParams.getCompany().getCompanyCode()));
.equipRepeatUsedCheck(String.valueOf(jsonObject.get("SEQUENCE_NBR")),
CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
company.getCompanyCode().split("_")[1] :
company.getCompanyCode()));
}
return Collections.singletonList(model);
}
......@@ -947,7 +960,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
//修改ES中使用单位信息和使用单位代码
Map<String, Map<String, Object>> resultMap = new HashMap<>();
Map<String, Object> map1 = new HashMap<>();
map1.put("USE_UNIT_CREDIT_CODE", registration.getNewUseUnitCreditCode());
String[] companyCode = registration.getNewUseUnitCreditCode().split("_");
map1.put("USE_UNIT_CREDIT_CODE", companyCode.length > 1 ? companyCode[1] : registration.getNewUseUnitCreditCode());
map1.put("USE_UNIT_NAME", registration.getNewUseUnitName());
map1.put("REC_DATE", new Date());// 更新时间，设备筛选时排在前面 bug-21476
resultMap.put(equipId, map1);
......
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/JgChangeVehicleRegistrationUnitServiceImpl.java
View file @ 4620c88f
......@@ -14,6 +14,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.jg.api.dto.*;
import com.yeejoin.amos.boot.module.jg.api.entity.*;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.VehicleApanageEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeVehicleRegistrationUnitMapper;
......@@ -140,6 +141,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 600000)
public List<JgChangeVehicleRegistrationUnit> saveMessage(JSONObject map, ReginParams reginParams) {
try {
CompanyBo company = reginParams.getCompany();
JgChangeVehicleRegistrationUnit dto = new JgChangeVehicleRegistrationUnit();
if (!ObjectUtils.isEmpty(map.get("submit")) && SUBMIT_TYPE_FLOW.equals(map.get("submit").toString())) {
if (map.containsKey("dataList")) {
......@@ -151,7 +153,10 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
equ.put("record", object.get("record"));
equipList.add(equ);
});
this.repeatUsedEquipCheck(equipList, reginParams.getCompany().getCompanyCode());
this.repeatUsedEquipCheck(equipList,
CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
company.getCompanyCode().split("_")[1] :
company.getCompanyCode());
}
}
if (!map.containsKey("sequenceNbr")) {
......@@ -513,6 +518,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
manage.setReceiveCompanyCode(jgChangeVehicleRegistrationUnit.getReceiveOrgCode());
manage.setReceiveOrgName(jgChangeVehicleRegistrationUnit.getReceiveOrgName());
manage.setAuditPassDate(new Date());
Map<String, Object> enterpriseInfo = commonServiceImpl.getEnterpriseInfo(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
manage.setUseUnitAddress(String.valueOf(enterpriseInfo.get("address")));
jgUseRegistrationManageService.updateById(manage);
// 保存证流水信息
jgCertificateChangeRecord.setUseRegistrationCode(manage.getUseRegistrationCode());
......@@ -611,7 +618,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
dto.setFlowStatusLabel(jgChangeVehicleRegistrationUnit.getStatus());
dto.setStartUserId(jgChangeVehicleRegistrationUnit.getCreateUserId());
dto.setStartUser(jgChangeVehicleRegistrationUnit.getCreateUserName());
dto.setStartUserCompanyName(jgChangeVehicleRegistrationUnit.getUseUnitName());
dto.setStartUserCompanyName(jgChangeVehicleRegistrationUnit.getNewUseUnitName());
dto.setStartDate(new Date());
jgChangeVehicleRegistrationUnit.setInstanceId(workflowResultDto.getInstanceId());
jgChangeVehicleRegistrationUnit.setNextExecutorIds(workflowResultDto.getNextExecutorRoleIds());
......
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/JgEnableDisableServiceImpl.java
View file @ 4620c88f
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Sequence;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
......@@ -14,6 +15,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgEnableDisableEq;
import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.mapper.*;
import com.yeejoin.amos.boot.module.jg.api.service.IJgEnableDisableService;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
......@@ -141,7 +143,11 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
// 设备列表
List<Map<String, Object>> equipments = (List<Map<String, Object>>) map.get("equipments");
if (SUBMIT_TYPE_FLOW.equals(submit)) {// 校验设备不能再多个流程中
this.repeatUsedEquipCheck(equipments, reginParams.getCompany().getCompanyCode());
CompanyBo company = reginParams.getCompany();
this.repeatUsedEquipCheck(equipments,
CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
company.getCompanyCode().split("_")[1] :
company.getCompanyCode());
}
String businessCode = ObjectUtils.isEmpty(map.get("applyType")) ? String.valueOf(map.get("businessCode")) : String.valueOf(map.get("applyType"));
// 接收机构
......@@ -241,7 +247,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
jgEnableDisable.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
jgEnableDisable.setCreateUserId(reginParams.getUserModel().getUserId());
jgEnableDisable.setCreateUserName(reginParams.getUserModel().getRealName());
jgEnableDisable.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
jgEnableDisable.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
reginParams.getCompany().getCompanyCode().split("_")[1] :
reginParams.getCompany().getCompanyCode());
jgEnableDisable.setUseUnitName(reginParams.getCompany().getCompanyName());
jgEnableDisable.setReceiveCompanyCode(receiveOrgCode[0]);
jgEnableDisable.setReceiveOrgName(receiveOrgCode[1]);
......@@ -373,7 +381,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
jgEnableDisable.setApplyDate(new Date());
jgEnableDisable.setReceiveCompanyCode(splitMaintenanceUnitCode[0]);
jgEnableDisable.setReceiveOrgName(splitMaintenanceUnitCode[1]);
jgEnableDisable.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
jgEnableDisable.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
reginParams.getCompany().getCompanyCode().split("_")[1] :
reginParams.getCompany().getCompanyCode());
jgEnableDisable.setUseUnitName(reginParams.getCompany().getCompanyName());
jgEnableDisable.setRemark(String.valueOf(map.get("remark")));
jgEnableDisable.setApplyType(map.getString("applyType"));
......@@ -467,7 +477,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
public Page<Map<String, Object>> pageList(Page<Map<String, Object>> page, String sort, JgEnableDisableDto dto) {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
if ("company".equals(reginParams.getCompany().getLevel())) {
dto.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
dto.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
reginParams.getCompany().getCompanyCode().split("_")[1] :
reginParams.getCompany().getCompanyCode());
} else {
dto.setReceiveCompanyCode(reginParams.getCompany().getCompanyCode());
}
......
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/JgEquipTransferServiceImpl.java
View file @ 4620c88f
......@@ -154,14 +154,17 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
this.saveOrUpdateHisDataBatch(jgEquipTransferEqList);
if (SUBMIT_TYPE_FLOW.equals(submitType)) {//放在最后面防止前面有异常
//如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
CompanyBo company = reginParams.getCompany();
jgEquipTransferEqList.forEach(equipTransferEq -> EquipUsedCheckStrategyContext.getUsedStrategy(EQUIP_TRANSFER_PROCESS_KEY)
.equipRepeatUsedCheck(equipTransferEq.getEquId(), reginParams.getCompany().getCompanyCode()));
.equipRepeatUsedCheck(equipTransferEq.getEquId(), CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
company.getCompanyCode().split("_")[1] :
company.getCompanyCode()));
}
return transferList;
}
/**
* 删除 redis校验重复引用设备的数据
* 删除redis校验重复引用设备的数据
*/
private void delRepeatUseEquipData(Long id, String status, String companyCode) {
List<JgEquipTransferEq> list = equipTransferEqService.lambdaQuery().eq(JgEquipTransferEq::getEquipTransferId, id).list();
......@@ -406,8 +409,11 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
this.saveOrUpdateHisDataBatch(jgEquipTransferEqList);
if (SUBMIT_TYPE_FLOW.equals(submitType)) {//放在最后面防止前面有异常
//如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
CompanyBo company = reginParams.getCompany();
jgEquipTransferEqList.forEach(equipTransferEq -> EquipUsedCheckStrategyContext.getUsedStrategy(EQUIP_TRANSFER_PROCESS_KEY)
.equipRepeatUsedCheck(equipTransferEq.getEquId(), reginParams.getCompany().getCompanyCode()));
.equipRepeatUsedCheck(equipTransferEq.getEquId(), CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
company.getCompanyCode().split("_")[1] :
company.getCompanyCode()));
}
return equipTransferDto;
}
......
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/JgScrapCancelServiceImpl.java
View file @ 4620c88f
......@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Sequence;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
......@@ -133,7 +134,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
public Page<JgScrapCancelDto> getList(JgScrapCancelDto dto, String sort, Page<JgScrapCancelDto> page, List<String> roleIds) {
ReginParams reginParams = this.getSelectedOrgInfo();
String orgCode = reginParams.getCompany().getCompanyCode();
CompanyBo company = reginParams.getCompany();
String orgCode = company.getCompanyCode();
if (CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType())) {
orgCode = company.getCompanyCode().split("_")[1];
}
dto.setCreateUserId(reginParams.getUserModel().getUserId());
String currentUserId = reginParams.getUserModel().getUserId();
SortVo sortMap = commonService.sortFieldConversion(sort);
......@@ -215,8 +220,12 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
// 判断当前是否为提交
List<WorkflowResultDto> workflowResultDtos = null;
if (SUBMIT_TYPE_FLOW.equals(submitType)) {
CompanyBo company = reginParams.getCompany();
List<JgScrapCancelEq> JgScrapCancelEqList = getCancelEqs(noticeParams);
this.repeatUsedEquipCheck(JgScrapCancelEqList, reginParams.getCompany().getCompanyCode());
this.repeatUsedEquipCheck(JgScrapCancelEqList,
CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
company.getCompanyCode().split("_")[1] :
company.getCompanyCode());
// 发起流程
ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
List<ActWorkflowStartDTO> list = new ArrayList<>();
......@@ -256,9 +265,12 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
} else {
jgScrapCancel.setAuditStatus(String.valueOf(WorkFlowStatusEnum.CANCEL_SUBMIT.getPass()));
}
jgScrapCancel.setUseUnitCode(reginParams.getCompany().getCompanyCode());
jgScrapCancel.setUseUnitCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
reginParams.getCompany().getCompanyCode().split("_")[1] :
reginParams.getCompany().getCompanyCode());
jgScrapCancel.setUseUnitName(reginParams.getCompany().getCompanyName());
jgScrapCancel.setCreateUserId(RequestContext.getExeUserId());
jgScrapCancel.setCreateUserName(reginParams.getUserModel().getRealName());
this.setUseRegisterInfo(jgScrapCancel, noticeParams);
this.save(jgScrapCancel);
// 新增代办
......@@ -521,8 +533,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
List<String> roleListAll = new ArrayList<>();
if (SUBMIT_TYPE_FLOW.equals(submitType)) {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
CompanyBo company = reginParams.getCompany();
List<JgScrapCancelEq> JgScrapCancelEqList = getCancelEqs(pageData);
this.repeatUsedEquipCheck(JgScrapCancelEqList, reginParams.getCompany().getCompanyCode());
this.repeatUsedEquipCheck(JgScrapCancelEqList, CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
company.getCompanyCode().split("_")[1] :
company.getCompanyCode());
// 更新并提交
// 发起流程
if (!StringUtils.hasText(jgScrapCancelDto.getInstanceId())) {
......@@ -1007,7 +1022,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
List<String> useRegistrationCodes = jgScrapCancelEqList.stream().map(JgScrapCancelEq::getUseRegistrationCode).collect(Collectors.toList());
LambdaQueryWrapper<JgUseRegistrationManage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCodes);
lambdaQueryWrapper.select(JgUseRegistrationManage::getUseRegistrationCode, JgUseRegistrationManage::getEquCategoryCode, JgUseRegistrationManage::getRegType, BaseEntity::getSequenceNbr);
lambdaQueryWrapper.select(JgUseRegistrationManage::getUseRegistrationCode, JgUseRegistrationManage::getEquCategoryCode,
JgUseRegistrationManage::getRegType, BaseEntity::getSequenceNbr, JgUseRegistrationManage::getCertificateNo);
return jgUseRegistrationManageMapper.selectList(lambdaQueryWrapper);
}
......@@ -1028,8 +1044,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
private void saveRecord(JgScrapCancel jgScrapCancel, List<JgScrapCancelEq> jgScrapCancelEqList, String routePath, List<JgUseRegistrationManage> jgUseRegistrationManageList) {
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
String userName = reginParams.getUserModel().getRealName();
String userName = jgScrapCancel.getCreateUserName();
String content = userName + "办理了【" + CancelTypeEnum.getNameByType(jgScrapCancel.getCancelType()) + "】" +
"单号【" + jgScrapCancel.getApplyNo() + "】，办理日期" + DateUtils.getDateNowShortStr();
List<JgCertificateChangeRecord> certificateChangeRecords = new ArrayList<>();
......@@ -1048,10 +1063,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
changeRecord.setReceiveCompanyCode(jgScrapCancel.getReceiveOrgCode());
changeRecord.setUseUnitCreditCode(jgScrapCancel.getUseUnitCode());
changeRecord.setUseUnitName(jgScrapCancel.getUseUnitName());
changeRecord.setEquCategory(jgUseRegistrationManage.getEquCategory());
changeRecord.setEquCategory(jgUseRegistrationManage.getEquCategoryCode());
changeRecord.setCreateDate(new Date());
changeRecord.setCreateUserId(reginParams.getUserModel().getUserId());
changeRecord.setRoutePath(routePath);
changeRecord.setCreateUserId(jgScrapCancel.getCreateUserId());
changeRecord.setCertificateNo(jgUseRegistrationManage.getCertificateNo());
certificateChangeRecords.add(changeRecord);
jgScrapCancelEqList.stream().filter(eq -> eq.getUseRegistrationCode().equals(jgUseRegistrationManage.getUseRegistrationCode())).forEach(e -> {
JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
......@@ -1061,12 +1077,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
changeRecordEqList.add(changeRecordEq);
});
}
if (certificateChangeRecords.size() > 0) {
if (!certificateChangeRecords.isEmpty()) {
certificateChangeRecordService.saveBatch(certificateChangeRecords);
}
if (changeRecordEqList.size() > 0) {
if (!changeRecordEqList.isEmpty()) {
jgCertificateChangeRecordEqServiceImpl.saveBatch(changeRecordEqList);
}
}
}
\ No newline at end of file
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/JgTransferNoticeServiceImpl.java
View file @ 4620c88f
......@@ -853,32 +853,32 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
jgTransferNotice.setPromoter("");
jgTransferNotice.setHandleDate(new Date());
jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
//修改设备ES设备使用场所和设备详细使用地址
Map<String, Map<String, Object>> objMap = new HashMap<>();
for (JgTransferNoticeEq eq : jgTransferNoticeEqs) {
Map<String, Object> map1 = new HashMap<>();
map1.put("USE_PLACE", String.format("%s/%s/%s", jgTransferNotice.getProvinceName(), jgTransferNotice.getCityName(), jgTransferNotice.getCityName()));
map1.put("ADDRESS", String.format("%s/%s", jgTransferNotice.getStreetName(), jgTransferNotice.getAddress()));
objMap.put(eq.getEquId(), map1);
}
tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
//修改设备ES设备使用场所和设备详细使用地址 ---- 移装告知不修改设备信息及es数据 BUG 21679
// Map<String, Map<String, Object>> objMap = new HashMap<>();
// for (JgTransferNoticeEq eq : jgTransferNoticeEqs) {
// Map<String, Object> map1 = new HashMap<>();
// map1.put("USE_PLACE", String.format("%s/%s/%s", jgTransferNotice.getProvinceName(), jgTransferNotice.getCityName(), jgTransferNotice.getCityName()));
// map1.put("ADDRESS", String.format("%s/%s", jgTransferNotice.getStreetName(), jgTransferNotice.getAddress()));
// objMap.put(eq.getEquId(), map1);
// }
// tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
// 修改使用信息
List<String> equIds = jgTransferNoticeEqs.stream().map(JgTransferNoticeEq::getEquId).collect(Collectors.toList());
LambdaUpdateWrapper<IdxBizJgUseInfo> lambda = new LambdaUpdateWrapper<>();
lambda.in(IdxBizJgUseInfo::getRecord, equIds);
IdxBizJgUseInfo idxBizJgUseInfo = new IdxBizJgUseInfo();
idxBizJgUseInfo.setProvince(jgTransferNotice.getProvince());
idxBizJgUseInfo.setProvinceName(jgTransferNotice.getProvinceName());
idxBizJgUseInfo.setCity(jgTransferNotice.getCity());
idxBizJgUseInfo.setCityName(jgTransferNotice.getCityName());
idxBizJgUseInfo.setCounty(jgTransferNotice.getCounty());
idxBizJgUseInfo.setCountyName(jgTransferNotice.getCountyName());
idxBizJgUseInfo.setFactoryUseSiteStreet(jgTransferNotice.getFactoryUseSiteStreet());
idxBizJgUseInfo.setStreetName(jgTransferNotice.getStreetName());
idxBizJgUseInfo.setAddress(jgTransferNotice.getAddress());
idxBizJgUseInfo.setIsNotXiXian(jgTransferNotice.getIsXixian());
idxBizJgUseInfoMapper.update(idxBizJgUseInfo, lambda);
// 修改使用信息 ---- 移装告知不修改设备信息及es数据 BUG 21679
// List<String> equIds = jgTransferNoticeEqs.stream().map(JgTransferNoticeEq::getEquId).collect(Collectors.toList());
// LambdaUpdateWrapper<IdxBizJgUseInfo> lambda = new LambdaUpdateWrapper<>();
// lambda.in(IdxBizJgUseInfo::getRecord, equIds);
// IdxBizJgUseInfo idxBizJgUseInfo = new IdxBizJgUseInfo();
// idxBizJgUseInfo.setProvince(jgTransferNotice.getProvince());
// idxBizJgUseInfo.setProvinceName(jgTransferNotice.getProvinceName());
// idxBizJgUseInfo.setCity(jgTransferNotice.getCity());
// idxBizJgUseInfo.setCityName(jgTransferNotice.getCityName());
// idxBizJgUseInfo.setCounty(jgTransferNotice.getCounty());
// idxBizJgUseInfo.setCountyName(jgTransferNotice.getCountyName());
// idxBizJgUseInfo.setFactoryUseSiteStreet(jgTransferNotice.getFactoryUseSiteStreet());
// idxBizJgUseInfo.setStreetName(jgTransferNotice.getStreetName());
// idxBizJgUseInfo.setAddress(jgTransferNotice.getAddress());
// idxBizJgUseInfo.setIsNotXiXian(jgTransferNotice.getIsXixian());
// idxBizJgUseInfoMapper.update(idxBizJgUseInfo, lambda);
// 上个代办改为已办
HashMap<String, Object> taskMap = new HashMap<>();
......
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/SafetyProblemTracingServiceImpl.java
View file @ 4620c88f
......@@ -13,6 +13,8 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.module.jg.api.entity.SafetyProblemTracing;
import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemSourceTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemStatusEnum;
......@@ -26,14 +28,14 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.ValidationUtils;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import java.util.stream.Collectors;
import static org.springframework.jdbc.object.BatchSqlUpdate.DEFAULT_BATCH_SIZE;
......@@ -48,6 +50,8 @@ public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTr
@Autowired
IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
@Autowired
DataDictionaryServiceImpl iDataDictionaryService;
private static Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
@Autowired
......@@ -68,6 +72,15 @@ public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTr
problemModel.setGoverningBodyOrgCode(orgCode);
// 使用orgCode过滤
problemModel.setRegionCode(null);
// 将单位类型从code转化为value
if (!ValidationUtil.isEmpty(problemModel.getPrincipalUnitType())){
Collection<DataDictionary> unitTypeList = iDataDictionaryService.list(new QueryWrapper<DataDictionary>()
.eq("type", "UNIT_TYPE_NEW")
.eq("is_delete", false)
.orderByAsc("sort_num"));
Map<String, String> unitTypeMap = unitTypeList.stream().collect(Collectors.toMap(DataDictionary::getCode, DataDictionary::getName));
problemModel.setPrincipalUnitType(unitTypeMap.getOrDefault(problemModel.getPrincipalUnitType(),null));
}
return this.baseMapper.queryForSafetyProblemTracingPage(page, problemModel);
}
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionApplicationMapper.java
View file @ 4620c88f
......@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationMode
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
import java.util.Set;
......@@ -81,6 +82,18 @@ public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspecti
* @return CountDto
*/
CountDto queryAppByEquListForReporting(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
Long queryAllFlowingAndFinishedCount(@Param("orgCode") String orgCode, @Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto);
Long queryAllPendingAndFinishedCount(@Param("orgCode") String orgCode, @Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto);
Long queryAllFinishedCount(@Param("orgCode") String orgCode, @Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto);
Long countBizFinishedNumForDP(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto, @Param("businessType") String businessType);
Long countAllInFlowingForDPNoFinishedBizData(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto, @Param("businessType") String businessType);
Page<Map<String, Object>> getInspectDetailList(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto filterParamDto, @Param("businessType") String businessType);
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationEquipMapper.xml
View file @ 4620c88f
......@@ -65,6 +65,7 @@
INNER JOIN tz_jyjc_inspection_application_equip ae ON A.sequence_nbr = ae.application_seq
WHERE
A.status = '6616'
AND A.inspection_type = 'DQJY'
AND ae.equ_category = '2300'
AND pc.company_code = #{dpFilterParamDto.cityCode}
AND ( A.application_date BETWEEN #{ dpFilterParamDto.beginDate } AND #{ dpFilterParamDto.endDate } )
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml
View file @ 4620c88f
......@@ -296,4 +296,109 @@
and date_le(CAST(a.application_date as date),#{dto.endDate})
</if>
</select>
<select id="queryAllFlowingAndFinishedCount" resultType="java.lang.Long">
SELECT
count(1)
FROM
"tz_jyjc_inspection_application" a,
tz_base_enterprise_info b
where
a.inspection_unit_code= b.use_unit_code
and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dpFilterParamDto.cityCode}, '%')))
and a.status != '6610' and a.status != '6615'
and date_ge(CAST(a.application_date as date),#{dpFilterParamDto.beginDate})
and date_le(CAST(a.application_date as date),#{dpFilterParamDto.endDate})
</select>
<select id="queryAllPendingAndFinishedCount" resultType="java.lang.Long">
SELECT
count(1)
FROM
tz_jyjc_inspection_application a,
tz_base_enterprise_info b
where
a.inspection_unit_code= b.use_unit_code
and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dpFilterParamDto.cityCode}, '%')))
and a.status = '6616'
and EXISTS (select 1 from tz_jyjc_inspection_result r where ( r.result_status='1' or r.result_status='2') and a.application_no = r.application_no)
and date_ge(CAST(a.accept_date as date),#{dpFilterParamDto.beginDate}) and date_le(CAST(a.accept_date as date),#{dpFilterParamDto.endDate})
</select>
<select id="queryAllFinishedCount" resultType="java.lang.Long">
SELECT
count(1)
FROM
tz_jyjc_inspection_application a,
tz_base_enterprise_info b
where
a.inspection_unit_code= b.use_unit_code
and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dpFilterParamDto.cityCode}, '%')))
and a.status = '6616'
and EXISTS (select 1 from tz_jyjc_inspection_result r where r.result_status='2' and a.application_no = r.application_no)
and date_ge(CAST(a.accept_date as date),#{dpFilterParamDto.beginDate}) and date_le(CAST(a.accept_date as date),#{dpFilterParamDto.endDate})
</select>
<select id="countBizFinishedNumForDP" resultType="java.lang.Long">
SELECT
count(1)
FROM
"tz_jyjc_inspection_application" a,
tz_base_enterprise_info b
where
a.inspection_unit_code= b.use_unit_code
and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
and a.status = '6616'
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(a.accept_date as date),#{dto.beginDate})
</if>
<if test="dto.endDate != null and dto.endDate != ''">
and date_le(CAST(a.accept_date as date),#{dto.endDate})
</if>
<if test="businessType !=null and businessType !=''">
and a.inspection_type = #{businessType}
</if>
</select>
<select id="countAllInFlowingForDPNoFinishedBizData" resultType="java.lang.Long">
SELECT
count(1)
FROM
"tz_jyjc_inspection_application" a,
tz_base_enterprise_info b
where
a.inspection_unit_code= b.use_unit_code
and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
and a.status != '6610' and a.status != '6615' and a.status != '6617' and a.status != '6616'
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(a.application_date as date),#{dto.beginDate})
</if>
<if test="dto.endDate != null and dto.endDate != ''">
and date_le(CAST(a.application_date as date),#{dto.endDate})
</if>
<if test="businessType !=null and businessType !=''">
and a.inspection_type = #{businessType}
</if>
</select>
<select id="getInspectDetailList" resultType="java.util.Map">
SELECT
a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as receiveOrgName,application_date as createDate,accept_date as handleDate
FROM
"tz_jyjc_inspection_application" a,
tz_base_enterprise_info b
where
a.inspection_unit_code= b.use_unit_code
and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
and a.status = '6616'
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(a.accept_date as date),#{dto.beginDate})
</if>
<if test="dto.endDate != null and dto.endDate != ''">
and date_le(CAST(a.accept_date as date),#{dto.endDate})
</if>
<if test="dto.companyName != null and dto.companyName != ''">
and application_unit_name like CONCAT('%', #{dto.companyName}, '%')
</if>
<if test="dto.superviseUnitName != null and dto.superviseUnitName != ''">
and inspection_unit_name like CONCAT('%', #{dto.superviseUnitName}, '%')
</if>
<if test="businessType !=null and businessType !=''">
and a.inspection_type = #{businessType}
</if>
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcOpeningApplicationMapper.xml
View file @ 4620c88f
......@@ -80,7 +80,6 @@
a.unit_code= b.use_unit_code
and a.unit_code=l.unit_code
and l.cert_type_code = a.open_biz_type
and b.supervise_org_code like CONCAT(#{orgCode}, '%')
and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
ORDER BY unitName
</select>
......@@ -94,7 +93,7 @@
ei.legal_person,
ei.use_contact,
ei.contact_phone,
(select count(1) from tzs_user_info u where u.unit_code = ei.use_unit_code and u.is_delete = false) as personNum,
(select count(1) from tzs_user_info u where u.unit_code = ei.use_code and u.is_delete = false) as personNum,
(
select
group_concat(concat(a.cert_no,'#',a.expiry_date)) cert_no
......
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/JyjcInspectionApplicationServiceImpl.java
View file @ 4620c88f
......@@ -630,6 +630,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
datas.put("datas", records);
datas.put("title", "审批进度");
datas.put("renderType", "timeline");
resultMap.put("title", map.get("applicationUnitName"));
resultMap.put("infoRecords", datas);
resultMap.put("keyParams", jsonData);
return resultMap;
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/dto/SafetyProblemTracingDto.java 0 → 100644
View file @ 4620c88f
package com.yeejoin.amos.boot.module.statistics.api.dto;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.Map;
/**
* 安全追溯问题
*
* @author system_generator
* @date 2024-05-21
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "SafetyProblemTracingDto", description = "安全追溯问题")
public class SafetyProblemTracingDto extends DPFilterParamForDetailDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键ID")
protected Long sequenceNbr;
@ApiModelProperty(value = "更新时间")
protected Date recDate;
@ApiModelProperty(value = "更新人id")
protected String recUserId;
@ApiModelProperty(value = "更新人")
protected String recUserName;
@ApiModelProperty(value = "问题编号")
private String problemNum;
@ApiModelProperty(value = "问题类型（维保超期、检验超期、资质超期等）")
private String problemType;
@ApiModelProperty(value = "问题类型图片")
private String problemTypePic;
@ApiModelProperty(value = "问题来源类型（1个人、2设备、3企业）")
private String sourceType;
@ApiModelProperty(value = "问题来源ID（个人ID、设备ID、企业ID）")
private String sourceId;
@ApiModelProperty(value = "问题描述")
private String problemDesc;
@ApiModelProperty(value = "问题产生查询开始时间")
private String problemTimeStart;
@ApiModelProperty(value = "问题产生时间")
private Date problemTime;
@ApiModelProperty(value = "问题产生查询结束时间")
private String problemTimeEnd;
@ApiModelProperty(value = "主体单位名称")
private String principalUnit;
@ApiModelProperty(value = "主体单位统一代码")
private String principalUnitCode;
@ApiModelProperty(value = "主体单位类型（使用、安改维、检验检测等）")
private String principalUnitType;
@ApiModelProperty(value = "管辖机构名称")
private String governingBody;
@ApiModelProperty(value = "管辖机构单位代码")
private String governingBodyCode;
@ApiModelProperty(value = "管辖机构组织机构代码（例如50*60*70）")
private String governingBodyOrgCode;
@ApiModelProperty(value = "主体单位所属区域名称（陕西省/西安市/莲湖区）")
private String regionName;
@ApiModelProperty(value = "所属区域代码（6100000/6100010/6100011）")
private String regionCode;
@ApiModelProperty(value = "问题状态（0未处理、1已处理）")
private String problemStatus;
@ApiModelProperty(value = "问题状态代码（0未处理、1已处理）")
private String problemStatusCode;
@ApiModelProperty(value = "问题状态对象")
private Map<String, String> problemStatusObj;
@ApiModelProperty(value = "更新人员")
private String recUser;
@ApiModelProperty(value = "创建人ID")
private String createUserId;
@ApiModelProperty(value = "创建时间")
private Date createDate;
@ApiModelProperty(value = "创建人")
private String createUser;
@ApiModelProperty(value = "企业负责人")
private String unitCharger;
@ApiModelProperty(value = "企业负责人联系电话")
private String unitChargerPhone;
@ApiModelProperty(value = "设备监管码")
private String equipSuperviseCode;
@ApiModelProperty(value = "设备种类")
private String equipList;
@ApiModelProperty(value = "人员名称")
private String userName;
@ApiModelProperty(value = "人员电话")
private String userPhone;
@ApiModelProperty(value = "人员岗位")
private String userPost;
@ApiModelProperty(value = "扩展信息")
private String extraInfo;
@ApiModelProperty(value = "设备种类代码")
private String equipListCode;
@ApiModelProperty(value = "问题类型代码（维保超期、检验超期、资质超期等）")
private String problemTypeCode;
@ApiModelProperty(value = "问题来源类型code（1个人、2设备、3企业）")
private String sourceTypeCode;
@ApiModelProperty(value = "问题等级（一级、二级、三级）")
private String problemLevel;
@ApiModelProperty(value = "问题等级code")
private String problemLevelCode;
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/dto/SecurityIndexCountItemDto.java
View file @ 4620c88f
......@@ -42,4 +42,14 @@ public class SecurityIndexCountItemDto {
* 充装检查率
*/
String czjchege;
/**
* 人员合规率（资质有效期统计）
*/
String ryhg;
/**
* 数据合规率
*/
String sjhg;
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/dto/SubTreeDto.java 0 → 100644
View file @ 4620c88f
package com.yeejoin.amos.boot.module.statistics.api.dto;
import lombok.Data;
import java.util.List;
/**
* @author Administrator
*/
@Data
public class SubTreeDto {
private String value;
private String title;
private List<SubTreeDto> children;
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/AnomalyTypeEnum.java 0 → 100644
View file @ 4620c88f
package com.yeejoin.amos.boot.module.statistics.api.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.HashMap;
import java.util.Map;
@Getter
@AllArgsConstructor
public enum AnomalyTypeEnum {
NORMAL("正常", "0"),
ABNORMAL("异常", "1");
private String name;
private String code;
public static Map<String,String> getName=new HashMap<>();
public static Map<String,String> getCode=new HashMap<>();
static {
for (AnomalyTypeEnum e : AnomalyTypeEnum.values()) {
getCode.put(e.name, e.code);
getName.put(e.code, e.name);
}
}
public static AnomalyTypeEnum getEnumByStatus(String code) {
for (AnomalyTypeEnum c : AnomalyTypeEnum.values()) {
if (c.getCode().equals(code)){
return c;
}
}
return null;
}
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/AQZSDPStatisticsMapper.java
View file @ 4620c88f
package com.yeejoin.amos.boot.module.statistics.api.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.dto.CountDto;
import com.yeejoin.amos.boot.biz.common.dto.KeyValueDto;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
import com.yeejoin.amos.boot.module.statistics.api.dto.EquipQuestionNumCountDto;
import com.yeejoin.amos.boot.module.statistics.api.dto.SafetyProblemTracingDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -14,17 +17,23 @@ public interface AQZSDPStatisticsMapper {
String getOrgCodeByCompanyCode(@Param("cityCode") String cityCode);
List<Map<String, Object>> selectByOrgAndMainBody(@Param("orgCode") String orgCode, @Param("mainBodyNameList") List<String> mainBodyNameList,
@Param("startDate") String startDate, @Param("status") String status);
/**
* 按照问题状态、问题类型分组统计问题数量
* @param orgCode 区域对应orgCode
* @param filterParamDto 过滤日期
* @return List<CountDto>
*/
List<CountDto> selectByOrgAndMainBody(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto filterParamDto, @Param("sourceTypeCode") String sourceTypeCode);
List<Map<String, Object>> selectByOrgAndProblemType(@Param("orgCode") String orgCode, @Param("enumNameList") List<String> enumNameList,
@Param("startDate") String startDate, @Param("sourceType") String sourceType, @Param("equipType") String equipType);
List<CountDto> selectByOrgAndProblemType(@Param("orgCode") String orgCode, @Param("enumNameList") List<String> enumNameList,
@Param("dto") DPFilterParamDto dpFilterParamDto, @Param("sourceTypeCode") String sourceTypeCode, @Param("equListCode") String equListCode);
List<Map<String, Object>> getIssueCountByMonth(@Param("orgCode") String orgCode, @Param("year") String year, @Param("status") String status);
List<Map<String, Object>> getIssueCountByDate(@Param("orgCode") String orgCode, @Param("year") String year, @Param("status") String status);
int countByOrgCode(@Param("orgCode") String orgCode, @Param("now") String now);
int countByOrgCode(@Param("orgCode") String orgCode, @Param("now") String now, @Param("sourceTypeCode") String sourceTypeCode);
List<Map<String, String>> getOrgCodeAndCompanyCodesByCompanyCodes(@Param("regionCodes") List<Integer> regionCodes);
......@@ -32,7 +41,7 @@ public interface AQZSDPStatisticsMapper {
List<Map<String, Object>> issueMonthList(@Param("orgCode") String orgCode, @Param("time") String time);
List<Map<String, Object>> issueProblemLevelCount(@Param("orgCode") String orgCode, @Param("time") String time);
List<CountDto> issueProblemLevelCount(@Param("orgCode") String orgCode, @Param("time") String time);
List<Map<String, Object>> issueCompanyTop(@Param("orgCode") String orgCode, @Param("time") String time);
......@@ -65,4 +74,9 @@ public interface AQZSDPStatisticsMapper {
List<Map<String, Object>> selectByOrg(String orgCode);
List<Map<String, Object>> cylinderIssueMonthList(@Param("orgCode") String orgCode, @Param("time") String time);
List<CountDto> selectByOrgAndProblemTypeForCy(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
Page<SafetyProblemTracingDto> queryForSafetyProblemTracingPage(Page<SafetyProblemTracingDto> page, SafetyProblemTracingDto problemModel);
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/AlertStatisticsMapper.java
View file @ 4620c88f
package com.yeejoin.amos.boot.module.statistics.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.dto.CountDto;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
import com.yeejoin.amos.boot.module.common.api.entity.AlertStatistics;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* Mapper 接口
......@@ -30,6 +34,8 @@ public interface AlertStatisticsMapper extends BaseMapper<AlertStatistics> {
List<CountDto>countEmergencyEventsByOrgCodeAndDate2(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto filterParamDto);
Long countAlertRecordByOrgCodeAndDate(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamForDetailDto filterParamDto);
/**
* 统计被困人数
* @param orgCode 区域对应的orgCode
......@@ -37,4 +43,9 @@ public interface AlertStatisticsMapper extends BaseMapper<AlertStatistics> {
* @return 被困人数
*/
Long countRescuedPersonNum(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto filterParamDto);
@MapKey(value = "alertRecordForPage")
Page<Map<String, Object>> alertRecordForPage(@Param("page") Page<Map<String, Object>> page,
@Param("dto") DPFilterParamForDetailDto dto,
@Param("orgCode") String orgCode);
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/CylinderStatisticsMapper.java
View file @ 4620c88f
package com.yeejoin.amos.boot.module.statistics.api.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -27,4 +29,14 @@ public interface CylinderStatisticsMapper {
* @return 办证数量
*/
Long countForCylinderCertNum(String orgCode);
Long countFillingVolumeCount(@Param("orgCode") String orgCode);
Long countDischargeVolumeCount(@Param("orgCode") String orgCode);
Long countEnterpriseUsed(@Param("orgCode") String orgCode);
IPage<TzBaseEnterpriseInfoDto> getStationRateSubPage(IPage<TzBaseEnterpriseInfoDto> page,
@Param("companyName") String companyName,
@Param("orgCode") String orgCode);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/DPStatisticsMapper.java → amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/JGStatisticsMapper.java
View file @ 4620c88f
package com.yeejoin.amos.boot.module.jg.api.mapper;
package com.yeejoin.amos.boot.module.statistics.api.mapper;
import com.yeejoin.amos.boot.biz.common.dto.CountDto;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
public interface DPStatisticsMapper {
public interface JGStatisticsMapper {
List<Map<String, Object>> maintenanceCountTopTen(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto, @Param("regionCodeList") List<Integer> regionCodeList);
List<Map<String, Object>> maintenanceCount(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto, @Param("regionCodeList") List<Integer> regionCodeList);
List<Map<String, Object>> installEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
List<Map<String, Object>> installEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
List<Map<String, Object>> maintenanceEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
List<Map<String, Object>> maintenanceEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
List<Map<String, Object>> reformEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
List<Map<String, Object>> reformEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
List<Map<String, Object>> transferEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
List<Map<String, Object>> transferEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
List<Map<String, Object>> useEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
List<Map<String, Object>> useEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
List<Map<String, Object>> changeReformEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
List<Map<String, Object>> changeReformEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
List<Map<String, Object>> changeTransferEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
List<Map<String, Object>> changeTransferEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
List<Map<String, Object>> changeUnitEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
List<Map<String, Object>> changeUnitEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
List<Map<String, Object>> vehicleEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
List<Map<String, Object>> vehicleEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
List<Map<String, Object>> newRegEquCountByMonth(@Param("cityCode") String cityCode);
......@@ -40,32 +41,8 @@ public interface DPStatisticsMapper {
List<Map<String, Object>> newVehicleEquCountByYear(@Param("cityCode") String cityCode);
String newVehicleCountByYear(@Param("cityCode") String cityCode);
String newVehicleCountByMonth(@Param("cityCode") String cityCode);
List<Map<String, Object>> installCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> maintenanceNoticeCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> reformCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> transferCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> useCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> vehicleCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> changeNameCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> changeReformCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> changeTransferCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> changeUnitCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> changeVehicleCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> disableCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
List<Map<String, Object>> cancelCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
String newVehicleCountByMonth(@Param("cityCode") String cityCode);
long certificateCountByOrgCode(@Param("orgCode") String orgCode);
......@@ -80,4 +57,14 @@ public interface DPStatisticsMapper {
List<Map<String, Object>> selectNoticeList(@Param("orgCode") String orgCode, @Param("time") String time);
List<Map<String, Object>> selectNoticeCountTopTen(@Param("orgCode") String orgCode, @Param("time") String time);
List<CountDto> queryNoticeAvgDayByReceiveCompany(@Param("dto") DPFilterParamDto dpFilterParamDto,@Param("orgCode") String orgCode);
List<CountDto> queryUseAvgDayByReceiveCompany(@Param("dto") DPFilterParamDto dpFilterParamDto, @Param("orgCode") String orgCode);
List<CountDto> queryChangeAvgDayByReceiveCompany(@Param("dto") DPFilterParamDto dpFilterParamDto, @Param("orgCode") String orgCode);
List<CountDto> queryDisableAvgDayByReceiveCompany(@Param("dto") DPFilterParamDto dpFilterParamDto, @Param("orgCode") String orgCode);
List<CountDto> queryCancelAvgDayByReceiveCompany(@Param("dto") DPFilterParamDto dpFilterParamDto, @Param("orgCode") String orgCode);
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/ZLStatisticsMapper.java
View file @ 4620c88f
......@@ -16,7 +16,6 @@ import java.util.Map;
@Mapper
public interface ZLStatisticsMapper {
List<Map<String, Object>> getCompanyInfo(@Param("screenDto") DPFilterParamDto screenDto);
List<Map<String, Object>> testOrg(@Param("screenDto") DPFilterParamDto screenDto);
......@@ -32,4 +31,8 @@ public interface ZLStatisticsMapper {
Long countCompanyForCertDateTimeOut(@Param("dto") DPFilterParamDto dpFilterParamDto, @Param("orgCode") String orgCode, @Param("limitDate") String limitDate);
Long countCompanyForCertDateTemporary(@Param("dto")DPFilterParamDto dpFilterParamDto, @Param("orgCode") String orgCode, @Param("limitDate") String limitDate);
Long getEquipTotal(@Param("cityCode") String cityCode);
Long getEquListTotal(@Param("field") String field, @Param("cityCode") String cityCode);
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/vo/EquCategoryVo.java 0 → 100644
View file @ 4620c88f
package com.yeejoin.amos.boot.module.statistics.api.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class EquCategoryVo {
public String value;
public String label;
public String title;
public List<EquCategoryVo> children;
public EquCategoryVo(String label, String value, List<EquCategoryVo> children) {
this.label = label;
this.value = value;
this.title = label;
this.children = children;
}
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/AQZSDPStatisticsMapper.xml
View file @ 4620c88f
......@@ -6,37 +6,43 @@
<select id="getOrgCodeByCompanyCode" resultType="java.lang.String">
select org_code from privilege_company where company_code = #{cityCode} limit 1
</select>
<select id="selectByOrgAndMainBody" resultType="java.util.Map">
SELECT COUNT
( 1 ),
source_type AS sourceType
<select id="selectByOrgAndMainBody" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
SELECT
COUNT(1) as longValue,
source_type_code AS keyStr,
problem_status_code as label
FROM
tzs_safety_problem_tracing
WHERE
governing_body_org_code LIKE concat ( #{orgCode}, '%' )
AND problem_time &gt;= #{startDate}
AND source_type IN
<foreach collection="mainBodyNameList" item="item" separator="," open="(" close=")">
#{item}
</foreach>
<if test="null != status">
AND problem_status_code = #{status}
governing_body_org_code LIKE concat (#{orgCode}, '%')
<if test="dto != null and dto.beginDate !=null and dto.beginDate !=''">
and date_ge(CAST(problem_time as date),#{dto.beginDate})
</if>
GROUP BY
source_type
<if test="dto != null and dto.endDate !=null and dto.endDate !=''">
and date_le(CAST(problem_time as date),#{dto.endDate})
</if>
<if test="sourceTypeCode !=null and sourceTypeCode !=''">
and source_type_code = #{sourceTypeCode}
</if>
GROUP BY source_type_code,problem_status_code
</select>
<select id="selectByOrgAndProblemType" resultType="java.util.Map">
SELECT COUNT
( 1 ),
problem_type AS problemType
FROM
<select id="selectByOrgAndProblemType" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
SELECT
COUNT(1) as longValue,
problem_type AS keyStr
FROM
tzs_safety_problem_tracing
WHERE
governing_body_org_code LIKE concat ( #{orgCode}, '%' )
AND problem_time &gt;= #{startDate}
AND source_type = #{sourceType}
<if test="null != equipType">
AND equip_list_code = #{equipType}
<if test="dto.beginDate !=null and dto.beginDate !=''">
and date_ge(CAST(problem_time as date),#{dto.beginDate})
</if>
<if test="dto.endDate !=null and dto.endDate !=''">
and date_le(CAST(problem_time as date),#{dto.endDate})
</if>
AND source_type_code = #{sourceTypeCode}
<if test="null != equListCode">
AND equip_list_code = #{equListCode}
</if>
AND problem_type IN
<foreach collection="enumNameList" item="item" separator="," open="(" close=")">
......@@ -44,12 +50,31 @@
</foreach>
GROUP BY
problem_type
</select>
<select id="selectByOrgAndProblemTypeForCy" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
SELECT
COUNT(1) as longValue,
t.problem_type AS keyStr
FROM
tzs_safety_problem_tracing t,
idx_biz_jg_register_info A
WHERE
A.RECORD = t.source_id
AND A.EQU_CATEGORY = '2300'
and t.governing_body_org_code LIKE concat (#{orgCode}, '%')
<if test="dto.beginDate !=null and dto.beginDate !=''">
and date_ge(CAST(t.problem_time as date),#{dto.beginDate})
</if>
<if test="dto.endDate !=null and dto.endDate !=''">
and date_le(CAST(t.problem_time as date),#{dto.endDate})
</if>
AND t.source_type_code = '3'
GROUP BY t.problem_type
</select>
<select id="getIssueCountByMonth" resultType="java.util.Map">
SELECT COUNT
( 1 ),
DATE_FORMAT(problem_time,'%Y-%m') AS time
SELECT
COUNT(1),
DATE_FORMAT(problem_time,'%Y-%m') AS time
FROM
tzs_safety_problem_tracing
WHERE
......@@ -84,7 +109,12 @@
tzs_safety_problem_tracing
WHERE
governing_body_org_code LIKE concat ( #{orgCode}, '%' )
AND DATE_FORMAT(problem_time,'%Y-%m') &gt;= #{now}
<if test="now != null and now != ''">
AND DATE_FORMAT(problem_time,'%Y-%m') &gt;= #{now}
</if>
<if test="sourceTypeCode !=null and sourceTypeCode !=''">
and source_type_code = #{sourceTypeCode}
</if>
</select>
<select id="getOrgCodeAndCompanyCodesByCompanyCodes" resultType="java.util.Map">
select org_code AS orgCode,company_code AS companyCode from privilege_company where company_code in
......@@ -136,19 +166,18 @@
AND A.EQU_CATEGORY = '2300'
</select>
<select id="issueProblemLevelCount" resultType="java.util.Map">
<select id="issueProblemLevelCount" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
SELECT
COUNT
( 1 ),
problem_level AS problemLevel
COUNT(1) as longValue,
problem_level_code AS keyStr
FROM
tzs_safety_problem_tracing
WHERE
governing_body_org_code LIKE concat ( #{orgCode}, '%' )
AND DATE_FORMAT(problem_time,'%Y') = #{time}
AND problem_level IS NOT NULL
AND problem_level_code IS NOT NULL
GROUP BY
problem_level
problem_level_code
ORDER BY
problem_level_code
</select>
......@@ -194,7 +223,7 @@
FROM
tzs_safety_problem_tracing
WHERE
governing_body_org_code LIKE concat ( #{orgCode}, '%' )
governing_body_org_code LIKE concat ( #{orgCode}, '%')
<if test="null != status">
AND problem_status_code = #{status}
</if>
......@@ -335,6 +364,61 @@
GROUP BY
source_type
</select>
<select id="queryForSafetyProblemTracingPage" resultType="com.yeejoin.amos.boot.module.statistics.api.dto.SafetyProblemTracingDto">
select
spt.*,
(select extend::json->>'pic' from cb_data_dictionary where type = 'ISSUE_TYPE' and code = spt.problem_type_code) problemTypePic
from tzs_safety_problem_tracing spt
<where>
spt.is_delete = false
<if test="problemModel.problemNum != null and problemModel.problemNum != ''">
and spt.problem_num = LIKE CONCAT('%', #{problemModel.problemNum}, '%')
</if>
<if test="problemModel.problemStatus != null and problemModel.problemStatus != ''">
and spt.problem_status = #{problemModel.problemStatus}
</if>
<if test="problemModel.sourceTypeCode != null and problemModel.sourceTypeCode != ''">
and spt.source_type_code = #{problemModel.sourceTypeCode}
</if>
<if test="problemModel.problemLevelCode != null and problemModel.problemLevelCode != ''">
and spt.problem_level_code = #{problemModel.problemLevelCode}
</if>
<if test="problemModel.problemTypeCode != null and problemModel.problemTypeCode != ''">
and spt.problem_type_code = #{problemModel.problemTypeCode}
</if>
<if test="problemModel.problemTimeStart != null and problemModel.problemTimeStart != ''">
and cast(spt.problem_time AS DATE) >= cast(#{problemModel.problemTimeStart} AS DATE)
</if>
<if test="problemModel.problemTimeEnd != null and problemModel.problemTimeEnd != ''">
and cast(spt.problem_time AS DATE) <![CDATA[<=]]> cast(#{problemModel.problemTimeEnd} AS DATE)
</if>
<if test="problemModel.problemDesc != null and problemModel.problemDesc != ''">
and spt.problem_desc like CONCAT('%', #{problemModel.problemDesc}, '%')
</if>
<if test="problemModel.sourceId != null and problemModel.sourceId != ''">
and spt.source_id = #{problemModel.sourceId}
</if>
<if test="problemModel.governingBodyOrgCode != null and problemModel.governingBodyOrgCode != ''">
and spt.governing_body_org_code like CONCAT(#{problemModel.governingBodyOrgCode}, '%')
</if>
<if test="problemModel.governingBodyCode != null and problemModel.governingBodyCode != ''">
and spt.governing_body_code = #{problemModel.governingBodyCode}
</if>
<if test="problemModel.principalUnit != null and problemModel.principalUnit != ''">
and spt.principal_unit like CONCAT('%', #{problemModel.principalUnit}, '%')
</if>
<if test="problemModel.principalUnitType != null and problemModel.principalUnitType != ''">
and spt.principal_unit_type = #{problemModel.principalUnitType}
</if>
<if test="problemModel.regionCode != null and problemModel.regionCode != ''">
and spt.region_code like CONCAT(#{problemModel.regionCode}, '%')
</if>
<if test="problemModel.problemStatusCode != null and problemModel.problemStatusCode != ''">
and spt.problem_status_code = #{problemModel.problemStatusCode}
</if>
</where>
order by spt.create_date desc
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/AlertStatisticsMapper.xml
View file @ 4620c88f
......@@ -87,7 +87,7 @@
(SELECT min(dispatch_time) from tz_dispatch_task where alert_id = t1.sequence_nbr and dispatch_time is not null ) as dis
from tz_alert_called t1 where t1.region_code like concat('%', #{regionCode}, '%') and t1.alarm_type_code = '960' and call_time BETWEEN #{startDate} and #{endDate} and father_alert is null
) as snad where extract(epoch from arr - dis ) > 1800
) as snad where extract(epoch from arr - dis ) <![CDATA[ <= ]]> 1800
) as withinThirtyRescue,
(SELECT count(1) from tz_alert_called where region_code like concat('%', #{regionCode}, '%') and alarm_type_code = '960' and call_time BETWEEN #{startDate} and #{endDate} and father_alert is null) as greaterNum,
(
......@@ -158,7 +158,8 @@
FROM
tz_alert_called
WHERE
biz_org_code like concat(#{orgCode}, '%')
is_delete = 0
and biz_org_code like concat(#{orgCode}, '%')
and (alarm_type_code = '960' or alarm_type_code = '961' or alarm_type_code = '962')
<if test="dto.beginDate !=null and dto.beginDate !=''">
and date_ge(CAST(call_time as date),#{dto.beginDate})
......@@ -168,4 +169,98 @@
</if>
group by alarm_type_code
</select>
<select id="countAlertRecordByOrgCodeAndDate" resultType="java.lang.Long">
SELECT
count(1)
FROM
tz_alert_called
WHERE
is_delete = 0
and (father_alert IS NULL or father_alert = '')
and biz_org_code like concat(#{orgCode}, '%')
<if test="dto != null and dto.timeSearchOne != null and dto.timeSearchOne.beginDate != null and dto.timeSearchOne.beginDate != ''">
and date_ge(CAST(call_time as date), #{dto.timeSearchOne.beginDate})
</if>
<if test="dto != null and dto.timeSearchOne != null and dto.timeSearchOne.endDate != null and dto.timeSearchOne.endDate != ''">
and date_le(CAST(call_time as date), #{dto.timeSearchOne.endDate})
</if>
<if test="dto.alertTypeCode !=null and dto.alertTypeCode !='' and dto.alertTypeCode !='yjsj'">
and alarm_type_code = #{dto.alertTypeCode}
</if>
<if test="dto.alertTypeCode == null or dto.alertTypeCode == '' and dto.alertTypeCode =='yjsj'">
and (alarm_type_code = '960' or alarm_type_code = '961' or alarm_type_code = '962')
</if>
<if test="dto.typeCode !=null and dto.typeCode !=''">
and type_code = #{dto.typeCode}
</if>
<if test="dto.alertSourceCode !=null and dto.alertSourceCode !=''">
and alert_source_code = #{dto.alertSourceCode}
</if>
</select>
<select id="alertRecordForPage" resultType="java.util.Map">
SELECT
"contact_phone" as contactPhone ,
"city",
"type" ,
"skill_group" as skillGroup,
"response_level" as responseLevel ,
"emergency_person" as emergencyPerson,
"alert_stage_code" as alertStageCode,
"work_order_number" as workOrderNumber,
"alarm_type" as alarmType,
"alert_source" as alertSource,
"biz_org_code" as bizOrgCode,
"alert_source_code" as alertSourceCode,
"equipment_classification_code" as equipmentClassificationCode,
"address" as address,
"device_id" as deviceId,
"contact_user" as contactUser,
"equipment_classification" as equipmentClassification,
"alarm_type_code" as alarmTypeCode,
"call_time" as callTime,
"sequence_nbr" as sequenceNbr,
"is_delete" as sequenceNbr,
"alert_status" as alertStatus,
"rec_user_id" as recUserId,
"registration_code" as registrationCode,
"district" as district,
"alert_stage" as alertStage,
"emergency_call" as emergencyCall,
"type_code" as typeCode,
"region_code" as regionCode,
"equipment_id" as equipmentId
FROM tz_alert_called
<where>
is_delete = 0
and biz_org_code like concat(#{orgCode}, '%')
<if test="dto != null and dto.timeSearchOne != null and dto.timeSearchOne.beginDate != null and dto.timeSearchOne.beginDate != ''">
and date_ge(CAST(call_time as date), #{dto.timeSearchOne.beginDate})
</if>
<if test="dto != null and dto.timeSearchOne != null and dto.timeSearchOne.endDate != null and dto.timeSearchOne.endDate != ''">
and date_le(CAST(call_time as date), #{dto.timeSearchOne.endDate})
</if>
<if test="dto.alertTypeCode !=null and dto.alertTypeCode !='' and dto.alertTypeCode !='yjsj'">
and alarm_type_code = #{dto.alertTypeCode}
</if>
<if test="dto.alertTypeCode == null or dto.alertTypeCode == '' and dto.alertTypeCode =='yjsj'">
and (alarm_type_code = '960' or alarm_type_code = '961' or alarm_type_code = '962')
</if>
<if test="dto.typeCode != null and dto.typeCode != ''">
and type_code = #{dto.typeCode}
</if>
<if test="dto.alertSourceCode != null and dto.alertSourceCode != ''">
and alert_source_code = #{dto.alertSourceCode}
</if>
</where>
ORDER BY rec_date DESC
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/CylinderStatisticsMapper.xml
View file @ 4620c88f
......@@ -9,6 +9,7 @@
where
unit_type LIKE'%充装单位%'
and supervise_org_code like concat(#{orgCode},'%')
and is_delete = '0'
</select>
<select id="queryUserRegisterCertAppPercent" resultType="java.lang.String">
select
......@@ -18,11 +19,12 @@
count(DISTINCT(a.use_unit_credit_code)) as num
FROM
"tzs_jg_use_registration_manage" a,
privilege_company c
"tz_base_enterprise_info" tbei
where
a.receive_company_code = c.company_code
and a.certificate_status='已登记'
and c.org_code like concat(#{orgCode},'%')) s1,
a.use_unit_credit_code = tbei.use_code
AND tbei.unit_type LIKE'%充装单位%'
and a.certificate_status='已登记'
and tbei.supervise_org_code like concat(#{orgCode},'%')) s1,
(SELECT
count(1) as total
FROM "tz_base_enterprise_info"
......@@ -33,14 +35,61 @@
</select>
<select id="countForCylinderCertNum" resultType="java.lang.Long">
SELECT
count(DISTINCT(a.use_unit_credit_code)) as num
count(a.use_unit_credit_code) as num
FROM
"tzs_jg_use_registration_manage" a,
privilege_company c
where
a.receive_company_code = c.company_code
and a.certificate_status ='已登记'
and a.equ_category_code ='2300'
and a.certificate_status = '已登记'
and a.equ_category_code = '2300'
and c.org_code like concat(#{orgCode},'%')
</select>
<select id="countFillingVolumeCount" resultType="java.lang.Long">
SELECT SUM
( T.filling_quantity )
FROM
tz_cylinder_filling_record T
INNER JOIN tz_base_enterprise_info E ON T.app_id = E.app_id
WHERE
E.supervise_org_code LIKE concat ( #{orgCode}, '%' )
</select>
<select id="countDischargeVolumeCount" resultType="java.lang.Long">
SELECT SUM
( T.offloading_volume )
FROM
tz_cylinder_offloading T
INNER JOIN tz_base_enterprise_info E ON T.app_id = E.app_id
WHERE
E.supervise_org_code LIKE concat ( #{orgCode}, '%' )
</select>
<select id="countEnterpriseUsed" resultType="java.lang.Long">
SELECT COUNT
( DISTINCT ( E.app_id ) )
FROM
tz_cylinder_filling_record
T INNER JOIN tz_base_enterprise_info E ON T.app_id = E.app_id
WHERE
E.supervise_org_code LIKE concat ( #{orgCode}, '%' )
</select>
<select id="getStationRateSubPage"
resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto">
SELECT
*,
CONCAT(province,'/',city,'/',district) AS region,
CONCAT(street,'/',address) AS full_address
FROM
tz_base_enterprise_info
where
is_delete = '0'
AND unit_type LIKE '%充装单位%'
AND supervise_org_code LIKE CONCAT(#{orgCode},'%')
<if test="companyName != null and companyName != '' ">
AND use_unit LIKE CONCAT('%',#{companyName},'%')
</if>
order by rec_date desc
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/JYJCStatisticsMapper.xml
View file @ 4620c88f
......@@ -55,6 +55,7 @@
tz_base_enterprise_info b
<where>
tzjia.inspection_unit_code= b.use_unit_code
and tzjia.status != '6610' and tzjia.status != '6615'
and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
<if test="dto.applicationNo != null and dto.applicationNo != ''">
and tzjia.application_no like concat('%',#{dto.applicationNo},'%')
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/ZLStatisticsMapper.xml
View file @ 4620c88f
......@@ -32,7 +32,7 @@
FROM
( SELECT org_code FROM privilege_company WHERE company_code = #{screenDto.cityCode} ) AS subquery
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( subquery.org_code, '%' )
INNER JOIN tzs_user_info tui ON bi.use_unit_code = tui.unit_code
INNER JOIN tzs_user_info tui ON bi.use_code = tui.unit_code
WHERE
tui.post LIKE concat ( '%', '6552', '%' )
AND bi.unit_type IS NOT NULL
......@@ -58,7 +58,7 @@
FROM
( SELECT org_code FROM privilege_company WHERE company_code = #{screenDto.cityCode} ) AS subquery
INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( subquery.org_code, '%' )
INNER JOIN tzs_user_info tui ON bi.use_unit_code = tui.unit_code
INNER JOIN tzs_user_info tui ON bi.use_code = tui.unit_code
WHERE
bi.unit_type IS NOT NULL
AND tui.post IS NOT NULL
......@@ -97,6 +97,14 @@
a.expiry_date >= current_date
and a.expiry_date <![CDATA[<=]]> #{limitDate}
</select>
<select id="getEquipTotal" resultType="java.lang.Long">
select equip_num from tzs_equip_claim_statistics where city_code = #{cityCode}
</select>
<select id="getEquListTotal" resultType="java.lang.Long">
select ${field} from tzs_equip_claim_statistics where city_code = #{cityCode}
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/CylinderDPStatisticsController.java
View file @ 4620c88f
package com.yeejoin.amos.boot.module.statistcs.biz.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.api.dto.CylinderFillingRecordStatisticsDto;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.CylinderDPStatisticsServiceImpl;
import com.yeejoin.amos.boot.module.statistics.api.dto.SubTreeDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.ESCylinderFillingRecordDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.ObjectUtils;
......@@ -100,4 +106,80 @@ public class CylinderDPStatisticsController extends BaseController {
return ResponseHelper.buildResponse(dpStatisticsService.cylinderIssueMonthList(regionCode.toString()));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "区域气站对接率排名")
@PostMapping(value = "/stationRate")
public ResponseModel<List<Map<String, Object>>> stationRate(@RequestBody DPFilterParamDto dpFilterParamDto) {
return ResponseHelper.buildResponse(dpStatisticsService.stationRate(dpFilterParamDto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "区域安全指数排名下钻树节点")
@PostMapping(value = "/securityIndexSubTree")
public ResponseModel<List<SubTreeDto>> securityIndexSubTree() {
return ResponseHelper.buildResponse(dpStatisticsService.securityIndexSubTree());
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "区域安全指数排名下钻柱状图")
@PostMapping(value = "/securityIndexSubChart")
public ResponseModel<Map<String, Object>> securityIndexSubChart(@RequestBody DPFilterParamDto dpFilterParamDto) {
return ResponseHelper.buildResponse(dpStatisticsService.securityIndexSubChart(dpFilterParamDto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "充装量/卸液量下钻树节点")
@PostMapping(value = "/getFillingSubTree")
public ResponseModel<List<SubTreeDto>> getFillingSubTree() {
return ResponseHelper.buildResponse(dpStatisticsService.getFillingSubTree());
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "充装量/卸液量下钻柱状图")
@PostMapping(value = "/getFillingSubChart")
public ResponseModel<Map<String, Object>> getFillingSubChart(@RequestBody DPFilterParamForDetailDto dpFilterParamForDetailDto) {
return ResponseHelper.buildResponse(dpStatisticsService.getFillingSubChart(dpFilterParamForDetailDto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "充装量/卸液量下钻列表")
@PostMapping(value = "/getFillingSubPage")
public ResponseModel<Page<ESCylinderFillingRecordDto>> getFillingSubPage(@RequestBody DPFilterParamForDetailDto dpFilterParamForDetailDto) {
return ResponseHelper.buildResponse(dpStatisticsService.getFillingSubPage(dpFilterParamForDetailDto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "充装量/卸液量下钻气瓶充装异常情况下拉")
@PostMapping(value = "/getFillingSubAnomalyType")
public ResponseModel<Object> getFillingSubAnomalyType() {
return ResponseHelper.buildResponse(dpStatisticsService.getFillingSubAnomalyType());
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "区域气站对接率下钻树节点")
@PostMapping(value = "/getStationRateSubTree")
public ResponseModel<List<SubTreeDto>> getStationRateSubTree() {
return ResponseHelper.buildResponse(dpStatisticsService.getStationRateSubTree());
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "区域气站对接率下钻图")
@PostMapping(value = "/getStationRateSubChart")
public ResponseModel<Map<String, Object>> getStationRateSubChart(@RequestBody DPFilterParamForDetailDto dpFilterParamForDetailDto) {
return ResponseHelper.buildResponse(dpStatisticsService.getStationRateSubChart(dpFilterParamForDetailDto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "区域气站对接率下钻列表")
@PostMapping(value = "/getStationRateSubPage")
public ResponseModel<IPage<TzBaseEnterpriseInfoDto>> getStationRateSubPage(@RequestBody DPFilterParamForDetailDto dpFilterParamForDetailDto) {
return ResponseHelper.buildResponse(dpStatisticsService.getStationRateSubPage(dpFilterParamForDetailDto));
}
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/DPSubController.java
View file @ 4620c88f
......@@ -39,6 +39,9 @@ public class DPSubController {
public ResponseModel<JSONObject> commonQuery(@PathVariable String template, @RequestBody Map<String, Object> param) {
if (template.equals("company")) { // 企业
Assert.notNull(param.get("useUnitCode"), "企业统一信用代码不能为空");
if (ValidationUtil.isEmpty(param.get("useUnit"))){
param.put("useUnit", param.get("unitName"));
}
} else if (template.equals("reportEqu")) { // 监督检验
Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
} else if (template.equals("equip")) { //设备
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/JGDPStatisticsController.java
View file @ 4620c88f
package com.yeejoin.amos.boot.module.statistcs.biz.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
import com.yeejoin.amos.boot.module.jg.api.dto.FourColorCountDataDto;
import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.JGDPStatisticsServiceImpl;
import io.swagger.annotations.Api;
......@@ -117,7 +119,30 @@ public class JGDPStatisticsController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "监管大屏-左侧设备状态情况统计", notes = "监管大屏-左侧设备状态情况统计")
@ApiOperation(httpMethod = "POST", value = "大屏总览-右侧-使用监管下钻", notes = "大屏总览-右侧-使用监管下钻")
@PostMapping(value = "/zl/right/bizCycleDetail")
public ResponseModel<Map<String, Object>> queryBizCycleDataDetail(@Validated @RequestBody DPFilterParamForDetailDto dpFilterParamForDetailDto, BindingResult result) {
List<FieldError> fieldErrors = result.getFieldErrors();
if (!fieldErrors.isEmpty()) {
throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
}
return ResponseHelper.buildResponse(statisticsService.queryBizCycleDataDetail(dpFilterParamForDetailDto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "大屏总览-右侧-使用监管下钻列表", notes = "大屏总览-右侧-使用监管下钻列表")
@PostMapping(value = "/zl/right/queryBizCycleDataDetailList")
public ResponseModel<Page<Map<String, Object>>> queryBizCycleDataDetailList(@Validated @RequestBody DPFilterParamForDetailDto dpFilterParamForDetailDto, BindingResult result) {
List<FieldError> fieldErrors = result.getFieldErrors();
if (!fieldErrors.isEmpty()) {
throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
}
Page<Map<String, Object>> page = new Page<>(dpFilterParamForDetailDto.getCurrent(),dpFilterParamForDetailDto.getSize());
return ResponseHelper.buildResponse(statisticsService.queryBizCycleDataDetailList(dpFilterParamForDetailDto,page));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "大屏-监管-左侧设备状态情况统计", notes = "大屏-监管-左侧设备状态情况统计")
@PostMapping(value = "/equStateCount")
public ResponseModel<List<Map<String, Object>>> equStateCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
List<FieldError> fieldErrors = result.getFieldErrors();
......@@ -247,6 +272,7 @@ public class JGDPStatisticsController {
}
return ResponseHelper.buildResponse(statisticsService.dataStatisticCountByReginCode(dpFilterParamDto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "监管大屏-中间地图左右两侧8大类、单位、人员数量全局统计", notes = "大屏总览中间-地图左右两侧8大类、单位、人员数量全局统计")
@PostMapping(value = "/centre/dataStatistic")
......@@ -290,4 +316,15 @@ public class JGDPStatisticsController {
}
return ResponseHelper.buildResponse(statisticsService.noticeCountTop(dpFilterParamDto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "监管大屏-右屏-近30天办结率下钻类型", notes = "监管大屏-右屏-近30天办结率下钻类型")
@PostMapping(value = "/getBusinessType")
public ResponseModel<List<Map<String, Object>>> getBusinessType(@Validated @RequestBody DPFilterParamForDetailDto dpFilterParamForDetailDto, BindingResult result) {
List<FieldError> fieldErrors = result.getFieldErrors();
if (!fieldErrors.isEmpty()) {
throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
}
return ResponseHelper.buildResponse(statisticsService.getBusinessType(dpFilterParamForDetailDto));
}
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/JYJCDPStatisticsController.java
View file @ 4620c88f
......@@ -5,10 +5,9 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.dto.JyjcInspectionApplicationDto;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionTimelinesDto;
import com.yeejoin.amos.boot.module.jyjc.api.dto.PublicityInspectOrgInfoDto;
import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.JYJCDPStatisticsServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -100,6 +99,29 @@ public class JYJCDPStatisticsController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "大屏-检验检测-各检验类型业务数量统计/待检数量统计（新）", notes = "大屏-检验检测-各检验类型业务数量统计/待检数量统计（新）")
@PostMapping(value = "/queryAllInspectApp")
public ResponseModel<Map<String, Object>> queryAllInspectApp(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
List<FieldError> fieldErrors = result.getFieldErrors();
if (!fieldErrors.isEmpty()) {
throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
}
return ResponseHelper.buildResponse(statisticsService.queryAllInspectApp(dpFilterParamDto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "大屏-检验检测-近30日业务办理量/办结率统计", notes = "大屏-检验检测-近30日业务办理量/办结率统计")
@PostMapping(value = "/endRate")
public ResponseModel<Map<String, Object>> endRate(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
List<FieldError> fieldErrors = result.getFieldErrors();
if (!fieldErrors.isEmpty()) {
throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
}
return ResponseHelper.buildResponse(statisticsService.endRate(dpFilterParamDto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "大屏-检验检测-按机构进行检验时效统计Top10排名", notes = "大屏-检验检测-按机构进行检验时效统计Top10排名")
@PostMapping(value = "/timeliness/top")
public ResponseModel<List<InspectionTimelinesDto>> inspectionTimelinessTopXX(@RequestParam(required = false, defaultValue = "10") String top, @Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
......@@ -166,6 +188,39 @@ public class JYJCDPStatisticsController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "大屏-检验检测-八大类设备检验临期、超期统计下钻上部图例", notes = "大屏-检验检测-八大类设备检验临期、超期统计下钻上部图例")
@PostMapping(value = "/equipInspectTime/equipInspectTimeCountListDetail")
public ResponseModel<Map<String, Object>> equipInspectTimeCountListDetail(@Validated @RequestBody DPFilterParamForDetailDto dpFilterParamDto, BindingResult result) {
List<FieldError> fieldErrors = result.getFieldErrors();
if (!fieldErrors.isEmpty()) {
throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
}
return ResponseHelper.buildResponse(statisticsService.equipInspectTimeCountListDetail(dpFilterParamDto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "大屏-检验检测-八大类设备检验临期、超期统计下钻下部列表", notes = "大屏-检验检测-八大类设备检验临期、超期统计下钻下部列表")
@PostMapping(value = "/equipInspectTime/equipInspectTimeCountListDetailList")
public ResponseModel<Page<JSONObject>> equipInspectTimeCountListDetailList(@Validated @RequestBody DPFilterParamForDetailDto dpFilterParamDto, BindingResult result) {
List<FieldError> fieldErrors = result.getFieldErrors();
if (!fieldErrors.isEmpty()) {
throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
}
return ResponseHelper.buildResponse(statisticsService.equipInspectTimeCountListDetailList(dpFilterParamDto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "大屏-检验检测-八大类设备检验临期、超期统计下钻筛选条件", notes = "大屏-检验检测-八大类设备检验临期、超期统计下钻筛选条件")
@PostMapping(value = "/equipInspectTime/equipInspectTimeCountListDetailSearch")
public ResponseModel<List<Map<String,Object>>> equipInspectTimeCountListDetailSearch(@Validated @RequestBody DPFilterParamForDetailDto dpFilterParamDto, BindingResult result) {
List<FieldError> fieldErrors = result.getFieldErrors();
if (!fieldErrors.isEmpty()) {
throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
}
return ResponseHelper.buildResponse(statisticsService.equipInspectTimeCountListDetailSearch(dpFilterParamDto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/inspectApplication/pageList")
@ApiOperation(httpMethod = "POST", value = "检验检测报检申请列表分页,按照区域过滤", notes = "检验检测报检申请列表分页,按照区域过滤")
public ResponseModel<Page<JyjcInspectionApplicationDto>> queryForPageList(@RequestParam(value = "current") int current,
......@@ -186,6 +241,35 @@ public class JYJCDPStatisticsController {
public ResponseModel<JSONObject> queryDetailsMatui(@PathVariable Long sequenceNbr, @RequestBody JSONObject jsonObject) {
return ResponseHelper.buildResponse(statisticsService.queryDetailsMatui(sequenceNbr, JSONObject.parseObject(JSON.toJSONString(jsonObject))));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/handle/status")
@ApiOperation(httpMethod = "GET", value = "检验检测办理状态", notes = "检验检测办理状态")
public ResponseModel<List<Map<String,Object>>> handleStatus() {
return ResponseHelper.buildResponse(statisticsService.handleStatus());
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/inspectApplication/getBusinessType")
@ApiOperation(httpMethod = "POST", value = "大屏检验检测下钻获取检验类型", notes = "大屏检验检测下钻获取检验类型")
public ResponseModel<List<Map<String, Object>>> getBusinessType(@RequestBody DPFilterParamForDetailDto dpFilterParamForDetailDto) {
return ResponseHelper.buildResponse(statisticsService.getBusinessType(dpFilterParamForDetailDto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/inspectApplication/getInspectDetail")
@ApiOperation(httpMethod = "POST", value = "大屏检验检测下钻获取上部图表", notes = "大屏检验检测下钻获取上部图表")
public ResponseModel<Map<String, Object>> getInspectDetail(@RequestBody DPFilterParamForDetailDto dpFilterParamForDetailDto) {
return ResponseHelper.buildResponse(statisticsService.getInspectDetail(dpFilterParamForDetailDto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/inspectApplication/getInspectDetailList")
@ApiOperation(httpMethod = "POST", value = "大屏检验检测下钻获取下部列表", notes = "大屏检验检测下钻获取下部列表")
public ResponseModel<Page<Map<String, Object>>> getInspectDetailList(@RequestBody DPFilterParamForDetailDto dpFilterParamForDetailDto) {
Page<Map<String, Object>> page = new Page<>(dpFilterParamForDetailDto.getCurrent(),dpFilterParamForDetailDto.getSize());
return ResponseHelper.buildResponse(statisticsService.getInspectDetailList(dpFilterParamForDetailDto, page));
}
}
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/StCommonController.java
View file @ 4620c88f
package com.yeejoin.amos.boot.module.statistcs.biz.controller;
import com.alibaba.fastjson.JSONArray;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.StCommonServiceImpl;
import com.yeejoin.amos.boot.module.statistics.api.vo.EquCategoryVo;
import com.yeejoin.amos.feign.systemctl.model.RegionModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.List;
@RestController
......@@ -36,4 +36,18 @@ public class StCommonController extends BaseController {
List<RegionModel> regionList = commonService.getUserRegionCode(getSelectedOrgInfo());
return ResponseHelper.buildResponse(regionList);
}
/**
* 获取设备类型
* @return Map
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/getEquCategoryTree")
@ApiOperation(httpMethod = "POST", value = "获取设备类型", notes = "获取设备类型")
public ResponseModel<JSONArray> getEquCategoryTree(@RequestBody DPFilterParamForDetailDto paramDto){
JSONArray objects = new JSONArray();
objects.add(commonService.getEquCategoryTree(paramDto));
return ResponseHelper.buildResponse(objects);
}
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/YJDPStatisticsController.java
View file @ 4620c88f
package com.yeejoin.amos.boot.module.statistcs.biz.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
import com.yeejoin.amos.boot.module.common.api.entity.AlertUseUnitStatistics;
import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.YJDPStatisticsServiceImpl;
import com.yeejoin.amos.boot.module.statistics.api.dto.AlertUseUnitStatisticsDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.AlertPaperInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.enums.AlertStageEnums;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
* 大屏统计controller
......@@ -120,7 +123,7 @@ public class YJDPStatisticsController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "大屏-应急-维保单位平均救援时间排名", notes = "大屏-应急-维保单位平均救援时间排名")
@PostMapping(value = "/rankUnitByRescueTime")
public ResponseModel<List<Map<String, Object>>> rankUnitByRescueTime(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
public ResponseModel<List<Map<String, Object>>> rankUnitByRescueTime(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
List<FieldError> fieldErrors = result.getFieldErrors();
if (!fieldErrors.isEmpty()) {
throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
......@@ -131,7 +134,7 @@ public class YJDPStatisticsController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "大屏-应急-各地市应急事件总数排名", notes = "大屏-应急-各地市应急事件总数排名")
@PostMapping(value = "/regionEventRank")
public ResponseModel<JSONObject> regionEventRank(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
public ResponseModel<JSONObject> regionEventRank(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
List<FieldError> fieldErrors = result.getFieldErrors();
if (!fieldErrors.isEmpty()) {
throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
......@@ -160,4 +163,87 @@ public class YJDPStatisticsController {
}
return ResponseHelper.buildResponse(statisticsService.getCenterMapCountDataForOverview(dpFilterParamDto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "应急大屏使用-办理量 (近7天)-右上角更多-各地市业务办理情况-地市应急事件总数柱状图",
notes = "应急大屏使用-办理量 (近7天)-右上角更多-各地市业务办理情况-地市应急事件总数柱状图")
@PostMapping("/alertRecordBarChart/dp")
public ResponseModel<Object> alertRecordBarChartForDP(@RequestBody DPFilterParamForDetailDto recordFilterVo) {
return ResponseHelper.buildResponse(statisticsService.alertRecordBarChartForDP(recordFilterVo));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "应急大屏使用-警情类型", notes = "应急大屏使用-警情类型")
@PostMapping("/alertOperations/dp")
public ResponseModel<Object> alertOperations() {
JSONArray objects = new JSONArray();
objects.add(statisticsService.alertOperations());
return ResponseHelper.buildResponse(objects);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "应急大屏使用-报警类型", notes = "应急大屏使用-报警类型")
@PostMapping("/alertTypeOperations/dp")
public ResponseModel<Object> alertTypeOperations() {
JSONArray res = new JSONArray();
JSONObject jsonObject1 = new JSONObject().fluentPut("label", AlertStageEnums.JQCB.getValue()).fluentPut("value", AlertStageEnums.JQCB.getId());
JSONObject jsonObject2 = new JSONObject().fluentPut("label", AlertStageEnums.JQGB.getValue()).fluentPut("value", AlertStageEnums.JQGB.getId());
res.add(jsonObject1);
res.add(jsonObject2);
return ResponseHelper.buildResponse(res);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "应急大屏使用-警情来源", notes = "应急大屏使用-警情来源")
@PostMapping("/alertSourceOperations/dp")
public ResponseModel<Object> alertSourceOperations() {
JSONArray res = new JSONArray();
JSONObject jsonObject1 = new JSONObject().fluentPut("label", AlertStageEnums.DHBJ.getValue()).fluentPut("value", AlertStageEnums.DHBJ.getId());
JSONObject jsonObject2 = new JSONObject().fluentPut("label", AlertStageEnums.WLJR.getValue()).fluentPut("value", AlertStageEnums.WLJR.getId());
JSONObject jsonObject3 = new JSONObject().fluentPut("label", AlertStageEnums.APPJJ.getValue()).fluentPut("value", AlertStageEnums.APPJJ.getId());
res.add(jsonObject1);
res.add(jsonObject2);
res.add(jsonObject3);
return ResponseHelper.buildResponse(res);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "应急大屏使用-办理量 (近7天)-右上角更多-各地市业务办理情况-底部表格",
notes = "应急大屏使用-办理量 (近7天)-右上角更多-各地市业务办理情况-底部表格")
@PostMapping("/alertRecordTable/dp")
public ResponseModel<IPage<Map<String, Object>>> alertRecordTableForDP(@Validated @RequestBody DPFilterParamForDetailDto recordFilterVo) {
return statisticsService.alertRecordTableForDP(recordFilterVo);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "月度困人故障高发使用单位-右上角更多-地市月度应急事件高发使用单位-侧边树",
notes = "月度困人故障高发使用单位-右上角更多-地市月度应急事件高发使用单位-侧边树")
@PostMapping("/alertUnitOption/dp")
public ResponseModel<Object> alertUnitOption() {
List<JSONObject> subList = Collections.singletonList(new JSONObject()
.fluentPut("value", "use")
.fluentPut("title", "使用单位"));
JSONArray res = new JSONArray();
JSONObject jsonObject = new JSONObject()
.fluentPut("title", "企业类型")
.fluentPut("value", "all")
.fluentPut("children", subList);
res.add(jsonObject);
return ResponseHelper.buildResponse(res);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "月度困人故障高发使用单位-右上角更多-地市月度应急事件高发使用单位-柱状图",
notes = "月度困人故障高发使用单位-右上角更多-地市月度应急事件高发使用单位-柱状图")
@PostMapping("/alertUnitBarChart/dp")
public ResponseModel<JSONObject> alertUnitBarChartForDP(@Validated @RequestBody DPFilterParamForDetailDto detailDto) {
return statisticsService.alertUnitBarChartForDP(detailDto);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "月度困人故障高发使用单位-右上角更多-地市月度应急事件高发使用单位-表格",
notes = "月度困人故障高发使用单位-右上角更多-地市月度应急事件高发使用单位-表格")
@PostMapping("/alertUseUnitTable/dp")
public ResponseModel<IPage<AlertUseUnitStatistics>> alertUseUnitTableForDP(@Validated @RequestBody DPFilterParamForDetailDto detailDto) {
return statisticsService.alertUseUnitTableForDP(detailDto);
}
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/ZLDPStatisticsController.java
View file @ 4620c88f
package com.yeejoin.amos.boot.module.statistcs.biz.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.ZLDPStatisticsServiceImpl;
import com.yeejoin.amos.boot.module.statistics.api.vo.EquCategoryVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
......@@ -92,4 +93,43 @@ public class ZLDPStatisticsController {
}
return ResponseHelper.buildResponse(statisticsService.statisticInfoByRegionAndDate(dpFilterParamDto));
}
/**
* 大屏-总览-左屏-设备纳管率
* @return Map
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/getEquipManagementRateStatistics")
@ApiOperation(httpMethod = "POST", value = "大屏-总览-左屏-设备纳管率", notes = "大屏-总览-左屏-设备纳管率")
public ResponseModel<Map<String, Object>> getEquipManagementRateStatistics(@RequestBody DPFilterParamForDetailDto paramDto){
return ResponseHelper.buildResponse(statisticsService.getEquipManagementRateStatistics(paramDto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/viewJgAll")
@ApiOperation(httpMethod = "GET", value = "viewJgAll", notes = "viewJgAll")
public ResponseModel<Page<JSONObject>> viewJgAll(@RequestParam Map<String, Object> map) {
JSONObject jsonObject = new JSONObject(map);
return ResponseHelper.buildResponse(statisticsService.queryByKeys(jsonObject));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/viewEquipPage")
@ApiOperation(httpMethod = "POST", value = "查询设备管理列表", notes = "查询设备管理列表")
public ResponseModel<Page<JSONObject>> viewEquipPage(@RequestBody DPFilterParamForDetailDto paramDto) {
return ResponseHelper.buildResponse(statisticsService.viewEquipPage(paramDto));
}
/**
* 根据设备种类code获取设备类别下拉
*
* @param paramDto 设备种类code
* @return 设备类别列表
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/getEquCategoryList")
@ApiOperation(httpMethod = "POST", value = "根据设备种类code获取设备类别下拉", notes = "根据设备种类code获取设备类别下拉")
public ResponseModel<List<EquCategoryVo>> getEquCategoryTree(@RequestBody DPFilterParamForDetailDto paramDto){
return ResponseHelper.buildResponse(statisticsService.getEquCategoryList(paramDto.getTreeValue()));
}
}
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/DPSubServiceImpl.java
View file @ 4620c88f
......@@ -10,7 +10,6 @@ import com.yeejoin.amos.boot.biz.common.utils.RestTemplateUtils;
import com.yeejoin.amos.boot.biz.common.utils.StringUtils;
import com.yeejoin.amos.boot.module.statistcs.biz.utils.DpSubUtils;
import com.yeejoin.amos.boot.module.statistics.api.enums.DPStatusEnum;
import com.yeejoin.amos.boot.module.statistics.api.mapper.*;
import com.yeejoin.amos.feign.morphic.Morphic;
import com.yeejoin.amos.feign.morphic.model.FormSceneModel;
import jdk.nashorn.api.scripting.ScriptObjectMirror;
......@@ -511,7 +510,13 @@ public class DPSubServiceImpl {
}
String problemTime = result.getString("problemTime");
String problemStatus = result.getString("problemStatus");
if (ValidationUtil.isEmpty(problemTime)){
try {
problemTime = DateUtil.formatDate(new Date(), DateUtil.Y_M_D_HMS);
} catch (Exception e) {
e.printStackTrace();
}
}
String color = null;
if (!ValidationUtil.isEmpty(problemTime)) {
try {
......@@ -526,7 +531,7 @@ public class DPSubServiceImpl {
} else if ("异常".equals(problemStatus)) {
color = "red";
}
qrcode.put("value", !ValidationUtil.isEmpty(result.get("useCode")) ? result.get("useCode") : result.get("USE_ORG_CODE"));
qrcode.put("value", !ValidationUtil.isEmpty(result.get("SUPERVISORY_CODE")) ? "https://sxtzsb.sxsei.com:9435/tzs/?code=" + result.get("SUPERVISORY_CODE") : result.get("USE_ORG_CODE"));
qrcode.put("status", problemStatus);
qrcode.put("color", color);
return qrcode;
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/application-dev.properties
View file @ 4620c88f
......@@ -50,4 +50,10 @@ elasticsearch.password= a123456
amos.system.user.user-name=jyjg04
amos.system.user.password=a1234560
amos.system.user.app-key=AMOS_STUDIO
amos.system.user.product=AMOS_STUDIO_WEB
\ No newline at end of file
amos.system.user.product=AMOS_STUDIO_WEB
eureka.instance.metadata-map.user.name=admin
eureka.instance.metadata-map.user.password=a1234560
spring.security.user.name=admin
spring.security.user.password=a1234560
management.security.enabled=true
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/company.json
View file @ 4620c88f
......@@ -75,9 +75,10 @@
],
"content": {
"keyinfo": {
"title": "{useUnit}",
"status": [],
"qrcode": {
"title": "监管码",
"title": "企业二维码",
"problem": []
},
"keyParams": [
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_1000.json
View file @ 4620c88f
......@@ -134,23 +134,25 @@
],
"content": {
"keyinfo": {
"title": "{PRODUCT_NAME}",
"status": [],
"qrcode": {
"title": "监管码",
"problem": []
},
"keyParams": [
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
"infoRecords": {
"title": "监管记录",
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_2000.json
View file @ 4620c88f
......@@ -138,46 +138,49 @@
],
"content": {
"keyinfo": {
"title": "{PRODUCT_NAME}",
"status": [],
"qrcode": {
"title": "监管码",
"problem": []
},
"keyParams_default": [
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
],
"keyParams_2300_true": [
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
"keyParams_2300_true": [
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
],
"keyParams_2300_false": [
{ "key": "EQU_TYPE", "label": "气瓶品种" },
{ "key": "PRODUCT_NAME", "label": "产品名称" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "NEXT_INSPECTION_DATE", "label": "下次检验日期" },
{ "key": "CAR_NUMBER", "label": "车牌号" },
{ "key": "IDENTIFICATION_CODE", "label": "车辆VIN码" },
{ "key": "EQU_TYPE", "label": "气瓶品种" },
{ "key": "PRODUCT_NAME", "label": "产品名称" },
{ "key": "GAS_NUM", "label": "气瓶数量" },
{ "key": "FILLING_MEDIUM", "label": "充装介质" },
{ "key": "NEXT_INSPECTION_DATE", "label": "下次检验日期" }
{ "key": "FILLING_MEDIUM", "label": "充装介质" }
],
"infoRecords": {
"title": "监管记录",
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_3000.json
View file @ 4620c88f
......@@ -134,25 +134,27 @@
],
"content": {
"keyinfo": {
"title": "{PRODUCT_NAME}",
"status": [],
"qrcode": {
"title": "监管码",
"problem": []
},
"keyParams": [
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "ME_UNIT_NAME", "label": "维保单位名称" },
{ "key": "INFORM_END", "label": "维保备案有效期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
"infoRecords": {
"title": "监管记录",
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_4000.json
View file @ 4620c88f
......@@ -130,23 +130,25 @@
],
"content": {
"keyinfo": {
"title": "{PRODUCT_NAME}",
"status": [],
"qrcode": {
"title": "监管码",
"problem": []
},
"keyParams": [
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
"infoRecords": {
"title": "监管记录",
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_5000.json
View file @ 4620c88f
......@@ -126,23 +126,25 @@
],
"content": {
"keyinfo": {
"title": "{PRODUCT_NAME}",
"status": [],
"qrcode": {
"title": "监管码",
"problem": []
},
"keyParams": [
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
"infoRecords": {
"title": "监管记录",
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_6000.json
View file @ 4620c88f
......@@ -120,23 +120,25 @@
],
"content": {
"keyinfo": {
"title": "{PRODUCT_NAME}",
"status": [],
"qrcode": {
"title": "监管码",
"problem": []
},
"keyParams": [
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
"infoRecords": {
"title": "监管记录",
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_8000.json
View file @ 4620c88f
......@@ -126,31 +126,34 @@
],
"content": {
"keyinfo": {
"title": "{PRODUCT_NAME}",
"status": [],
"qrcode": {
"title": "监管码",
"problem": []
},
"keyParams_default": [
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
],
"keyParams_8300": [
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
"keyParams_8300": [
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
],
"infoRecords": {
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_9000.json
View file @ 4620c88f
......@@ -126,23 +126,25 @@
],
"content": {
"keyinfo": {
"title": "{PRODUCT_NAME}",
"status": [],
"qrcode": {
"title": "监管码",
"problem": []
},
"keyParams": [
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
"infoRecords": {
"title": "监管记录",
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/problem.json
View file @ 4620c88f
......@@ -76,6 +76,7 @@
],
"content": {
"keyinfo": {
"title": "{principalUnit}",
"keyParams": [
{ "key": "sourceType", "label": "隐患主体类型" },
{ "key": "problemType", "label": "隐患类型" },
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/pom.xml
View file @ 4620c88f
......@@ -20,7 +20,6 @@
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.3.10</version>
</dependency>
<dependency>
......@@ -52,7 +51,6 @@
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId>
<version>5.8.16</version>
</dependency>
</dependencies>
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/pom.xml
View file @ 4620c88f
......@@ -119,7 +119,6 @@
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.5.1</version>
</dependency>
<dependency>
<groupId>org.liquibase</groupId>
......
amos-boot-system-tzs/pom.xml
View file @ 4620c88f
This diff is collapsed.
pom.xml
View file @ 4620c88f
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment