Skip to content

A
amos-boot-biz
Commit ad02e054 authored by 刘林's avatar 刘林
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents ad309dec a4d8c161
Hide whitespace changes
Inline Side-by-side
Showing with 799 additions and 239 deletions
amos-boot-biz-common/pom.xml
View file @ ad02e054
......@@ -37,10 +37,6 @@
</exclusions>
</dependency>
<dependency>
<artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
</dependency>
<dependency>
<groupId>org.typroject</groupId>
<artifactId>tyboot-core-restful</artifactId>
<version>${tyboot-version}</version>
......@@ -135,6 +131,18 @@
<artifactId>postgresql</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-feign-systemctl</artifactId>
</dependency>
</dependencies>
</project>
amos-boot-data/amos-boot-data-accessapi/pom.xml
View file @ ad02e054
......@@ -21,7 +21,6 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
......@@ -96,7 +95,6 @@
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-feign-systemctl</artifactId>
<version>${amos.version}</version>
</dependency>
<dependency>
......@@ -184,7 +182,6 @@
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-component-security</artifactId>
<version>${amos.version.tzs}</version>
</dependency>
</dependencies>
<build>
......
amos-boot-data/amos-boot-data-openapi/pom.xml
View file @ ad02e054
......@@ -14,7 +14,10 @@
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<!-- druid -->
<dependency>
<groupId>com.alibaba</groupId>
......@@ -38,12 +41,6 @@
<version>1.2.16</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
......@@ -107,7 +104,6 @@
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-feign-systemctl</artifactId>
<version>${amos.version}</version>
</dependency>
<dependency>
......
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/pom.xml
View file @ ad02e054
......@@ -15,7 +15,6 @@
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-component-rule</artifactId>
<version>1.8.5</version>
<exclusions>
<exclusion>
<groupId>org.typroject</groupId>
......
amos-boot-system-tzs/amos-boot-module-common/pom.xml
View file @ ad02e054
......@@ -17,7 +17,6 @@
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-feign-rule</artifactId>
<version>1.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/CodeGenerateDto.java 0 → 100644
View file @ ad02e054
package com.yeejoin.amos.boot.module.jg.api.dto;
import cn.hutool.core.date.DateUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @author Administrator
* code 生成参数类
*/
@Data
@ApiModel(value = "code生成参数类")
public class CodeGenerateDto {
@ApiModelProperty(value = "设备种类")
private String equList;
@ApiModelProperty(value = "设备类别")
private String equCategory;
@ApiModelProperty(value = "设备品种")
private String equDefine;
@ApiModelProperty(value = "制造日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date produceDate;
@ApiModelProperty(value = "审批机构所在地行政区域代码")
private String receiveCompanyCode;
/**
* 获取年
* @return 制造日期所在年
*/
public String getYear() {
return DateUtil.year(produceDate) + "";
}
/**
* 获得设备基本代码
* @return 设备基本代码
*/
public String getEquipBaseCode() {
return StringUtils.isNotEmpty(equDefine) ? equDefine : equCategory;
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/UseFlagParamDto.java
View file @ ad02e054
......@@ -94,7 +94,7 @@ public class UseFlagParamDto {
*
*/
private String factoryNumber;
private String factoryNumber;
/**
* 气瓶数量或者容积--车用气瓶专用
......
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 @ ad02e054
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
......@@ -53,5 +54,12 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
List<String> refreshTheDetailsDataOfCompletedUsageRegistration(String since);
/**
* 按照 地市或者区县查询所在的地市code
* @param receiveCompanyCode 地市或者区县code
* @param exclusionIds 需要排除的区县
* @return 地市code
*/
String selectCityCompanyCode(@Param("receiveCompanyCode") String receiveCompanyCode, @Param("exclusionIds") String[] exclusionIds);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml
View file @ ad02e054
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper">
<select id="getUnitListByType" resultType="java.util.Map">
SELECT
use_code useCode,
use_unit useUnit
FROM
tz_base_enterprise_info
WHERE
unit_type LIKE CONCAT('%',#{type},'%') AND is_delete = '0';
<select id="getUnitListByType" resultType="java.util.Map">
SELECT use_unit_code useCode,
use_unit useUnit
FROM tz_base_enterprise_info
WHERE is_delete = '0'
<if test="type != null and type != 'all'">
<choose>
<when test="type == '使用单位'">
and ( unit_type = '个人主体' OR unit_type LIKE CONCAT('%', #{type}, '%') )
</when>
<otherwise>
and unit_type LIKE CONCAT('%', #{type}, '%')
</otherwise>
</choose>
</if>
</select>
<select id="getSecurityAdmin" resultType="java.util.Map">
......@@ -319,5 +325,17 @@
WHERE "status" = '已完成'
AND "audit_pass_date" <![CDATA[<=]]> #{since}
</select>
<select id="selectCityCompanyCode" resultType="string">
SELECT
c.company_code
FROM "privilege_company" c
where
c.company_code like concat(left(#{receiveCompanyCode}, 4), '%')
and c.level ='prefecture-level'
and c.company_type ='监管机构'
<foreach collection="exclusionIds" item="id" separator="" open="" close="">
and c.company_code != #{id}
</foreach>
limit 1
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml
View file @ ad02e054
......@@ -139,7 +139,7 @@
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
LEFT JOIN tz_base_enterprise_info useUnit ON useUnit.use_code = isn.use_unit_credit_code
LEFT JOIN tz_base_enterprise_info useUnit ON useUnit.use_unit_code = isn.use_unit_credit_code
LEFT JOIN tz_base_enterprise_info installUnit ON installUnit.use_code = isn.install_unit_credit_code
LEFT JOIN amos_tzs_biz.tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text
LEFT JOIN amos_tzs_biz.tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java
View file @ ad02e054
......@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.jg.api.dto.CodeGenerateDto;
import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
......@@ -14,13 +15,16 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
import com.yeejoin.amos.boot.module.jg.biz.service.IPdfService;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgRegistrationHistoryServiceImpl;
import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
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.format.annotation.DateTimeFormat;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
......@@ -55,6 +59,9 @@ public class CommonController extends BaseController {
@Autowired
JgUseRegistrationMapper jgUseRegistrationMapper;
@Autowired
CodeUtil codeUtil;
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getChildren")
@ApiOperation(httpMethod = "GET", value = "通过设备种类code获取设备类别", notes = "通过设备种类code获取设备类别")
......@@ -389,7 +396,7 @@ public class CommonController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/use-flag-test")
@ApiOperation(httpMethod = "GET", value = "使用标志生成测试", notes = "使用标志生成测试")
public ResponseModel<String> getUserPhone(HttpServletResponse response) {
......@@ -401,9 +408,9 @@ public class CommonController extends BaseController {
private UseFlagParamDto buildUseFlagParam(){
UseFlagParamDto useFlagParamDto = new UseFlagParamDto();
useFlagParamDto.setEquList("设备种类名称");
useFlagParamDto.setEquListCode("3000");
useFlagParamDto.setEquListCode("0000");
useFlagParamDto.setEquipCode("10001101");
// useFlagParamDto.setEquipDefine("设备品种");
useFlagParamDto.setEquipDefine("设备品种");
useFlagParamDto.setUseUnitName("使用单位名称");
useFlagParamDto.setEquipCategory("设备类别名称");
useFlagParamDto.setUseInnerCode("单位内编号");
......@@ -462,4 +469,41 @@ public class CommonController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/test-code")
@ApiOperation(httpMethod = "PUT", value = "code生成测试", notes = "code生成测试")
public ResponseModel<String> codeTest(@ApiParam("设备种类") @RequestParam String equList,
@ApiParam("设备类别") @RequestParam String equCategory,
@ApiParam("设备品种") @RequestParam(required = false) String equDefine,
@ApiParam("接收机构行政区划") @RequestParam String receiveCompanyCode,
@ApiParam("制造日期") @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date produceDate) {
CodeGenerateDto codeGenerateDto = new CodeGenerateDto();
codeGenerateDto.setEquList(equList);
codeGenerateDto.setEquCategory(equCategory);
codeGenerateDto.setEquDefine(equDefine);
codeGenerateDto.setProduceDate(produceDate);
codeGenerateDto.setReceiveCompanyCode(receiveCompanyCode);
return ResponseHelper.buildResponse(codeUtil.generateEquipmentCode(codeGenerateDto));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/init-code")
@ApiOperation(httpMethod = "PUT", value = "设备代码初始化-运维专用", notes = "设备代码初始化-运维专用")
public ResponseModel<String> initEquCode(@ApiParam("设备种类") @RequestParam String equList,
@ApiParam("设备类别") @RequestParam String equCategory,
@ApiParam("设备品种") @RequestParam(required = false) String equDefine,
@ApiParam("接收机构行政区划") @RequestParam String receiveCompanyCode,
@ApiParam("制造日期") @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date produceDate,
@ApiParam("重置的序列号") @RequestParam(required = false, defaultValue = "0") Long intNumber){
CodeGenerateDto codeGenerateDto = new CodeGenerateDto();
codeGenerateDto.setEquList(equList);
codeGenerateDto.setEquCategory(equCategory);
codeGenerateDto.setEquDefine(equDefine);
codeGenerateDto.setProduceDate(produceDate);
codeGenerateDto.setReceiveCompanyCode(receiveCompanyCode);
codeUtil.initCode(codeGenerateDto, intNumber);
return ResponseHelper.buildResponse("succese");
}
}
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 @ ad02e054
......@@ -607,6 +607,9 @@ public class CommonServiceImpl implements ICommonService {
case "inspection":
type = "检验检测机构";
break;
case "all":
type = "all";
break;
}
return commonMapper.getUnitListByType(type);
}
......
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/IdxBizJgRegisterInfoServiceImpl.java
View file @ ad02e054
......@@ -156,6 +156,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
public final static String USE_TYPE_NAME = "使用单位";
public final static String INDIVIDUAL_TYPE_NAME = "个人主体";
public final static String MAINTENANCE_TYPE_NAME = "安装改造维修单位";
@Value("${add.equip.dict.code.suffix:CATEGORY_LIST_ADD}")
......@@ -388,7 +390,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
private String getDictCodePrefix(String companyType) {
String dictCodePrefix = "";
if (companyType.contains(USE_TYPE_NAME) && !companyType.contains(MAINTENANCE_TYPE_NAME)) { // 使用单位
if ((companyType.contains(USE_TYPE_NAME) || companyType.contains(INDIVIDUAL_TYPE_NAME)) && !companyType.contains(MAINTENANCE_TYPE_NAME)) { // 使用单位
dictCodePrefix = "USE";
}
if (companyType.contains(MAINTENANCE_TYPE_NAME) && !companyType.contains(USE_TYPE_NAME)) { // 安改维单位
......@@ -1111,6 +1113,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
if (!ValidationUtil.isEmpty(type) && type.contains("安装改造维修单位")) {
map.put("USC_UNIT_CREDIT_CODE", companyCode);
}
if (!ValidationUtil.isEmpty(type) && type.contains("个人主体")) {
map.put("USE_UNIT_CREDIT_CODE", companyCode);
}
}
// 默认条件【STATUS==="" || null】
......@@ -1377,7 +1382,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
useInfo.setDataSource("jg");
useInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("USEINFO_SEQ")));
if(companyTypeStr.contains(CompanyTypeEnum.USE.getCode())) {
if(companyTypeStr.contains(CompanyTypeEnum.USE.getCode()) || companyTypeStr.contains(CompanyTypeEnum.INDIVIDUAL.getCode())) {
useInfo.setUseUnitCreditCode(companyType.get("creditCode").toString());
useInfo.setUseUnitName(companyType.get("companyTypeName").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/JgChangeRegistrationNameServiceImpl.java
View file @ ad02e054
......@@ -112,8 +112,13 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
@Autowired
private RedissonClient redissonClient;
@Autowired
TzBaseEnterpriseInfoMapper baseEnterpriseInfoMapper;
private static String template = "来自企业（%s）的业务办理，【申请单号：%s】";
public static String JG_COMAPNY_TYPE = "监管机构";
@Transactional(rollbackFor = Exception.class)
public List<JgChangeRegistrationName> save2(String submitType, JSONObject requestParam) {
......@@ -741,10 +746,18 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
if (!Objects.isNull(sequenceNbr)) {
jgChangeRegistrationName = this.baseMapper.selectById(sequenceNbr);
jgChangeRegistrationName.setReceiveOrgCode(jgChangeRegistrationName.getReceiveCompanyCode() + "_" + jgChangeRegistrationName.getReceiveOrgName());
// 页面可编辑（当前登录人是发起人）且符合这个 监管机构 false
if(!JG_COMAPNY_TYPE.equals(reginParams.getCompany().getCompanyType())){
dtoMap.put("isInProvince", this.justIsInProvince(reginParams.getCompany().getCompanyCode()));
} else {
dtoMap.put("isInProvince", false);
}
} else {
jgChangeRegistrationName.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
jgChangeRegistrationName.setNewUseUnitName(unitName);
jgChangeRegistrationName.setUseUnitName(reginParams.getCompany().getCompanyName());
// 初始时：返回当前登录人的公司信息，用来判断是否新名称是否可编辑
dtoMap.put("isInProvince", this.justIsInProvince(reginParams.getCompany().getCompanyCode()));
}
BeanUtil.copyProperties(jgChangeRegistrationName, dtoMap);
dtoMap.put("changeCertificate", JSON.parseArray(jgChangeRegistrationName.getChangeCertificate()));
......@@ -753,6 +766,21 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
return map;
}
private Boolean justIsInProvince(String companyCode){
TzBaseEnterpriseInfo baseEnterpriseInfo = baseEnterpriseInfoMapper.selectOne(new LambdaQueryWrapper<TzBaseEnterpriseInfo>().eq(TzBaseEnterpriseInfo::getUseCode, companyCode));
if(baseEnterpriseInfo == null ){
log.warn(companyCode + "无企业信息");
return false;
}
String dataSource = baseEnterpriseInfo.getDataSources();
String registerType = baseEnterpriseInfo.getRegisterType();
String[] disabledDataSource = {"企业注册", "陕西省内企业"};
String[] disabledRegisterType = {"企业单位"};
// 省内的企业且类型为企业时
return Arrays.asList(disabledDataSource).contains(dataSource) && Arrays.asList(disabledRegisterType).contains(registerType);
}
public Page<Map<String, Object>> getList(JgChangeRegistrationNameDto dto, Page<Map<String, Object>> page, List<String> roleIds, String companyCode) {
if (org.apache.commons.lang3.StringUtils.isNotBlank(dto.getReceiveOrgCode())) {
String[] receiveOrgIdList = dto.getReceiveOrgCode().split("_");
......
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/JgInstallationNoticeServiceImpl.java
View file @ ad02e054
......@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
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.jg.api.dto.*;
import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
......
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/JgUseRegistrationServiceImpl.java
View file @ ad02e054
......@@ -25,10 +25,12 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationService;
import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
import com.yeejoin.amos.boot.module.ymt.api.entity.*;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquCodeTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
......@@ -102,6 +104,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
private IdxBizJgOtherInfoMapper otherInfoMapper;
@Autowired
private JgUseRegistrationEqMapper jgRelationEquipMapper;
@Autowired
private ProduceInfoMapper produceInfoMapper;
@Autowired
private IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoService;
@Autowired
......@@ -113,6 +119,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
@Autowired
private RedissonClient redissonClient;
@Autowired
CodeUtil codeUtil;
/**
* @param auditPassDate 通过时间
* @param exportParamsMap 参数map
......@@ -543,7 +552,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr));
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
JSONObject mapData = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
// 其他信息
LambdaQueryWrapper<IdxBizJgOtherInfo> lambdaOth = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
lambdaOth.eq(IdxBizJgOtherInfo::getRecord, String.valueOf(mapData.get("equipId")));
......@@ -563,6 +571,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
LambdaUpdateWrapper<IdxBizJgRegisterInfo> lambda = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda();
lambda.eq(IdxBizJgRegisterInfo::getRecord, registerInfo.getRecord());
lambda.set(true, IdxBizJgRegisterInfo::getUseOrgCode, code);
// 新增页面选择无设备代码后，在审批通过后自动生成设备代码
this.justGenerateEquCode(lambda, registerInfo, jgUseRegistration.getReceiveCompanyCode(), mapData, jgRegistrationHistory);
idxBizJgRegisterInfoService.update(lambda);
}
// 使用信息
......@@ -590,6 +600,38 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
return jgUseRegistration;
}
/**
* 系统类型的code 自动生成设备代码
* @param lambda lambda
* @param registerInfo 注册信息
* @param receiveCompanyCode 接收机构行政区划代码
* @param mapData 历史数据
* @param jgRegistrationHistory 历史数据行数据
*/
private void justGenerateEquCode(LambdaUpdateWrapper<IdxBizJgRegisterInfo> lambda, IdxBizJgRegisterInfo registerInfo, String receiveCompanyCode, JSONObject mapData, JgRegistrationHistory jgRegistrationHistory) {
if(EquCodeTypeEnum.SYSTEM_GENERATED.getCode().equals(registerInfo.getEquCodeType())){
// 更新注册信息表的设备代码字段
String equCode = this.getEquCode(registerInfo,receiveCompanyCode);
registerInfo.setEquCode(equCode);
mapData.put("equCode", equCode);
lambda.set(true, IdxBizJgRegisterInfo::getEquCode, equCode);
// 更新新生成的历史数据的设备代码
jgRegistrationHistory.setChangeData(JSON.toJSONString(mapData));
jgRegistrationHistoryService.updateById(jgRegistrationHistory);
}
}
private String getEquCode(IdxBizJgRegisterInfo registerInfo, String receiveCompanyCode){
ProduceInfo produceInfo = produceInfoMapper.selectOne(new LambdaQueryWrapper<ProduceInfo>().eq(AbstractEquipBaseEntity::getRecord,registerInfo.getRecord()));
CodeGenerateDto codeGenerateDto = new CodeGenerateDto();
codeGenerateDto.setEquList(registerInfo.getEquList());
codeGenerateDto.setEquCategory(registerInfo.getEquCategory());
codeGenerateDto.setEquDefine(registerInfo.getEquDefine());
codeGenerateDto.setProduceDate(produceInfo.getProduceDate());
codeGenerateDto.setReceiveCompanyCode(receiveCompanyCode);
return codeUtil.generateEquipmentCode(codeGenerateDto);
}
public void updateEsData(String usePlace, JSONObject dataMap, IdxBizJgOtherInfo otherInfo, JgUseRegistration jgUseRegistration) {
// 属地监管部门拆分
String orgBranch = (String) dataMap.getOrDefault("orgBranchCode", "_");
......@@ -607,6 +649,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
param.put("EQU_STATE", 1);
param.put("ORG_BRANCH_CODE", split[0]);
param.put("ORG_BRANCH_NAME", split[1]);
param.put("EQU_CODE", dataMap.get("equCode"));
param.put("USE_ORG_CODE", jgUseRegistration.getUseRegistrationCode());
objMap.put((String) dataMap.get("equipId"), param);
tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/utils/CodeUtil.java 0 → 100644
View file @ ad02e054
package com.yeejoin.amos.boot.module.jg.biz.utils;
import com.yeejoin.amos.boot.module.jg.api.dto.CodeGenerateDto;
import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
import org.redisson.api.RBucket;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Component;
import java.util.Arrays;
/**
* @author Administrator
*/
@Component
public class CodeUtil {
private RedissonClient redissonClient;
private CommonMapper commonMapper;
/**
* 特殊独立的区县
*/
private static String[] EXCLUSION_CITY_REGIONS = {"610403", "610581"};
public CodeUtil(RedissonClient redissonClient, CommonMapper commonMapper) {
this.redissonClient = redissonClient;
this.commonMapper = commonMapper;
}
/**
* 按照特种设备代码规范生成 设备代码
*
* @param codeGenerateDto 生成代码需要的数据
* @return 设备基本代码（4位）+ 行政区域代码（6位）+制造年份（4位）+ 制造顺序号（4位）
*/
public String generateEquipmentCode(CodeGenerateDto codeGenerateDto) {
// 根据区县或者地市级的接收机构代码获取地市级的行政区域代码
String regionCode = this.getCityRegionCode(codeGenerateDto.getReceiveCompanyCode());
// 并发锁处理
String lockKey = this.buildLockKey(codeGenerateDto.getEquipBaseCode(), regionCode, codeGenerateDto.getYear());
RLock rLock = redissonClient.getLock(lockKey);
try {
rLock.lock();
// 获取当前已经使用过的序列号
RBucket<Long> rBucket = redissonClient.getBucket(this.buildManufactureNumberKey(lockKey));
// 初始化逻辑，初始化为0（编号1开始）
if (rBucket.get() == null) {
rBucket.set(0L);
}
long currentNumber = rBucket.get();
long nextNumber = currentNumber + 1;
// 使用后redis序列号+1
rBucket.set(nextNumber);
return this.buildEquipmentCode(codeGenerateDto.getEquipBaseCode(), regionCode, codeGenerateDto.getYear(), nextNumber);
} finally {
if (rLock.isHeldByCurrentThread()) {
rLock.unlock();
}
}
}
public void initCode(CodeGenerateDto codeGenerateDto ,Long intNumber){
// 根据区县或者地市级的接收机构代码获取地市级的行政区域代码
String regionCode = this.getCityRegionCode(codeGenerateDto.getReceiveCompanyCode());
String lockKey = this.buildLockKey(codeGenerateDto.getEquipBaseCode(), regionCode, codeGenerateDto.getYear());
RBucket<Long> rBucket = redissonClient.getBucket(this.buildManufactureNumberKey(lockKey));
// 初始化逻辑，初始化为0（编号1开始）
if(intNumber != null){
rBucket.set(intNumber);
} else {
rBucket.set(0L);
}
}
/**
* 获取地市级的行政审批区域代码
*
* @param receiveCompanyCode 接收机构的行政区域代码
* @return 地市级行政审批区域代码
*/
private String getCityRegionCode(String receiveCompanyCode) {
// 需求《需要注意的是其中的行政区域代码直到地市一级，西咸、杨凌、韩城用自己的》,西咸组织机构独立的所以不需要单独排除
if (Arrays.asList(EXCLUSION_CITY_REGIONS).contains(receiveCompanyCode)) {
return receiveCompanyCode;
} else {
return commonMapper.selectCityCompanyCode(receiveCompanyCode, EXCLUSION_CITY_REGIONS);
}
}
private String buildEquipmentCode(String equipBaseCode, String regionCode, String year, long nextNumber) {
String manufactureNumber = longCode2StrCode(nextNumber);
return String.format("%s%s%s%s", equipBaseCode, regionCode, year, manufactureNumber);
}
private String longCode2StrCode(long nextNumber) {
if (nextNumber >= 10000) {
char prefix = (char) ('A' + (nextNumber - 10000) / 1000);
return prefix + "" + String.format("%03d", (nextNumber - 10000) % 1000);
} else {
return String.format("%04d", nextNumber);
}
}
private String buildManufactureNumberKey(String lockKey) {
return "MANUFACTURE_NUMBER_KEY:" + lockKey;
}
private String buildLockKey(String equipBaseCode, String regionCode, String year) {
return equipBaseCode + regionCode + year;
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/flag3-use-equip.ftl
View file @ ad02e054
......@@ -6,15 +6,15 @@
<o:Author>Administrator</o:Author>
<o:LastAuthor>光</o:LastAuthor>
<o:Created>2024-03-06T15:11:00Z</o:Created>
<o:LastSaved>2024-03-11T08:17:45Z</o:LastSaved>
<o:TotalTime>0</o:TotalTime>
<o:LastSaved>2024-03-26T03:58:00Z</o:LastSaved>
<o:TotalTime>40320</o:TotalTime>
<o:Version>14</o:Version>
</o:DocumentProperties>
<o:CustomDocumentProperties>
<o:CRO dt:dt="string">wqlLaW5nc29mdCBQREYgdG8gV1BTIDkw</o:CRO>
<o:Created dt:dt="dateTime.tz">2024-03-06T15:15:59Z</o:Created>
<o:KSOProductBuildVer dt:dt="string">2052-12.1.0.16388</o:KSOProductBuildVer>
<o:ICV dt:dt="string">FE7D2C23F01F406785871551932A5111_13</o:ICV>
<o:KSOProductBuildVer dt:dt="string">2052-12.1.0.16417</o:KSOProductBuildVer>
<o:ICV dt:dt="string">BCC6D37A61D0478986AA0878E381AB9F_13</o:ICV>
</o:CustomDocumentProperties>
<w:fonts>
<w:defaultFonts w:ascii="Times New Roman" w:fareast="宋体" w:h-ansi="Times New Roman" w:cs="Times New Roman"/>
......@@ -74,12 +74,19 @@
<w:pitch w:val="Default"/>
<w:sig w:usb-0="E4002EFF" w:usb-1="C000247B" w:usb-2="00000009" w:usb-3="00000000" w:csb-0="200001FF" w:csb-1="00000000"/>
</w:font>
<w:font w:name="Impact">
<w:panose-1 w:val="020B0806030902050204"/>
<w:font w:name="微软雅黑">
<w:panose-1 w:val="020B0503020204020204"/>
<w:charset w:val="86"/>
<w:family w:val="Auto"/>
<w:pitch w:val="Default"/>
<w:sig w:usb-0="80000287" w:usb-1="2ACF3C50" w:usb-2="00000016" w:usb-3="00000000" w:csb-0="0004001F" w:csb-1="00000000"/>
</w:font>
<w:font w:name="Tahoma">
<w:panose-1 w:val="020B0604030504040204"/>
<w:charset w:val="00"/>
<w:family w:val="Auto"/>
<w:pitch w:val="Default"/>
<w:sig w:usb-0="00000287" w:usb-1="00000000" w:usb-2="00000000" w:usb-3="00000000" w:csb-0="2000009F" w:csb-1="DFD70000"/>
<w:sig w:usb-0="E1002EFF" w:usb-1="C000605B" w:usb-2="00000029" w:usb-3="00000000" w:csb-0="200101FF" w:csb-1="20280000"/>
</w:font>
</w:fonts>
<w:styles>
......@@ -335,6 +342,7 @@
</w:latentStyles>
<w:style w:type="paragraph" w:styleId="a1" w:default="on">
<w:name w:val="Normal"/>
<w:autoRedefine/>
<w:semiHidden/>
<w:pPr>
<w:kinsoku w:val="off"/>
......@@ -385,6 +393,7 @@
</w:style>
<w:style w:type="table" w:styleId="a5">
<w:name w:val="Table Normal"/>
<w:autoRedefine/>
<w:semiHidden/>
<w:tblPr>
<w:tblCellMar>
......@@ -421,7 +430,7 @@
</w:bgPict>
<w:docPr>
<w:view w:val="print"/>
<w:zoom w:percent="60"/>
<w:zoom w:percent="100"/>
<w:characterSpacingControl w:val="DontCompress"/>
<w:documentProtection w:enforcement="off"/>
<w:displayBackgroundShape w:val="1"/>
......@@ -446,7 +455,7 @@
<w:tblPr>
<w:tblStyle w:val="a5"/>
<w:tblW w:w="8220" w:type="dxa"/>
<w:tblInd w:w="365" w:type="dxa"/>
<w:tblInd w:w="364" w:type="dxa"/>
<w:tblBorders>
<w:top w:val="single" w:sz="6" wx:bdrwidth="15" w:space="0" w:color="000000"/>
<w:left w:val="single" w:sz="6" wx:bdrwidth="15" w:space="0" w:color="000000"/>
......@@ -515,7 +524,7 @@
<w:sz w:val="21"/>
</w:rPr>
<w:pict>
<v:rect id="矩形 14" o:spid="_x0000_s1026" o:spt="1" style="position:absolute;left:0pt;margin-left:-7.55pt;margin-top:0.4pt;height:283.45pt;width:425.2pt;z-index:-251657216;mso-width-relative:page;mso-height-relative:page;" fillcolor="#9D9696" filled="t" stroked="f" coordsize="21600,21600">
<v:rect id="矩形 14" o:spid="_x0000_s1026" o:spt="1" style="position:absolute;left:0pt;margin-left:-7.05pt;margin-top:0.1pt;height:283.45pt;width:425.2pt;z-index:-251657216;mso-width-relative:page;mso-height-relative:page;" fillcolor="#9D9696" filled="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="t" color2="#FFFFFF" focussize="0,0"/>
<v:stroke on="f"/>
......@@ -549,7 +558,7 @@
<w:tblPr>
<w:tblStyle w:val="a5"/>
<w:tblW w:w="8220" w:type="dxa"/>
<w:tblInd w:w="365" w:type="dxa"/>
<w:tblInd w:w="364" w:type="dxa"/>
<w:tblBorders>
<w:top w:val="single" w:sz="6" wx:bdrwidth="15" w:space="0" w:color="000000"/>
<w:left w:val="single" w:sz="6" wx:bdrwidth="15" w:space="0" w:color="000000"/>
......@@ -616,7 +625,7 @@
<w:sz w:val="26"/>
</w:rPr>
<w:pict>
<v:shape id="文本框 16" o:spid="_x0000_s1027" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:297pt;margin-top:5.95pt;height:18.25pt;width:99.75pt;z-index:251735040;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:shape id="文本框 1" o:spid="_x0000_s1027" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:92.9pt;margin-top:6.45pt;height:18.7pt;width:110.35pt;z-index:251661312;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="t" color2="#FFFFFF" opacity="0f" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/>
......@@ -628,19 +637,21 @@
<w:pPr>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="default"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:color w:val="000000"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:color w:val="000000"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
<w:t>车用气瓶</w:t>
<w:t>压力容器</w:t>
</w:r>
</w:p>
</w:txbxContent>
......@@ -653,7 +664,7 @@
<w:sz w:val="26"/>
</w:rPr>
<w:pict>
<v:shape id="文本框 1" o:spid="_x0000_s1028" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:94.4pt;margin-top:6.45pt;height:18.7pt;width:110.35pt;z-index:251666432;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:shape id="文本框 16" o:spid="_x0000_s1028" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:297pt;margin-top:6.7pt;height:22pt;width:99.75pt;z-index:251669504;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="t" color2="#FFFFFF" opacity="0f" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/>
......@@ -665,7 +676,6 @@
<w:pPr>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="default"/>
<w:color w:val="000000"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
......@@ -674,12 +684,11 @@
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:color w:val="000000"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
<w:t>压力容器</w:t>
<w:t>车用气瓶</w:t>
</w:r>
</w:p>
</w:txbxContent>
......@@ -804,7 +813,7 @@
<w:sz w:val="26"/>
</w:rPr>
<w:pict>
<v:shape id="文本框 2" o:spid="_x0000_s1029" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:93.1pt;margin-top:4.9pt;height:20.5pt;width:311.95pt;z-index:251672576;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:shape id="文本框 2" o:spid="_x0000_s1029" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:93.1pt;margin-top:6.4pt;height:20.5pt;width:311.95pt;z-index:251662336;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="t" color2="#FFFFFF" opacity="0f" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/>
......@@ -829,8 +838,8 @@
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="default"/>
<w:color w:val="000000"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
</w:pPr>
......@@ -838,8 +847,8 @@
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:color w:val="000000"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
<w:t>${(useUnitName)!''}</w:t>
......@@ -914,7 +923,7 @@
<w:sz w:val="26"/>
</w:rPr>
<w:pict>
<v:shape id="文本框 6" o:spid="_x0000_s1030" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:297.25pt;margin-top:29.45pt;height:18.85pt;width:117.15pt;z-index:251765760;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:shape id="文本框 6" o:spid="_x0000_s1030" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:298.75pt;margin-top:30.95pt;height:18.85pt;width:117.15pt;z-index:251671552;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="t" color2="#FFFFFF" opacity="0f" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/>
......@@ -927,16 +936,16 @@
<w:jc w:val="left"/>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="default"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
<w:t>${(fillingMedium)!''}</w:t>
......@@ -952,7 +961,7 @@
<w:sz w:val="26"/>
</w:rPr>
<w:pict>
<v:shape id="文本框 9" o:spid="_x0000_s1031" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:296.65pt;margin-top:5.05pt;height:23.35pt;width:105.75pt;z-index:251743232;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:shape id="文本框 4" o:spid="_x0000_s1031" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:95.3pt;margin-top:30.95pt;height:18.85pt;width:117.15pt;z-index:251664384;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="t" color2="#FFFFFF" opacity="0f" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/>
......@@ -972,12 +981,12 @@
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="Times New Roman" w:h-ansi="Times New Roman" w:fareast="黑体" w:cs="Times New Roman" w:hint="default"/>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
<w:t>${(factoryNumber)!""}</w:t>
<w:t>${(cylinderNumOrVolume)!''}</w:t>
</w:r>
</w:p>
</w:txbxContent>
......@@ -990,7 +999,7 @@
<w:sz w:val="26"/>
</w:rPr>
<w:pict>
<v:shape id="文本框 4" o:spid="_x0000_s1032" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:95.3pt;margin-top:29.45pt;height:18.85pt;width:117.15pt;z-index:251686912;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:shape id="文本框 3" o:spid="_x0000_s1032" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:94.5pt;margin-top:7.7pt;height:18.85pt;width:117.15pt;z-index:251663360;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="t" color2="#FFFFFF" opacity="0f" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/>
......@@ -1003,19 +1012,19 @@
<w:jc w:val="left"/>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="default"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
<w:t>${(cylinderNumOrVolume)!''}</w:t>
<w:t>${(carNumber)!''}</w:t>
</w:r>
</w:p>
</w:txbxContent>
......@@ -1028,7 +1037,7 @@
<w:sz w:val="26"/>
</w:rPr>
<w:pict>
<v:shape id="文本框 3" o:spid="_x0000_s1033" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:94.5pt;margin-top:6.95pt;height:18.85pt;width:117.15pt;z-index:251679744;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:shape id="文本框 9" o:spid="_x0000_s1033" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:296.65pt;margin-top:8.05pt;height:31.6pt;width:111pt;z-index:251670528;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="t" color2="#FFFFFF" opacity="0f" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/>
......@@ -1041,19 +1050,19 @@
<w:jc w:val="left"/>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="default"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
<w:t>${(carNumber)!''}</w:t>
<w:t>${(factoryNumber)!''}</w:t>
</w:r>
</w:p>
</w:txbxContent>
......@@ -1341,7 +1350,7 @@
<w:sz w:val="26"/>
</w:rPr>
<w:pict>
<v:shape id="文本框 11" o:spid="_x0000_s1034" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:94.7pt;margin-top:5.1pt;height:19.65pt;width:312.75pt;z-index:251696128;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:shape id="文本框 11" o:spid="_x0000_s1034" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:94.7pt;margin-top:5.85pt;height:19.65pt;width:312.75pt;z-index:251665408;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="t" color2="#FFFFFF" opacity="0f" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/>
......@@ -1354,16 +1363,16 @@
<w:jc w:val="both"/>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="default"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
<w:t>${(receiveOrgName)!''}</w:t>
......@@ -1465,7 +1474,7 @@
<w:sz w:val="26"/>
</w:rPr>
<w:pict>
<v:shape id="文本框 12" o:spid="_x0000_s1035" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:94.4pt;margin-top:3.9pt;height:20pt;width:312.75pt;z-index:251706368;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:shape id="文本框 12" o:spid="_x0000_s1035" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:94.4pt;margin-top:4.7pt;height:20.7pt;width:312.75pt;z-index:251666432;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="t" color2="#FFFFFF" opacity="0f" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/>
......@@ -1489,16 +1498,16 @@
<w:textAlignment w:val="baseline"/>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="default"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
<w:t>${(inspectionUnitName)!''}</w:t>
......@@ -1562,7 +1571,42 @@
<w:sz w:val="26"/>
</w:rPr>
<w:pict>
<v:shape id="文本框 15" o:spid="_x0000_s1036" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:299.85pt;margin-top:6.15pt;height:18.4pt;width:105.85pt;z-index:251729920;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:shape id="文本框 13" o:spid="_x0000_s1036" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:93.6pt;margin-top:5.85pt;height:19.5pt;width:117.4pt;z-index:251667456;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="t" color2="#FFFFFF" opacity="0f" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/>
<v:imagedata o:title=""/>
<o:lock v:ext="edit" aspectratio="f"/>
<v:textbox>
<w:txbxContent>
<w:p>
<w:pPr>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
</w:rPr>
<w:t>${(useRegistrationCode)!''}</w:t>
</w:r>
</w:p>
</w:txbxContent>
</v:textbox>
</v:shape>
</w:pict>
</w:r>
<w:r>
<w:rPr>
<w:sz w:val="26"/>
</w:rPr>
<w:pict>
<v:shape id="文本框 15" o:spid="_x0000_s1037" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:299.85pt;margin-top:6.15pt;height:18.4pt;width:105.85pt;z-index:251668480;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="t" color2="#FFFFFF" opacity="0f" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/>
......@@ -1586,16 +1630,16 @@
<w:textAlignment w:val="baseline"/>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
<w:t>${(year)!''}</w:t>
......@@ -1603,8 +1647,8 @@
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
<w:t>年</w:t>
......@@ -1612,8 +1656,8 @@
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
<w:t>${(month)!''}</w:t>
......@@ -1621,8 +1665,8 @@
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
<w:sz w:val="18"/>
<w:sz-cs w:val="18"/>
<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr>
<w:t>月</w:t>
......@@ -1635,41 +1679,6 @@
</w:r>
<w:r>
<w:rPr>
<w:sz w:val="26"/>
</w:rPr>
<w:pict>
<v:shape id="文本框 13" o:spid="_x0000_s1037" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:93.6pt;margin-top:4.35pt;height:19.5pt;width:117.4pt;z-index:251717632;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="t" color2="#FFFFFF" opacity="0f" focussize="0,0"/>
<v:stroke on="f" weight="0.5pt"/>
<v:imagedata o:title=""/>
<o:lock v:ext="edit" aspectratio="f"/>
<v:textbox>
<w:txbxContent>
<w:p>
<w:pPr>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
</w:rPr>
<w:t>${(useRegistrationCode)!''}</w:t>
</w:r>
</w:p>
</w:txbxContent>
</v:textbox>
</v:shape>
</w:pict>
</w:r>
<w:r>
<w:rPr>
<w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="default"/>
<w:spacing w:val="0"/>
<w:sz w:val="26"/>
......@@ -1839,8 +1848,8 @@
<w:tbl>
<w:tblPr>
<w:tblStyle w:val="a5"/>
<w:tblW w:w="8191" w:type="dxa"/>
<w:tblInd w:w="365" w:type="dxa"/>
<w:tblW w:w="8220" w:type="dxa"/>
<w:tblInd w:w="364" w:type="dxa"/>
<w:tblBorders>
<w:top w:val="single" w:sz="6" wx:bdrwidth="15" w:space="0" w:color="000000"/>
<w:left w:val="single" w:sz="6" wx:bdrwidth="15" w:space="0" w:color="000000"/>
......@@ -1858,7 +1867,7 @@
</w:tblCellMar>
</w:tblPr>
<w:tblGrid>
<w:gridCol w:w="8191"/>
<w:gridCol w:w="8220"/>
</w:tblGrid>
<w:tr>
<w:tblPrEx>
......@@ -1882,7 +1891,7 @@
</w:trPr>
<w:tc>
<w:tcPr>
<w:tcW w:w="8191" w:type="dxa"/>
<w:tcW w:w="8220" w:type="dxa"/>
<w:tcBorders>
<w:top w:val="nil"/>
<w:left w:val="nil"/>
......@@ -1901,7 +1910,7 @@
<w:tblPr>
<w:tblStyle w:val="a5"/>
<w:tblW w:w="6812" w:type="dxa"/>
<w:tblInd w:w="141" w:type="dxa"/>
<w:tblInd w:w="149" w:type="dxa"/>
<w:tblBorders>
<w:top w:val="nil"/>
<w:left w:val="nil"/>
......@@ -1960,7 +1969,7 @@
<w:r>
<w:pict>
<w:binData w:name="wordml://1.png">${(qrCode)!""}</w:binData>
<v:shape id="图片 17" o:spid="_x0000_s1038" o:spt="75" alt="" type="#_x0000_t75" style="position:absolute;left:0pt;margin-left:344.15pt;margin-top:1.15pt;height:51pt;width:50.9pt;z-index:251662336;mso-width-relative:page;mso-height-relative:page;" filled="f" o:preferrelative="f" stroked="f" coordsize="21600,21600">
<v:shape id="图片 17" o:spid="_x0000_s1038" o:spt="75" alt="" type="#_x0000_t75" style="position:absolute;left:0pt;margin-left:344.15pt;margin-top:1.15pt;height:51pt;width:50.9pt;z-index:251660288;mso-width-relative:page;mso-height-relative:page;" filled="f" o:preferrelative="f" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="f" focussize="0,0"/>
<v:stroke on="f"/>
......@@ -2041,7 +2050,7 @@
</w:p>
</w:ftr>
<w:pgSz w:w="11905" w:h="16840"/>
<w:pgMar w:top="1502" w:right="1219" w:bottom="1321" w:left="1701" w:header="1228" w:footer="1134" w:gutter="0"/>
<w:pgMar w:top="1134" w:right="1219" w:bottom="1321" w:left="1814" w:header="1228" w:footer="1134" w:gutter="0"/>
<w:paperSrc w:first="0" w:other="0"/>
<w:cols w:space="0"/>
<w:docGrid/>
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzIndividualityDto.java 0 → 100644
View file @ ad02e054
package com.yeejoin.amos.boot.module.tcm.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* @author system_generator
* @date 2023-08-31
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "TzIndividualityDto", description = "")
public class TzIndividualityDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "证件类型")
private String credentialsType;
@ApiModelProperty(value = "证件号码")
private String credentialsNum;
@ApiModelProperty(value = "真实姓名")
private String name;
@ApiModelProperty(value = "联系电话")
private String phone;
@ApiModelProperty(value = "有效期开始")
private Date expirationDateStart;
@ApiModelProperty(value = "有效期结束")
private Date expirationDateEnd;
@ApiModelProperty(value = "有效期类型")
private String expirationDateType;
@ApiModelProperty(value = "住址")
private String address;
@ApiModelProperty(value = "tz_base_enterprise_info关联id")
private Long enterpriseId;
@ApiModelProperty(value = "管辖机构")
private String governingBody;
@ApiModelProperty(value = "证件照片")
private String identificationPhoto;
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzsBaseIndividuality.java
View file @ ad02e054
......@@ -70,4 +70,9 @@ public class TzsBaseIndividuality extends BaseEntity {
@TableField("enterprise_id")
private Long enterpriseId;
/**
* 证件照片
*/
@TableField("identification_photo")
private String identificationPhoto;
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/TzsBaseIndividualityMapper.java
View file @ ad02e054
package com.yeejoin.amos.boot.module.tcm.api.mapper;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzIndividualityDto;
import com.yeejoin.amos.boot.module.tcm.api.entity.TzsBaseIndividuality;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......@@ -11,4 +12,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface TzsBaseIndividualityMapper extends BaseMapper<TzsBaseIndividuality> {
TzIndividualityDto getIndividualityInfo(Long sequenceNbr);
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/ITzsUserInfoService.java
View file @ ad02e054
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tcm.api.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.module.tcm.api.dto.GroupAndPersonInfoDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzIndividualityDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzsEquipListDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo;
......@@ -51,4 +52,8 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> {
void testGroup(String groupSeq);
void deleteGroupAndPersonRelation(String postName, String amosUserId);
TzIndividualityDto getIndividualityInfo();
TzIndividualityDto updateIndividualityInfo(TzIndividualityDto individualityDto);
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsBaseIndividualityMapper.xml
View file @ ad02e054
......@@ -2,4 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.tcm.api.mapper.TzsBaseIndividualityMapper">
<select id="getIndividualityInfo" resultType="com.yeejoin.amos.boot.module.tcm.api.dto.TzIndividualityDto">
select *, real_name as name from tz_base_individuality where enterprise_id = #{enterpriseId}
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzsUserInfoController.java
View file @ ad02e054
......@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.tcm.api.dto.GroupAndPersonInfoDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzIndividualityDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzsEquipListDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo;
......@@ -369,5 +370,17 @@ public class TzsUserInfoController extends BaseController {
return ResponseHelper.buildResponse(tzsUserInfoServiceImpl.screenData(result, data, id.toString()));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/individuality")
@ApiOperation(httpMethod = "GET", value = "获取人主体信息", notes = "获取人主体信息")
public ResponseModel<TzIndividualityDto> getIndividualityInfo() {
return ResponseHelper.buildResponse(tzsUserInfoServiceImpl.getIndividualityInfo());
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/individuality")
@ApiOperation(httpMethod = "POST", value = "修改个人主体信息", notes = "修改个人主体信息")
public ResponseModel<TzIndividualityDto> updateIndividualityInfo(@RequestBody TzIndividualityDto individualityDto) {
return ResponseHelper.buildResponse(tzsUserInfoServiceImpl.updateIndividualityInfo(individualityDto));
}
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java
View file @ ad02e054
......@@ -4,6 +4,7 @@ package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
......@@ -16,6 +17,7 @@ import com.yeejoin.amos.boot.module.tcm.api.dto.EquEnterDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzsBaseInstitutionDto;
import com.yeejoin.amos.boot.module.tcm.api.entity.*;
import com.yeejoin.amos.boot.module.tcm.api.enums.EnterpriseEnums;
import com.yeejoin.amos.boot.module.tcm.api.enums.UnitTypeEnum;
import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseEnterpriseInfoMapper;
import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper;
......@@ -25,6 +27,7 @@ import com.yeejoin.amos.boot.module.tcm.flc.api.dto.RegUnitIcDto;
import com.yeejoin.amos.boot.module.tcm.flc.api.dto.RegUnitInfoDto;
import com.yeejoin.amos.boot.module.tcm.flc.api.entity.RegUnitIc;
import com.yeejoin.amos.boot.module.tcm.flc.api.entity.RegUnitInfo;
import com.yeejoin.amos.boot.module.tcm.flc.api.enums.UnitDataSourceEnum;
import com.yeejoin.amos.boot.module.tcm.flc.api.feign.AccessFeignService;
import com.yeejoin.amos.boot.module.tcm.flc.api.mapper.RegUnitInfoMapper;
import com.yeejoin.amos.boot.module.tcm.flc.biz.service.impl.RegUnitIcServiceImpl;
......@@ -33,9 +36,11 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import org.apache.commons.compress.utils.Lists;
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.util.ObjectUtils;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
......@@ -185,7 +190,7 @@ public class TzBaseEnterpriseInfoServiceImpl
private TzBaseEnterpriseInfoDto getDetail(TzBaseEnterpriseInfo tzBaseEnterpriseInfo){
TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = detail(tzBaseEnterpriseInfo.getSequenceNbr());
RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
RegUnitIcDto regUnitIcDto = tzBaseEnterpriseInfoDto.getRegUnitIcDto();
String creditCode = tzBaseEnterpriseInfoDto.getUseCode();
if (tzBaseEnterpriseInfo.getRegisterType().contains(UnitTypeEnum.grzt.getName())) {
// 个人主体时截取证件号码（eg. 6600_210423195703287959 证件类型_证件号码）
......@@ -193,8 +198,10 @@ public class TzBaseEnterpriseInfoServiceImpl
creditCode = creditCode.split("_")[1];
}
}
Map<String, Object> resultMap = accessFeignService.getData(creditCode).getResult();
if (!ValidationUtil.isEmpty(resultMap)) {
// 陕西省内企业从工商平台查询工商信息
if (UnitDataSourceEnum.SHAANXI.getName().equals(tzBaseEnterpriseInfo.getDataSources())
&& EnterpriseEnums.QY_DW.getTypeName().equals(tzBaseEnterpriseInfo.getRegisterType())) {
Map<String, Object> resultMap = accessFeignService.getData(creditCode).getResult();
String area = String.valueOf(resultMap.get("area"));
String city = area.substring(0, area.indexOf("市") + 1);
String district = area.substring(city.length());
......@@ -241,9 +248,16 @@ public class TzBaseEnterpriseInfoServiceImpl
objects.add(district);
regUnitIcDto.setRegisterAddressList(objects);
regUnitIcDto.setIsNotAccess("1");
// 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑
tzBaseEnterpriseInfoDto.setCanEdit("0");
} else {
regUnitIcDto = tzBaseEnterpriseInfoDto.getRegUnitIcDto();
regUnitIcDto.setIsNotAccess("0");
List<String> addressList = Lists.newArrayList();
addressList.add(tzBaseEnterpriseInfo.getProvince());
addressList.add(tzBaseEnterpriseInfo.getCity());
addressList.add(tzBaseEnterpriseInfo.getDistrict());
regUnitIcDto.setRegisterAddressList(addressList);
// 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑
tzBaseEnterpriseInfoDto.setCanEdit("1");
}
......@@ -442,10 +456,12 @@ public class TzBaseEnterpriseInfoServiceImpl
return "ok";
}
@Transactional
@Override
public TzBaseEnterpriseInfoDto companyInfoUpdate(Map<String, Object> map) {
TzBaseEnterpriseInfo tzBaseEnterpriseInfo = new TzBaseEnterpriseInfo();
tzBaseEnterpriseInfo.setSequenceNbr(Long.valueOf(map.get("sequenceNbr").toString()));
tzBaseEnterpriseInfo = tzBaseEnterpriseInfoService.getById(tzBaseEnterpriseInfo.getSequenceNbr());
//修改基本信息
tzBaseEnterpriseInfo.setEquipCategory(JSON.toJSONString(map.get("equipCategory")));
Map<String, String> map1 = (Map<String, String>) map.get("longitudeLatitude");
......@@ -459,7 +475,7 @@ public class TzBaseEnterpriseInfoServiceImpl
tzBaseEnterpriseInfo.setSuperviseOrgCode(ObjectUtils.isEmpty(map.get("superviseOrgCode")) ? null : String.valueOf(map.get("superviseOrgCode")));
tzBaseEnterpriseInfo.setSuperviseOrgName(ObjectUtils.isEmpty(map.get("superviseOrgName")) ? null : String.valueOf(map.get("superviseOrgName")));
tzBaseEnterpriseInfo.setOtherAccessories(ObjectUtils.isEmpty(map.get("otherAccessories")) ? null : JSON.toJSONString(map.get("otherAccessories")));
tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : JSON.toJSONString(map.get("legalPerson")));
tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : (String)map.get("legalPerson"));
// 修改事业单位信息
TzsBaseInstitutionDto baseInstitutionDto = JSON.toJavaObject(JSON.parseObject(JSON.toJSONString(map.get("regUnitMessage"))), TzsBaseInstitutionDto.class);
......@@ -467,7 +483,7 @@ public class TzBaseEnterpriseInfoServiceImpl
TzsBaseInstitution baseInstitution = new TzsBaseInstitution();
BeanUtils.copyProperties(baseInstitutionDto, baseInstitution);
// 用"单位信息"更新以下字段
tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map.get("address")) ? null : JSON.toJSONString(map.get("address")));
tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map.get("address")) ? null : (String)map.get("address"));
tzBaseEnterpriseInfo.setProvince(baseInstitutionDto.getUnitAddress().get(0));
tzBaseEnterpriseInfo.setCity(baseInstitutionDto.getUnitAddress().get(1));
tzBaseEnterpriseInfo.setDistrict(baseInstitutionDto.getUnitAddress().get(2));
......@@ -475,33 +491,92 @@ public class TzBaseEnterpriseInfoServiceImpl
tzsBaseInstitutionService.saveOrUpdate(baseInstitution);
}
// 修改tz_flc_reg_unit_info表信息
RegUnitInfo regUnitInfo;
LambdaQueryWrapper<RegUnitInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(RegUnitInfo::getUnitCode, tzBaseEnterpriseInfo.getUseCode());
regUnitInfo = regUnitInfoService.getOne(queryWrapper);
if (ValidationUtil.isEmpty(regUnitInfo)) {
regUnitInfo = new RegUnitInfo();
}
regUnitInfo.setName(tzBaseEnterpriseInfo.getUseUnit());
regUnitInfo.setUnitCode(tzBaseEnterpriseInfo.getUseCode());
regUnitInfo.setManagementUnit(tzBaseEnterpriseInfo.getGoverningBody());
// regUnitInfo.setManagementUnitId(tzBaseEnterpriseInfo.getGoverningBody());
regUnitInfo.setProvince(tzBaseEnterpriseInfo.getProvince());
regUnitInfo.setCity(tzBaseEnterpriseInfo.getCity());
regUnitInfo.setDistrict(tzBaseEnterpriseInfo.getDistrict());
regUnitInfo.setAddress(tzBaseEnterpriseInfo.getAddress());
regUnitInfo.setLegalPerson(tzBaseEnterpriseInfo.getLegalPerson());
regUnitInfo.setContactPerson(tzBaseEnterpriseInfo.getUseContact());
regUnitInfoService.saveOrUpdate(regUnitInfo);
//修改工商信息
// RegUnitIc regUnitIc = new RegUnitIc();
// List<String> addressList = (List<String>) map.get("registerAddressList");
// tzBaseEnterpriseInfo.setProvince(addressList.get(0));
// tzBaseEnterpriseInfo.setCity(addressList.get(1));
// tzBaseEnterpriseInfo.setDistrict(addressList.get(3));
// tzBaseEnterpriseInfo.setCommunity(ObjectUtils.isEmpty(map.get("community")) ? null : String.valueOf(map.get("community")));
// tzBaseEnterpriseInfo.setStreet(ObjectUtils.isEmpty(map.get("stree")) ? null : String.valueOf(map.get("stree")));
// tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : String.valueOf(map.get("legalPerson")));
// regUnitIc.setIndustryName(ObjectUtils.isEmpty(map.get("industryName")) ? null : String.valueOf(map.get("industryName")));
// regUnitIc.setRegisteredOrgan(ObjectUtils.isEmpty(map.get("registeredOrgan")) ? null : String.valueOf(map.get("registeredOrgan")));
// Date approvedDate = new Date();
// try {
// approvedDate = DateUtils.dateParse(String.valueOf(map.get("approvedDate")), "yyyy-MM-dd");
// } catch (ParseException e) {
// throw new RuntimeException(e);
// }
// regUnitIc.setBusinessState(ObjectUtils.isEmpty(map.get("businessState")) ? null : String.valueOf(map.get("businessState")));
// regUnitIc.setApprovedDate(ObjectUtils.isEmpty(map.get("approvedDate")) ? null : approvedDate);
// RegUnitIcDto regUnitIcDto = JSON.parseObject(JSON.toJSONString(map.get("regUnitIcDto")), new TypeReference<RegUnitIcDto>() {
// });
//// regUnitIcService.update(regUnitIc, new QueryWrapper<RegUnitIc>().eq("unit_code", regUnitIcDto.getUnitCode()));
//
//
// //修改许可信息
// List<BaseUnitLicence> licences = (List<BaseUnitLicence>) map.get("unitLicences");
// baseUnitLicenceService.saveOrUpdateBatch(licences);
RegUnitIc regUnitIc = new RegUnitIc();
RegUnitIcDto regUnitIcDto = JSON.parseObject(JSON.toJSONString(map.get("regUnitIcDto")), new TypeReference<RegUnitIcDto>() {
});
if (!ValidationUtil.isEmpty(regUnitIcDto.getSequenceNbr())) {
List<String> addressList = (List<String>) map.get("registerAddressList");
tzBaseEnterpriseInfo.setProvince(addressList.get(0));
tzBaseEnterpriseInfo.setCity(addressList.get(1));
tzBaseEnterpriseInfo.setDistrict(addressList.get(2));
tzBaseEnterpriseInfo.setCommunity(ObjectUtils.isEmpty(map.get("community")) ? null : String.valueOf(map.get("community")));
tzBaseEnterpriseInfo.setStreet(ObjectUtils.isEmpty(map.get("street")) ? null : String.valueOf(map.get("street")));
tzBaseEnterpriseInfo.setAddress(ObjectUtils.isEmpty(map.get("regAddress")) ? null : String.valueOf(map.get("regAddress")));
tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : String.valueOf(map.get("legalPerson")));
regUnitIc.setIndustryName(ObjectUtils.isEmpty(map.get("industryName")) ? null : String.valueOf(map.get("industryName")));
DataDictionary regOrganCodeDict = iDataDictionaryService.getByCode(String.valueOf(map.get("registeredOrganCode")),"DJJG");
regUnitIc.setRegisteredOrgan(ObjectUtils.isEmpty(regOrganCodeDict) ? null : String.valueOf(regOrganCodeDict.getName()));
regUnitIc.setRegisteredOrganCode(ObjectUtils.isEmpty(map.get("registeredOrganCode")) ? null : String.valueOf(map.get("registeredOrganCode")));
Date approvedDate;
try {
approvedDate = DateUtils.dateParse(String.valueOf(map.get("approvedDate")), "yyyy-MM-dd");
} catch (ParseException e) {
throw new RuntimeException(e);
}
regUnitIc.setBusinessStateCode(ObjectUtils.isEmpty(map.get("businessState")) ? null : String.valueOf(map.get("businessState")));
DataDictionary businessStateDict = iDataDictionaryService.getByCode(String.valueOf(map.get("businessState")),"jyzt");
regUnitIc.setBusinessState(ObjectUtils.isEmpty(businessStateDict) ? null : businessStateDict.getName());
regUnitIc.setApprovedDate(ObjectUtils.isEmpty(map.get("approvedDate")) ? null : approvedDate);
regUnitIcService.update(regUnitIc, new QueryWrapper<RegUnitIc>().eq("unit_code", regUnitIcDto.getUnitCode()));
}
//修改许可信息
// 1、先删除原有许可信息
List<BaseUnitLicenceDto> baseUnitLicenceDtos = baseUnitLicenceService.queryForBaseUnitLicenceList(tzBaseEnterpriseInfo.getUseCode());
if (!ValidationUtil.isEmpty(baseUnitLicenceDtos)) {
List<Long> seqs = Lists.newArrayList();
baseUnitLicenceDtos.forEach(b -> {
seqs.add(b.getSequenceNbr());
});
baseUnitLicenceService.deleteBatchSeq(seqs);
}
// 2、再保存新许可信息
List<BaseUnitLicence> licences = Lists.newArrayList();
JSON.parseArray(JSON.toJSONString(map.get("unitLicences"))).forEach(obj -> {
BaseUnitLicence baseUnitLicence = JSON.toJavaObject((JSONObject )obj, BaseUnitLicence.class);
baseUnitLicence.setUnitCode(ObjectUtils.isEmpty(map.get("useCode")) ? null : (String)map.get("useCode"));
baseUnitLicence.setUnitName(ObjectUtils.isEmpty(map.get("useUnit")) ? null : (String)map.get("useUnit"));
// 处理许可字典值对应名称
List<DataDictionary> dictionaries = regUnitInfoService.initAllDataDictionaryList();
baseUnitLicence.setCertType(dictionaries.stream().filter(d -> d.getType().equals("UNIT_TYPE_NEW") && d.getCode().equals(baseUnitLicence.getCertTypeCode())).findFirst().get().getName());
baseUnitLicence.setItemCodeName(dictionaries.stream().filter(d -> !ValidationUtil.isEmpty(d.getExtend()) && d.getExtend().startsWith("XK-") && d.getCode().equals(baseUnitLicence.getItemCode())).findFirst().get().getName());
baseUnitLicence.setSubItemName(dictionaries.stream().filter(d -> !ValidationUtil.isEmpty(d.getExtend()) && d.getExtend().startsWith("XK-") && d.getCode().equals(baseUnitLicence.getSubItemCode())).findFirst().get().getName());
if (ValidationUtil.isEmpty(baseUnitLicence.getParameterCode())) {
baseUnitLicence.setParameter(null);
} else {
baseUnitLicence.setParameter(dictionaries.stream().filter(d -> !ValidationUtil.isEmpty(d.getExtend()) && d.getExtend().startsWith("XK-") && d.getCode().equals(baseUnitLicence.getParameterCode())).findFirst().get().getName());
}
baseUnitLicence.setApprovedOrgan(dictionaries.stream().filter(d -> d.getType().equals("DJJG") && baseUnitLicence.getApprovedOrganCode().equals(d.getCode())).findFirst().get().getName());
baseUnitLicence.setApplyType(dictionaries.stream().filter(d -> d.getType().equals("xkfszt") && baseUnitLicence.getApplyTypeCode().equals(d.getCode())).findFirst().get().getName());
baseUnitLicence.setAppraisalType(dictionaries.stream().filter(d -> d.getType().equals("xkpsfs") && baseUnitLicence.getAppraisalTypeCode().equals(d.getCode())).findFirst().get().getName());
licences.add(baseUnitLicence);
});
baseUnitLicenceService.saveBatch(licences);
// 企业信息变更-同步修改企业下人员绑定设备类型
ArrayList<String> newData = new ArrayList<>();
JSONArray objects = JSON.parseArray(tzBaseEnterpriseInfo.getEquipCategory());
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java
View file @ ad02e054
......@@ -5,19 +5,19 @@ import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.DataDictionary;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.tcm.api.dto.GroupAndPersonInfoDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzsEquipListDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.*;
import com.yeejoin.amos.boot.module.tcm.api.entity.*;
import com.yeejoin.amos.boot.module.tcm.api.enums.EquipmentClassifityEnum;
import com.yeejoin.amos.boot.module.tcm.api.enums.PersonManageRoleEnum;
import com.yeejoin.amos.boot.module.tcm.api.enums.TwoStipulateGroupEnum;
import com.yeejoin.amos.boot.module.tcm.api.enums.UnitTypeEnum;
import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsBaseIndividualityMapper;
import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserEquipMapper;
import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper;
import com.yeejoin.amos.boot.module.tcm.api.service.ITzsUserInfoService;
......@@ -38,6 +38,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext;
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;
......@@ -66,6 +67,12 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
@Autowired
TzBaseEnterpriseInfoServiceImpl baseEnterpriseInfoService;
@Autowired
TzsBaseIndividualityServiceImpl individualityService;
@Autowired
TzsBaseIndividualityMapper individualityMapper;
//企业人员角色
private final String USER_ROLE = "QYRYJS";
//企业人员用户组
......@@ -189,7 +196,6 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
}
}
@Override
public Map<String, Object> getDetail(Long id) {
Map<String, Object> maps = new HashMap<>();
......@@ -586,4 +592,44 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
return result;
}
@Override
public TzIndividualityDto getIndividualityInfo() {
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
AgencyUserModel userModel = reginParams.getUserModel();
CompanyBo companyBo = reginParams.getCompany();
TzIndividualityDto individuality = new TzIndividualityDto();
TzBaseEnterpriseInfoDto baseEnterpriseInfoDto = baseEnterpriseInfoService.getInfoByUseCode(companyBo.getCompanyCode());
if (!ValidationUtil.isEmpty(baseEnterpriseInfoDto)) {
individuality = individualityMapper.getIndividualityInfo(baseEnterpriseInfoDto.getSequenceNbr());
individuality.setPhone(userModel.getMobile());
individuality.setGoverningBody(baseEnterpriseInfoDto.getGoverningBody());
individuality.setAddress(baseEnterpriseInfoDto.getAddress());
}
return individuality;
}
@Transactional
@Override
public TzIndividualityDto updateIndividualityInfo(TzIndividualityDto individualityDto) {
TzsBaseIndividuality individuality = new TzsBaseIndividuality();
TzBaseEnterpriseInfo baseEnterpriseInfo = baseEnterpriseInfoService.getById(individualityDto.getEnterpriseId());
if (!ValidationUtil.isEmpty(baseEnterpriseInfo)) {
BeanUtils.copyProperties(individualityDto, individuality);
// 更新tz_base_individuality信息
individuality.setRealName(individualityDto.getName());
individualityService.saveOrUpdate(individuality);
// 更新tz_base_enterprise_info信息
baseEnterpriseInfo.setAddress(individualityDto.getAddress());
baseEnterpriseInfoService.updateById(baseEnterpriseInfo);
// 更新privilege_agency_user手机号
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
AgencyUserModel userModel = reginParams.getUserModel();
if (!userModel.getMobile().equals(individualityDto.getPhone())) {
userModel.setMobile(individualityDto.getPhone());
Privilege.agencyUserClient.modifyMobile(userModel, userModel.getUserId());
}
}
return individualityDto;
}
}
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 @ ad02e054
......@@ -55,7 +55,6 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
......@@ -1032,7 +1031,6 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
* @param object
* @throws InterruptedException
*/
@Async
void updateAmosTask(String taskId, JSONObject object) throws InterruptedException {
Thread.sleep(1000*2);
FeignClientResult<JSONObject> jsonObjectFeignClientResult = idxFeignService.updateAmosTask(taskId, object);
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/EquipTechParamVessel.java
View file @ ad02e054
......@@ -291,19 +291,19 @@ public class EquipTechParamVessel extends AbstractEquipBaseEntity {
* */
@TableField(value ="\"PRESSURE_HOUSING_PATH\"")
private BigDecimal pressureHousingPath;
private String pressureHousingPath;
/**
* * 设计压力（管程）
* */
@TableField(value ="\"PRESSURE_PIPE\"")
private BigDecimal pressurePipe;
private String pressurePipe;
/**
* * 设计压力（夹套）
* */
@TableField(value ="\"PRESSURE_JACKET\"")
private BigDecimal pressureJacket;
private String pressureJacket;
/**
* * 设计温度（壳程）
* */
......@@ -327,19 +327,19 @@ public class EquipTechParamVessel extends AbstractEquipBaseEntity {
* */
@TableField(value ="\"MAX_PRESSURE_SHELL\"")
private BigDecimal maxPressureShell;
private String maxPressureShell;
/**
* * 最高允许工作压力（管程）
* */
@TableField(value ="\"MAX_PRESSURE_PIPE\"")
private BigDecimal maxPressurePipe;
private String maxPressurePipe;
/**
* * 最高允许工作压力（夹套）
* */
@TableField(value ="\"MAX_PRESSURE_JACKET\"")
private BigDecimal maxPressureJacket;
private String maxPressureJacket;
/**
* * 介质（壳程）
* */
......@@ -441,7 +441,7 @@ public class EquipTechParamVessel extends AbstractEquipBaseEntity {
* */
@TableField(value ="\"DESIGN_PRESSURE\"")
private BigDecimal designPressure;
private String designPressure;
/**
* * 设计温度
* */
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgRegisterInfo.java
View file @ ad02e054
......@@ -65,8 +65,16 @@ public class IdxBizJgRegisterInfo extends TzsBaseEntity {
@TableField("\"REGISTER_STATE\"")
private String registerState;
/**
*
* 设备代码类型手工输入（1）、系统自动生成（2）
*/
@TableField("\"EQU_CODE_TYPE\"")
private String equCodeType;
/**
* 设备代码
*/
@TableField("\"EQU_CODE\"")
private String equCode;
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/RegistrationInfo.java
View file @ ad02e054
......@@ -64,6 +64,13 @@ public class RegistrationInfo extends AbstractEquipBaseEntity {
@TableField(value ="\"REGISTER_STATE\"")
private String registerState;
/**
* 设备代码类型手工输入（1）、系统自动生成（2）
*/
@TableField("\"EQU_CODE_TYPE\"")
private String equCodeType;
/**
* * 设备代码
* */
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/TzBaseEnterpriseInfo.java
View file @ ad02e054
......@@ -187,4 +187,7 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
@ApiModelProperty(value = "企业标签信息")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String regulatoryLabels;
@ApiModelProperty(value = "注册类型")
private String registerType;
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/EquCodeTypeEnum.java 0 → 100644
View file @ ad02e054
package com.yeejoin.amos.boot.module.ymt.api.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @author Administrator
* 设备code 类型枚举
*/
@AllArgsConstructor
@Getter
public enum EquCodeTypeEnum {
/**
* 设备code类型
*/
INPUT("手工输入", "1"),
SYSTEM_GENERATED("系统生成", "2");
private String name;
private String code;
}
amos-boot-system-tzs/pom.xml
View file @ ad02e054
......@@ -47,8 +47,6 @@
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-feign-workflow</artifactId>
<version>1.10.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
......@@ -77,6 +75,14 @@
<artifactId>redisson</artifactId>
<version>2.7.0</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-feign-systemctl</artifactId>
</dependency>
</dependencies>
<dependencyManagement>
......@@ -91,11 +97,6 @@
<artifactId>shedlock-provider-redis-spring</artifactId>
<version>4.44.0</version>
</dependency>
<dependency>
<artifactId>amos-component-rule</artifactId>
<groupId>com.yeejoin</groupId>
<version>${amos.version.tzs}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
pom.xml
View file @ ad02e054
......@@ -34,10 +34,6 @@
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
......@@ -48,25 +44,6 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.netflix.hystrix</groupId>
<artifactId>hystrix-javanica</artifactId>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>jsr305</artifactId>
<groupId>com.google.code.findbugs</groupId>
</exclusion>
<exclusion>
<artifactId>annotations</artifactId>
<groupId>com.google.code.findbugs</groupId>
</exclusion>
<exclusion>
<artifactId>aspectjrt</artifactId>
<groupId>org.aspectj</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
......@@ -147,7 +124,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
......@@ -180,15 +156,6 @@
<artifactId>commons-jexl</artifactId>
<version>2.1.1</version>
</dependency>
<!-- MQTT???? -->
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-stream</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-mqtt</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
......@@ -208,13 +175,14 @@
</dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-feign-systemctl</artifactId>
<version>${amos.version}</version>
</dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-feign-privilege</artifactId>
<version>${amos.version}</version>
<exclusions>
<exclusion>
<artifactId>swagger-annotations</artifactId>
<groupId>io.swagger</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<dependencyManagement>
......@@ -235,11 +203,6 @@
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-component-rule</artifactId>
<version>1.7.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>
<version>3.2.0</version>
......@@ -285,6 +248,31 @@
<artifactId>log4j-api</artifactId>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-feign-systemctl</artifactId>
<version>${amos.version}</version>
</dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-feign-workflow</artifactId>
<version>1.10.5</version>
</dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-feign-rule</artifactId>
<version>${amos.version}</version>
</dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-component-rule</artifactId>
<version>${amos.version}</version>
</dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-component-security</artifactId>
<version>${amos.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<repositories>
......
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