Skip to content

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

feat(cylinder,tcm): 注释掉气瓶充装记录的定时任务及相关逻辑

-- 移除了 `CylinderFillingRecordServiceImpl` 和 `CylinderInfoServiceImpl` 中的定时任务注解及相关依赖，包括 `@Scheduled`、`@SchedulerLock` 等； -- 在 `RegUnitInfoServiceImpl` 中新增默认监管标签配置(个人主体和包含使用单位的都默认三级管控)
parent 7e787f08
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 42 deletions
amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylSyncServiceImpl.java
View file @ b9bd6cd5
...@@ -12,7 +12,6 @@ import com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.CylinderInfoMapper; ...@@ -12,7 +12,6 @@ import com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.CylinderInfoMapper;
import net.javacrumbs.shedlock.spring.annotation.SchedulerLock; import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StopWatch; import org.springframework.util.StopWatch;
...@@ -128,8 +127,8 @@ public class CylSyncServiceImpl { ...@@ -128,8 +127,8 @@ public class CylSyncServiceImpl {
} }
} }
@Scheduled(cron = "0 0 1 * * ?") // @Scheduled(cron = "0 0 1 * * ?")
@SchedulerLock(name = "fillingSync", lockAtMostFor = "PT10H", lockAtLeastFor = "PT60M") // @SchedulerLock(name = "fillingSync", lockAtMostFor = "PT10H", lockAtLeastFor = "PT60M")
public Object fillingSync() { public Object fillingSync() {
try { try {
StopWatch stopWatch = new StopWatch(); StopWatch stopWatch = new StopWatch();
......
amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderFillingRecordServiceImpl.java
View file @ b9bd6cd5
package com.yeejoin.amos.boot.module.cylinder.flc.biz.service.impl; package com.yeejoin.amos.boot.module.cylinder.flc.biz.service.impl;
import cn.hutool.json.ObjectMapper;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...@@ -13,7 +12,6 @@ import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderFillingRecor ...@@ -13,7 +12,6 @@ import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderFillingRecor
import com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.CylinderFillingRecordMapper; import com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.CylinderFillingRecordMapper;
import com.yeejoin.amos.boot.module.cylinder.flc.api.service.ICylinderFillingRecordService; import com.yeejoin.amos.boot.module.cylinder.flc.api.service.ICylinderFillingRecordService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RequestOptions;
...@@ -24,10 +22,8 @@ import org.elasticsearch.search.builder.SearchSourceBuilder; ...@@ -24,10 +22,8 @@ import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.sort.SortOrder; import org.elasticsearch.search.sort.SortOrder;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.util.StopWatch;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.io.IOException; import java.io.IOException;
...@@ -37,7 +33,6 @@ import java.util.ArrayList; ...@@ -37,7 +33,6 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.logging.Logger;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -125,8 +120,8 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin ...@@ -125,8 +120,8 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
} }
@Scheduled(cron = "${tzs.cylinder.fill.cron}") // @Scheduled(cron = "${tzs.cylinder.fill.cron}")
@SchedulerLock(name = "cylinderFillingRecord2ESTask", lockAtMostFor = "PT6H") // @SchedulerLock(name = "cylinderFillingRecord2ESTask", lockAtMostFor = "PT6H")
public void setTimeSaveCylinderInfoToES() { public void setTimeSaveCylinderInfoToES() {
Integer count = cylinderFillingRecordMapper.getCylinderFillingRecordTotal(); Integer count = cylinderFillingRecordMapper.getCylinderFillingRecordTotal();
Integer times = 0; Integer times = 0;
...@@ -481,7 +476,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin ...@@ -481,7 +476,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
if (!ObjectUtils.isEmpty(recordDto)) { if (!ObjectUtils.isEmpty(recordDto)) {
//同步到es后修改 //同步到es后修改
CylinderFillingRecord cylinderFillingRecord = new CylinderFillingRecord(); CylinderFillingRecord cylinderFillingRecord = new CylinderFillingRecord();
cylinderFillingRecord.setIsNotEs("1"); // cylinderFillingRecord.setIsNotEs("1");
baseMapper.update(cylinderFillingRecord, new QueryWrapper<CylinderFillingRecord>().eq("sequence_nbr", ci.getSequenceNbr())); baseMapper.update(cylinderFillingRecord, new QueryWrapper<CylinderFillingRecord>().eq("sequence_nbr", ci.getSequenceNbr()));
} }
......
amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderInfoServiceImpl.java
View file @ b9bd6cd5
...@@ -33,7 +33,6 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel; ...@@ -33,7 +33,6 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import com.yeejoin.amos.feign.systemctl.Systemctl; import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.RegionModel; import com.yeejoin.amos.feign.systemctl.model.RegionModel;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchResponse;
...@@ -45,7 +44,6 @@ import org.elasticsearch.search.SearchHit; ...@@ -45,7 +44,6 @@ import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.SearchHits;
import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.AggregationBuilders;
import org.elasticsearch.search.aggregations.Aggregations; import org.elasticsearch.search.aggregations.Aggregations;
import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
import org.elasticsearch.search.aggregations.metrics.ParsedCardinality; import org.elasticsearch.search.aggregations.metrics.ParsedCardinality;
import org.elasticsearch.search.aggregations.metrics.Sum; import org.elasticsearch.search.aggregations.metrics.Sum;
import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.builder.SearchSourceBuilder;
...@@ -53,9 +51,6 @@ import org.elasticsearch.search.sort.SortOrder; ...@@ -53,9 +51,6 @@ import org.elasticsearch.search.sort.SortOrder;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
...@@ -312,8 +307,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -312,8 +307,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
* 按单位统计 * 按单位统计
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Scheduled(cron = "0 0 2 * * ?") // @Scheduled(cron = "0 0 2 * * ?")
@SchedulerLock(name = "synFillingUnloadDataTask", lockAtMostFor = "PT6H") // @SchedulerLock(name = "synFillingUnloadDataTask", lockAtMostFor = "PT6H")
public void synFillingUnloadDataJob() { public void synFillingUnloadDataJob() {
this.synFillingUnloadData(); this.synFillingUnloadData();
} }
...@@ -344,8 +339,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -344,8 +339,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
* 按区域统计 * 按区域统计
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Scheduled(cron = "0 0 4 * * ?") // @Scheduled(cron = "0 0 4 * * ?")
@SchedulerLock(name = "synAreaDataTask", lockAtMostFor = "PT60M") // @SchedulerLock(name = "synAreaDataTask", lockAtMostFor = "PT60M")
public void synAreaDataJob() { public void synAreaDataJob() {
this.synAreaData(); this.synAreaData();
} }
...@@ -387,8 +382,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -387,8 +382,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
* 按区域统计 * 按区域统计
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Scheduled(cron = "0 0 2 * * ?") // @Scheduled(cron = "0 0 2 * * ?")
@SchedulerLock(name = "addIntegrityDataTask", lockAtMostFor = "PT60M") // @SchedulerLock(name = "addIntegrityDataTask", lockAtMostFor = "PT60M")
public void addIntegrityDataJob() { public void addIntegrityDataJob() {
this.addIntegrityData(); this.addIntegrityData();
} }
...@@ -458,8 +453,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -458,8 +453,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Scheduled(cron = "0 0 2 * * ?") // @Scheduled(cron = "0 0 2 * * ?")
@SchedulerLock(name = "cylinderUnitInfoTask", lockAtMostFor = "PT60M") // @SchedulerLock(name = "cylinderUnitInfoTask", lockAtMostFor = "PT60M")
public void getCylinderUnitInfoJob() { public void getCylinderUnitInfoJob() {
this.getCylinderUnitInfo(); this.getCylinderUnitInfo();
} }
...@@ -498,8 +493,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -498,8 +493,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
* 气瓶总量按区域统计 * 气瓶总量按区域统计
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Scheduled(cron = "0 0 2 * * ?") // @Scheduled(cron = "0 0 2 * * ?")
@SchedulerLock(name = "cylinderInfoTask", lockAtMostFor = "PT6H") // @SchedulerLock(name = "cylinderInfoTask", lockAtMostFor = "PT6H")
public void getCylinderInfoJob() { public void getCylinderInfoJob() {
this.getCylinderInfo(); this.getCylinderInfo();
} }
...@@ -536,8 +531,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -536,8 +531,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
* 按单位统计 * 按单位统计
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Scheduled(cron = "0 0 2 * * ?") // @Scheduled(cron = "0 0 2 * * ?")
@SchedulerLock(name = "synUnitCylinderInfoDataTask", lockAtMostFor = "PT6H") // @SchedulerLock(name = "synUnitCylinderInfoDataTask", lockAtMostFor = "PT6H")
public void synUnitCylinderInfoDataJob() { public void synUnitCylinderInfoDataJob() {
this.synUnitCylinderInfoData(); this.synUnitCylinderInfoData();
} }
...@@ -574,8 +569,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -574,8 +569,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
* 充装量按单位和月统计 * 充装量按单位和月统计
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Scheduled(cron = "0 0 2 * * ?") // @Scheduled(cron = "0 0 2 * * ?")
@SchedulerLock(name = "synUnitCylinderFillingDataTask", lockAtMostFor = "PT6H") // @SchedulerLock(name = "synUnitCylinderFillingDataTask", lockAtMostFor = "PT6H")
public void synUnitCylinderFillingDataJob() { public void synUnitCylinderFillingDataJob() {
this.synUnitCylinderFillingData(); this.synUnitCylinderFillingData();
} }
...@@ -625,8 +620,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -625,8 +620,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
* 按单位统计 * 按单位统计
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Scheduled(cron = "0 0 2 * * ?") // @Scheduled(cron = "0 0 2 * * ?")
@SchedulerLock(name = "synUnitCylinderTagsDataTask", lockAtMostFor = "PT6H") // @SchedulerLock(name = "synUnitCylinderTagsDataTask", lockAtMostFor = "PT6H")
public void synUnitCylinderTagsDataJob() { public void synUnitCylinderTagsDataJob() {
this.synUnitCylinderTagsData(); this.synUnitCylinderTagsData();
} }
...@@ -671,8 +666,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -671,8 +666,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Scheduled(cron = "0 0 2 * * ?") // @Scheduled(cron = "0 0 2 * * ?")
@SchedulerLock(name = "synUnitIntegrityDataTask", lockAtMostFor = "PT6H") // @SchedulerLock(name = "synUnitIntegrityDataTask", lockAtMostFor = "PT6H")
public void synUnitIntegrityDataJob() { public void synUnitIntegrityDataJob() {
this.synUnitIntegrityData(); this.synUnitIntegrityData();
} }
...@@ -737,8 +732,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -737,8 +732,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Scheduled(cron = "0 0 2 * * ?") // @Scheduled(cron = "0 0 2 * * ?")
@SchedulerLock(name = "synUnitFillingCheckDataTask", lockAtMostFor = "PT6H") // @SchedulerLock(name = "synUnitFillingCheckDataTask", lockAtMostFor = "PT6H")
public void synUnitFillingCheckDataJob() { public void synUnitFillingCheckDataJob() {
this.fillingCheckDataSynHandler(); this.fillingCheckDataSynHandler();
} }
...@@ -943,8 +938,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -943,8 +938,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
* 充装量、卸液量按单位统计 * 充装量、卸液量按单位统计
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Scheduled(cron = "0 0 2 * * ?") // @Scheduled(cron = "0 0 2 * * ?")
@SchedulerLock(name = "synFillingUnloadUnitDataTask", lockAtMostFor = "PT6H") // @SchedulerLock(name = "synFillingUnloadUnitDataTask", lockAtMostFor = "PT6H")
public void synFillingUnloadUnitDataJob() { public void synFillingUnloadUnitDataJob() {
this.synFillingUnloadUnitData(); this.synFillingUnloadUnitData();
} }
...@@ -971,8 +966,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -971,8 +966,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
}); });
} }
@Scheduled(cron = "${tzs.cylinder.info.cron}") // @Scheduled(cron = "${tzs.cylinder.info.cron}")
@SchedulerLock(name = "cylinderInfoToESTask", lockAtMostFor = "PT6H") // @SchedulerLock(name = "cylinderInfoToESTask", lockAtMostFor = "PT6H")
public void setTimeSaveCylinderInfoToES() { public void setTimeSaveCylinderInfoToES() {
Page<CylinderInfoDto> cylinderInfoPage = new Page<>(); Page<CylinderInfoDto> cylinderInfoPage = new Page<>();
Integer count = getInfoTotal(); Integer count = getInfoTotal();
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzBaseEnterpriseInfo.java
View file @ b9bd6cd5
package com.yeejoin.amos.boot.module.tcm.api.entity; package com.yeejoin.amos.boot.module.tcm.api.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
...@@ -185,7 +184,6 @@ public class TzBaseEnterpriseInfo extends BaseEntity { ...@@ -185,7 +184,6 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
private String industrySupervisor; private String industrySupervisor;
@ApiModelProperty(value = "企业标签信息") @ApiModelProperty(value = "企业标签信息")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String regulatoryLabels; private String regulatoryLabels;
@ApiModelProperty(value = "注册类型") @ApiModelProperty(value = "注册类型")
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/service/impl/RegUnitInfoServiceImpl.java
View file @ b9bd6cd5
...@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.biz.common.utils.TreeParser; ...@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService; import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr; import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.enums.UnitDataSourceEnum; import com.yeejoin.amos.boot.module.common.api.enums.UnitDataSourceEnum;
import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeEnum;
import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeNewEnum; import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeNewEnum;
import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher; import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent; import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
...@@ -180,6 +181,9 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI ...@@ -180,6 +181,9 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
@Autowired @Autowired
DataDictionaryServiceImpl dataDictionaryService; DataDictionaryServiceImpl dataDictionaryService;
@Value("${enterprise.regulatoryLabels.default.value:三级管控}")
private String defaultRegulatoryLabels;
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public RegUnitInfoDto registerUnit(RegUnitInfoDto model) { public RegUnitInfoDto registerUnit(RegUnitInfoDto model) {
...@@ -430,6 +434,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI ...@@ -430,6 +434,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
baseEnterpriseInfo.setAddress(regUnitInfo.getAddress()); baseEnterpriseInfo.setAddress(regUnitInfo.getAddress());
baseEnterpriseInfo.setUseContact(regUnitInfo.getName()); baseEnterpriseInfo.setUseContact(regUnitInfo.getName());
baseEnterpriseInfo.setContactPhone(regUnitInfo.getAdminTel()); baseEnterpriseInfo.setContactPhone(regUnitInfo.getAdminTel());
baseEnterpriseInfo.setRegulatoryLabels(defaultRegulatoryLabels);
} else { } else {
baseEnterpriseInfo.setOfficeRegion(regUnitInfo.getOfficeRegion()); baseEnterpriseInfo.setOfficeRegion(regUnitInfo.getOfficeRegion());
baseEnterpriseInfo.setOfficeAddress(regUnitInfo.getOfficeAddress()); baseEnterpriseInfo.setOfficeAddress(regUnitInfo.getOfficeAddress());
...@@ -447,6 +452,9 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI ...@@ -447,6 +452,9 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
baseEnterpriseInfo.setContactPhone(regUnitInfo.getAdminTel()); baseEnterpriseInfo.setContactPhone(regUnitInfo.getAdminTel());
baseEnterpriseInfo.setUseUnitCode(regUnitInfo.getUnitCode()); baseEnterpriseInfo.setUseUnitCode(regUnitInfo.getUnitCode());
baseEnterpriseInfo.setUseUnitCertificate(regUnitInfo.getUnitCodeTypeName()); baseEnterpriseInfo.setUseUnitCertificate(regUnitInfo.getUnitCodeTypeName());
if (baseEnterpriseInfo.getUnitType().contains(UnitTypeEnum.SYDW.getName())) {
baseEnterpriseInfo.setRegulatoryLabels(defaultRegulatoryLabels);
}
} }
// 管辖机构信息 // 管辖机构信息
baseEnterpriseInfo.setSuperviseCode(regUnitInfo.getManagementUnitCompanyCode()); baseEnterpriseInfo.setSuperviseCode(regUnitInfo.getManagementUnitCompanyCode());
......
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