micord/ervu-lkrp-ul
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPPORT-8411: change package; fix page and scripts

Browse source
This commit is contained in:
gulnaz 2024-09-13 12:43:17 +03:00
parent 14f9bf2233
commit d8d60b5817
20 changed files with 34 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

35
backend/src/main/java/dto/jivoprofile/JivoProfileDto.java
View file

@ -1,35 +0,0 @@
package dto.jivoprofile;
import ru.cg.webbpm.modules.webkit.annotations.Model;
@Model
public class JivoProfileDto {
public String username;
public String email;
public String phone;
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
}

2
backend/src/main/java/ervu/dto/journal/JournalDto.java → backend/src/main/java/ru/micord/ervu/journal/JournalDto.java
View file

@ -1,4 +1,4 @@
package ervu.dto.journal;
package ru.micord.ervu.journal;
import java.time.LocalDateTime;

2
backend/src/main/java/ervu/dto/journal/JournalFileDataRequest.java → backend/src/main/java/ru/micord/ervu/journal/JournalFileDataRequest.java
View file

@ -1,4 +1,4 @@
package ervu.dto.journal;
package ru.micord.ervu.journal;
import com.fasterxml.jackson.annotation.JsonProperty;

2
backend/src/main/java/ervu/dto/journal/JournalFileDataResponse.java → backend/src/main/java/ru/micord/ervu/journal/JournalFileDataResponse.java
View file

@ -1,4 +1,4 @@
package ervu.dto.journal;
package ru.micord.ervu.journal;
import java.util.List;

6
backend/src/main/java/ervu/dto/journal/JournalFileInfo.java → backend/src/main/java/ru/micord/ervu/journal/JournalFileInfo.java
View file

@ -1,4 +1,4 @@
package ervu.dto.journal;
package ru.micord.ervu.journal;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
@ -6,11 +6,11 @@ import java.time.ZoneOffset;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import ervu.dto.journal.deserializer.DepartureDateTimeDeserializer;
import ru.micord.ervu.journal.deserializer.DepartureDateTimeDeserializer;
@JsonIgnoreProperties(ignoreUnknown = true)
public class JournalFileInfo {
@JsonProperty("fileId")
private String fileId; //ИД файла полученный при создании записи о файле в реестр организаций (в ЕРВУ)
@JsonProperty("fileName")

2
backend/src/main/java/ervu/dto/journal/JournalFileStatus.java → backend/src/main/java/ru/micord/ervu/journal/JournalFileStatus.java
View file

@ -1,4 +1,4 @@
package ervu.dto.journal;
package ru.micord.ervu.journal;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;

2
backend/src/main/java/ervu/dto/journal/SenderInfo.java → backend/src/main/java/ru/micord/ervu/journal/SenderInfo.java
View file

@ -1,4 +1,4 @@
package ervu.dto.journal;
package ru.micord.ervu.journal;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;

4
backend/src/main/java/ervu/dto/journal/deserializer/DepartureDateTimeDeserializer.java → backend/src/main/java/ru/micord/ervu/journal/deserializer/DepartureDateTimeDeserializer.java
View file

@ -1,4 +1,4 @@
package ervu.dto.journal.deserializer;
package ru.micord.ervu.journal.deserializer;
import java.io.IOException;
import java.time.LocalDateTime;
@ -6,7 +6,7 @@ import java.time.LocalDateTime;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import ervu.util.DateUtil;
import ru.micord.ervu.util.DateUtil;
public class DepartureDateTimeDeserializer extends JsonDeserializer<LocalDateTime> {

10
backend/src/main/java/ervu/dto/journal/mapper/JournalDtoMapper.java → backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java
View file

@ -1,10 +1,10 @@
package ervu.dto.journal.mapper;
package ru.micord.ervu.journal.mapper;
import ervu.dto.journal.JournalDto;
import ervu.dto.journal.JournalFileInfo;
import ervu.dto.journal.SenderInfo;
import ru.micord.ervu.journal.JournalDto;
import ru.micord.ervu.journal.JournalFileInfo;
import ru.micord.ervu.journal.SenderInfo;
import static ervu.util.StringUtils.convertToFio;
import static ru.micord.ervu.util.StringUtils.convertToFio;
public class JournalDtoMapper {

2
backend/src/main/java/ervu/property/grid/StaticColumn.java → backend/src/main/java/ru/micord/ervu/property/grid/StaticColumn.java
View file

@ -1,4 +1,4 @@
package ervu.property.grid;
package ru.micord.ervu.property.grid;
/**
* @author gulnaz

2
backend/src/main/java/ervu/property/grid/StaticGridColumn.java → backend/src/main/java/ru/micord/ervu/property/grid/StaticGridColumn.java
View file

@ -1,4 +1,4 @@
package ervu.property.grid;
package ru.micord.ervu.property.grid;
import java.util.Collection;
import java.util.Collections;

2
backend/src/main/java/ervu/service/grid/InMemoryStaticGridLoadService.java → backend/src/main/java/ru/micord/ervu/service/grid/InMemoryStaticGridLoadService.java
View file

@ -1,4 +1,4 @@
package ervu.service.grid;
package ru.micord.ervu.service.grid;
import java.util.List;

16
backend/src/main/java/ervu/service/grid/impl/JournalInMemoryStaticGridLoadService.java → backend/src/main/java/ru/micord/ervu/service/grid/impl/JournalInMemoryStaticGridLoadService.java
View file

@ -1,23 +1,19 @@
package ervu.service.grid.impl;
package ru.micord.ervu.service.grid.impl;
import java.util.List;
import java.util.Optional;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import ervu.dto.journal.JournalDto;
import ervu.dto.journal.JournalFileDataRequest;
import ervu.dto.journal.JournalFileDataResponse;
import ervu.dto.journal.mapper.JournalDtoMapper;
import ervu.service.grid.InMemoryStaticGridLoadService;
import ru.micord.ervu.journal.JournalDto;
import ru.micord.ervu.journal.JournalFileDataRequest;
import ru.micord.ervu.journal.JournalFileDataResponse;
import ru.micord.ervu.journal.mapper.JournalDtoMapper;
import ru.micord.ervu.service.grid.InMemoryStaticGridLoadService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import ru.micord.ervu.kafka.service.ReplyingKafkaService;
import ru.micord.ervu.security.webbpm.jwt.JwtAuthentication;
import ru.micord.ervu.security.webbpm.jwt.service.JwtTokenService;
@Service

4
backend/src/main/java/ervu/service/rpc/InMemoryStaticGridRpcService.java → backend/src/main/java/ru/micord/ervu/service/rpc/InMemoryStaticGridRpcService.java
View file

@ -1,8 +1,8 @@
package ervu.service.rpc;
package ru.micord.ervu.service.rpc;
import java.util.List;
import ervu.service.grid.InMemoryStaticGridLoadService;
import ru.micord.ervu.service.grid.InMemoryStaticGridLoadService;
import ru.cg.webbpm.modules.standard_annotations.validation.NotNull;
import ru.cg.webbpm.modules.webkit.annotations.RpcCall;

2
backend/src/main/java/ervu/util/DateUtil.java → backend/src/main/java/ru/micord/ervu/util/DateUtil.java
View file

@ -1,4 +1,4 @@
package ervu.util;
package ru.micord.ervu.util;
import java.time.LocalDate;
import java.time.LocalDateTime;

2
backend/src/main/java/ervu/util/StringUtils.java → backend/src/main/java/ru/micord/ervu/util/StringUtils.java
View file

@ -1,4 +1,4 @@
package ervu.util;
package ru.micord.ervu.util;
import static org.apache.commons.lang3.StringUtils.capitalize;
import static org.apache.commons.lang3.StringUtils.substring;

6
frontend/src/ts/ervu/component/grid/InMemoryStaticGrid.ts
View file

@ -14,10 +14,8 @@ import {
ValueGetterParams
} from "ag-grid-community";
import {StaticColumnInitializer} from "./StaticColumnInitializer";
import {StaticGridColumn} from "../../../generated/ervu/property/grid/StaticGridColumn";
import {
InMemoryStaticGridRpcService
} from "../../../generated/ervu/service/rpc/InMemoryStaticGridRpcService";
import {InMemoryStaticGridRpcService} from "../../../generated/ru/micord/ervu/service/rpc/InMemoryStaticGridRpcService";
import {StaticGridColumn} from "../../../generated/ru/micord/ervu/property/grid/StaticGridColumn";
@Component({
moduleId: module.id,

2
frontend/src/ts/ervu/component/grid/StaticColumnInitializer.ts
View file

@ -13,7 +13,7 @@ import {
} from "@webbpm/base-package";
import {Moment} from "moment";
import * as moment from "moment-timezone";
import {StaticGridColumn} from "../../../generated/ervu/property/grid/StaticGridColumn";
import {StaticGridColumn} from "../../../generated/ru/micord/ervu/property/grid/StaticGridColumn";
export class StaticColumnInitializer {

4
resources/src/main/resources/business-model/Журнал взаимодействия.page
View file

@ -683,7 +683,7 @@
<scripts id="f0a59cd9-acf8-4b1d-89fa-a5d618fc4664">
<classRef type="JAVA">
<className>InMemoryStaticGridRpcService</className>
<packageName>ervu.service.rpc</packageName>
<packageName>ru.micord.ervu.service.rpc</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
@ -693,7 +693,7 @@
<value>
<implRef type="JAVA">
<className>JournalInMemoryStaticGridLoadService</className>
<packageName>ervu.service.grid.impl</packageName>
<packageName>ru.micord.ervu.service.grid.impl</packageName>
</implRef>
</value>
</entry>

2
resources/src/main/resources/components/StaticGridColumn.component
View file

@ -27,7 +27,7 @@
<scripts id="0a01c185-920b-4328-a82d-277f917b185e">
<classRef type="JAVA">
<className>StaticGridColumn</className>
<packageName>ervu.property.grid</packageName>
<packageName>ru.micord.ervu.property.grid</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>