Skip to content

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

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

parents a7bd2987 e0d3a30b
Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 161 deletions
amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/service/impl/TzsAppService.java
View file @ fd2ffced
......@@ -15,50 +15,8 @@ import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.app.api.common.CommonException;
import com.yeejoin.amos.boot.module.app.api.common.MobileLoginParam;
import com.yeejoin.amos.boot.module.app.api.dto.ConstructionInfoModel;
import com.yeejoin.amos.boot.module.app.api.dto.CylinderEquBaseInfoForWXModel;
import com.yeejoin.amos.boot.module.app.api.dto.DesignInfoModel;
import com.yeejoin.amos.boot.module.app.api.dto.ElevatorBaseInfoForWXModel;
import com.yeejoin.amos.boot.module.app.api.dto.EquBaseInfoForWXModel;
import com.yeejoin.amos.boot.module.app.api.dto.EquipTechParamBoilerModel;
import com.yeejoin.amos.boot.module.app.api.dto.EquipTechParamElevatorModel;
import com.yeejoin.amos.boot.module.app.api.dto.EquipTechParamLiftingModel;
import com.yeejoin.amos.boot.module.app.api.dto.EquipTechParamPipelineModel;
import com.yeejoin.amos.boot.module.app.api.dto.EquipTechParamRidesModel;
import com.yeejoin.amos.boot.module.app.api.dto.EquipTechParamRopewayModel;
import com.yeejoin.amos.boot.module.app.api.dto.EquipTechParamVehicleModel;
import com.yeejoin.amos.boot.module.app.api.dto.EquipTechParamVesselModel;
import com.yeejoin.amos.boot.module.app.api.dto.InspectionDetectionInfoModel;
import com.yeejoin.amos.boot.module.app.api.dto.InspectionDetectionInfoModelForWX;
import com.yeejoin.amos.boot.module.app.api.dto.MainPartsModel;
import com.yeejoin.amos.boot.module.app.api.dto.MaintenanceInfoModel;
import com.yeejoin.amos.boot.module.app.api.dto.MaintenanceInfoModelForWX;
import com.yeejoin.amos.boot.module.app.api.dto.OtherEquBaseInfoForWXModel;
import com.yeejoin.amos.boot.module.app.api.dto.OtherInfoModel;
import com.yeejoin.amos.boot.module.app.api.dto.ProduceInfoModel;
import com.yeejoin.amos.boot.module.app.api.dto.ProtectionDevicesModel;
import com.yeejoin.amos.boot.module.app.api.dto.RegistrationInfoModel;
import com.yeejoin.amos.boot.module.app.api.dto.UseInfoModel;
import com.yeejoin.amos.boot.module.app.api.entity.CategoryOtherInfo;
import com.yeejoin.amos.boot.module.app.api.entity.ConstructionInfo;
import com.yeejoin.amos.boot.module.app.api.entity.DesignInfo;
import com.yeejoin.amos.boot.module.app.api.entity.EquipTechParamBoiler;
import com.yeejoin.amos.boot.module.app.api.entity.EquipTechParamElevator;
import com.yeejoin.amos.boot.module.app.api.entity.EquipTechParamLifting;
import com.yeejoin.amos.boot.module.app.api.entity.EquipTechParamPipeline;
import com.yeejoin.amos.boot.module.app.api.entity.EquipTechParamRides;
import com.yeejoin.amos.boot.module.app.api.entity.EquipTechParamRopeway;
import com.yeejoin.amos.boot.module.app.api.entity.EquipTechParamVehicle;
import com.yeejoin.amos.boot.module.app.api.entity.EquipTechParamVessel;
import com.yeejoin.amos.boot.module.app.api.entity.EquipmentCategory;
import com.yeejoin.amos.boot.module.app.api.entity.InspectionDetectionInfo;
import com.yeejoin.amos.boot.module.app.api.entity.MainParts;
import com.yeejoin.amos.boot.module.app.api.entity.MaintenanceInfo;
import com.yeejoin.amos.boot.module.app.api.entity.OtherInfo;
import com.yeejoin.amos.boot.module.app.api.entity.ProduceInfo;
import com.yeejoin.amos.boot.module.app.api.entity.ProtectionDevices;
import com.yeejoin.amos.boot.module.app.api.entity.RegistrationInfo;
import com.yeejoin.amos.boot.module.app.api.entity.UseInfo;
import com.yeejoin.amos.boot.module.app.api.dto.*;
import com.yeejoin.amos.boot.module.app.api.entity.*;
import com.yeejoin.amos.boot.module.app.api.enums.EquipmentCategoryEnum;
import com.yeejoin.amos.boot.module.app.api.enums.EquipmentClassifityEnum;
import com.yeejoin.amos.boot.module.app.api.mapper.CategoryOtherInfoMapper;
......@@ -69,10 +27,8 @@ import com.yeejoin.amos.boot.module.app.biz.utils.JsonUtils;
import com.yeejoin.amos.boot.module.app.biz.utils.RedisUtil;
import com.yeejoin.amos.boot.module.app.flc.api.feign.IdxFeignService;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.component.feign.utils.FeignUtil;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.RegionModel;
......@@ -125,7 +81,8 @@ public class TzsAppService {
/**
* 产品appkey
*/
private static final String appKey = "AMOS_STUDIO";
@Value("${amos.biz.appCode:AMOS_STUDIO}")
private String appKey;
/**
* 产品product
*/
......
amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/resources/application-dev.properties
View file @ fd2ffced
#DB properties:
spring.datasource.url=jdbc:vastbase://36.46.137.116:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
spring.datasource.url=jdbc:vastbase://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
spring.datasource.username=admin
spring.datasource.password=Yeejoin@2023
eureka.client.service-url.defaultZone=http://172.16.10.210:10001/eureka/
eureka.client.service-url.defaultZone=http://172.16.10.243:10001/eureka/
eureka.instance.prefer-ip-address=true
management.endpoint.health.show-details=always
management.endpoints.web.exposure.include=*
eureka.instance.health-check-url=http://172.16.3.32:${server.port}${server.servlet.context-path}/actuator/health
eureka.instance.health-check-url=http://172.16.3.89:${server.port}${server.servlet.context-path}/actuator/health
eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
eureka.instance.status-page-url=http://172.16.3.32:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://172.16.3.32:${server.port}${server.servlet.context-path}/doc.html
eureka.instance.ip-address=172.16.3.32
eureka.instance.status-page-url=http://172.16.3.89:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://172.16.3.89:${server.port}${server.servlet.context-path}/doc.html
eureka.instance.ip-address=172.16.3.89
## ES properties:
elasticsearch.username=elastic
elasticsearch.password=a123456
spring.elasticsearch.rest.uris=http://172.16.10.210:9200
spring.elasticsearch.rest.uris=http://172.16.10.243:9200
## unit(h)
alertcall.es.synchrony.time=48
#redis properties:
spring.redis.database=1
spring.redis.host=172.16.10.210
spring.redis.port=16379
spring.redis.host=172.16.10.243
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
......@@ -69,22 +69,25 @@ tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
tzs.wechat.test.userId=3413513
##new properties
org.filter.group.seq=1564150103147573249
fileserver.domain=http://172.16.10.210:19000/
fileserver.domain=http://172.16.10.243:19000/
log.level=INFO
duty.seats.role.ids=1585956200472674305,1585956257590706177
## ???? properties:
rule.definition.load=false
##rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto
rule.definition.default-agency=tzs
rule.definition.local-ip=172.16.10.210
rule.definition.local-ip=172.16.10.243
#\u6C14\u74F6\u5145\u88C5\u4FE1\u606F\u5B9A\u65F6\u540C\u6B65\u81F3es
tzs.cylinder.fill.cron=0 0 12 * * ?
#\u6C14\u74F6\u57FA\u672C\u4FE1\u606F\u5B9A\u65F6\u540C\u6B65\u81F3es
tzs.cylinder.info.cron=0 0 1 * * ?
# ??????????
minio.url.path=http://172.16.10.210:9000/
minio.url.path=http://172.16.10.243:9000/
## ɼǰ׺
regulatory_code_prefix=https://sxtzsb.sxsei.com:19435/tzs?code=
outSystem.user.password=a1234560
amos.system.user.app-key=AMOS_STUDIO
amos.system.user.product=STUDIO_APP_WEB
\ No newline at end of file
amos.system.user.product=STUDIO_APP_WEB
##??????????appCode
amos.biz.appCode=studio_normalapp_9112044
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml
View file @ fd2ffced
......@@ -128,6 +128,7 @@
ei.use_code AS useCode,
isn.install_unit_credit_code AS installUnitCreditCode,
idi.INSPECT_REPORT as inspectReport,
ei.address as useUnitLeaderAddress,
re.equ_id as equId
FROM
tzs_jg_installation_notice isn
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgTransferNoticeMapper.xml
View file @ fd2ffced
......@@ -29,7 +29,8 @@
tjtn.next_execute_user_ids as nextExecuteUserIds,
oi.SUPERVISORY_CODE as supervisoryCode,
tjtn.next_task_id AS nextTaskId,
concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME", '', ibjui."ADDRESS") as equAddress
concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME", '', ibjui."ADDRESS") as equAddress,
ei.address as useUnitLeaderAddress
FROM
tzs_jg_transfer_notice tjtn
LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr
......@@ -37,6 +38,7 @@
LEFT JOIN tz_equipment_category ec ON ec.code = ri.equ_category
LEFT JOIN idx_biz_jg_use_info ibjui on re.equ_id = ibjui.RECORD
left join idx_biz_jg_other_info oi on oi.RECORD = re.equ_id
LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = tjtn.use_unit_credit_code
<where>
tjtn.is_delete = false
<if test="param != null ">
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @ fd2ffced
......@@ -39,6 +39,7 @@
LEFT JOIN idx_biz_jg_other_info other on re.equ_id = other.RECORD
<where>
ur.is_delete = 0
<if test="dto.equCategory != null and dto.equCategory != ''">
and jri.EQU_CATEGORY = #{dto.equCategory}
</if>
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java
View file @ fd2ffced
......@@ -5,13 +5,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.JgUseRegistrationDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.component.feign.utils.FeignUtil;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.RegionModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
......@@ -45,7 +49,7 @@ public class JgUseRegistrationController extends BaseController {
@PostMapping(value = "/flowExecute")
@ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
jgUseRegistrationServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("comment")));
jgUseRegistrationServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))), String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("comment")));
return ResponseHelper.buildResponse("ok");
}
......@@ -86,12 +90,12 @@ public class JgUseRegistrationController extends BaseController {
Page<Map<String, Object>> page = new Page<>(current, size);
ReginParams info = getSelectedOrgInfo();
dto.setCurrentUserId(info.getUserModel().getUserId());
if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)){
if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
}else {
} else {
dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
}
return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getList(dto, page, dto.getRoleIds()));
return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getList(dto, page, dto.getRoleIds()));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -141,8 +145,56 @@ public class JgUseRegistrationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/export")
@ApiOperation(httpMethod = "GET", value = "导出使用登记证", notes = "导出使用登记证")
public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr){
public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr) {
jgUseRegistrationServiceImpl.exportUseRegistrationCertificate(sequenceNbr, response);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getRegion")
@ApiOperation(httpMethod = "GET", value = "", notes = "")
public ResponseModel<Map<String, Object>> exportImageZip(@RequestParam("code") String code) {
HashMap<String, Object> map = new HashMap<>();
if (!ObjectUtils.isEmpty(code)) {
String[] data = code.split("_");
FeignClientResult<CompanyModel> result = Privilege.companyClient.queryByCompanyCode(data[0]);
if (!ObjectUtils.isEmpty(result)) {
CompanyModel result1 = result.getResult();
if (!ObjectUtils.isEmpty(result1.getRegionSeq())) {
FeignClientResult<Collection<RegionModel>> region = Systemctl.regionClient.queryForParent(Long.valueOf(result1.getRegionSeq()));
Collection<RegionModel> result2 = region.getResult();
List<RegionModel> list = new ArrayList<>(Arrays.asList(result2.toArray(new RegionModel[0])));
RegionModel region1 = list.get(0);
changeData(map, region1);
}
}
}
return ResponseHelper.buildResponse(map);
}
private HashMap<String, Object> changeData(HashMap<String, Object> map, RegionModel regionModel) {
if (!ObjectUtils.isEmpty(regionModel.getChildren())) {
Collection<RegionModel> children = regionModel.getChildren();
List<RegionModel> list = new ArrayList<>(Arrays.asList(children.toArray(new RegionModel[0])));
RegionModel region = list.get(0);
if (map.containsKey("region")) {
map.put("region", String.valueOf(map.get("region")) + region.getRegionCode() + ",");
map.put("regionAll", String.valueOf(map.get("regionAll")) + region.getRegionCode() + "_" + region.getRegionName() + ",");
} else {
map.put("regionAll", region.getRegionCode() + "_" + region.getRegionName() + ",");
map.put("region", region.getRegionCode() + ",");
}
if (!ObjectUtils.isEmpty(region.getChildren())) {
Collection<RegionModel> regionChildren = regionModel.getChildren();
List<RegionModel> regionChildrenList = new ArrayList<>(Arrays.asList(regionChildren.toArray(new RegionModel[0])));
changeData(map, regionChildrenList.get(0));
}
}
return map;
}
}
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 @ fd2ffced
......@@ -110,6 +110,9 @@ public class CommonServiceImpl implements ICommonService {
//管辖机构redis缓存key
private static final String REGULATOR_UNIT_TREE = "REGULATOR_UNIT_TREE";
//管辖机构redis缓存key
private static final String REGULATOR_UNIT_TREE_ALL = "REGULATOR_UNIT_TREE_ALL";
//行政审批局redis缓存key
private static final String ADMINISTRATION_UNIT_TREE = "ADMINISTRATION_UNIT_TREE";
......@@ -285,7 +288,7 @@ public class CommonServiceImpl implements ICommonService {
@Override
public List<LinkedHashMap> getCreatTreeByInstallation() {
List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE);
List<LinkedHashMap> result = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE_ALL);
//判断redis是否存在管辖机构树
return !ObjectUtils.isEmpty(result) ? result : getCreatTreeByInstallationTree();
}
......@@ -294,10 +297,10 @@ public class CommonServiceImpl implements ICommonService {
public List<LinkedHashMap> getCreatTreeByInstallationTree() {
FeignClientResult tree = privilegeFeginService.queryAgencyTreeForCache(RequestContext.getToken(), RequestContext.getAppKey(), RequestContext.getProduct());
List<LinkedHashMap> result = (List<LinkedHashMap>) tree.getResult();
List<LinkedHashMap> treeData = deleteTreeData(result, REGULATOR_UNIT);
List<LinkedHashMap> treeData = deleteData(result, REGULATOR_UNIT);
List<LinkedHashMap> supervisionTree = treeData.stream().filter(e -> code.equals(e.get("orgCode"))).collect(Collectors.toList());
List<LinkedHashMap> resultTree = updateNullChildren(supervisionTree);
redisUtils.set(REGULATOR_UNIT_TREE, resultTree);
redisUtils.set(REGULATOR_UNIT_TREE_ALL, resultTree);
return resultTree;
}
......@@ -366,6 +369,10 @@ public class CommonServiceImpl implements ICommonService {
if (!e.get("companyType").toString().contains(companyType)) {
it.remove();
}
// 删除监管所
if (e.get("level").toString().equals("organization")) {
it.remove();
}
if (!ObjectUtils.isEmpty(e.get("children"))) {
deleteTreeData((List<LinkedHashMap>) e.get("children"),companyType);
}
......@@ -373,6 +380,21 @@ public class CommonServiceImpl implements ICommonService {
return result;
}
private List<LinkedHashMap> deleteData(List<LinkedHashMap> result,String companyType) {
Iterator it = result.iterator();
while (it.hasNext()) {
LinkedHashMap e = (LinkedHashMap) it.next();
// 删除非行政审批局
if (!e.get("companyType").toString().contains(companyType)) {
it.remove();
}
if (!ObjectUtils.isEmpty(e.get("children"))) {
deleteData((List<LinkedHashMap>) e.get("children"),companyType);
}
}
return result;
}
@Override
public List<Map<String, Object>> getUnitListByType(String type) {
......@@ -495,6 +517,8 @@ public class CommonServiceImpl implements ICommonService {
map.put("giveOutYear", Optional.ofNullable(map.get("giveOutYear")).orElse("").toString()); // 发证日期-年
map.put("giveOutMonth", Optional.ofNullable(map.get("giveOutMonth")).orElse("").toString()); // 发证日期-月
map.put("giveOutDay", Optional.ofNullable(map.get("giveOutDay")).orElse("").toString()); // 发证日期-日
map.put("excelType", Optional.ofNullable(map.get("excelType")).orElse("使用登记").toString()); // 发证日期-日
map.put("tableName", Optional.ofNullable(map.get("tableName")).orElse("特种设备使用登记证").toString()); // 发证日期-日
// 生成二维码
String qrCode = ImageUtils.generateQRCode(Optional.ofNullable(map.get("supervisoryCode")).orElse("").toString(), 100, 100);
map.put("supervisoryCode", qrCode); // 监管二维码
......
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 @ fd2ffced
......@@ -234,9 +234,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
if (!ValidationUtil.isEmpty(equipParamsMap)) {
// 给技术参数中添加设备种类，标记技术参数属于那个设备
equipParamsMap.put("EQU_LIST",equIpClassMap.get("EQU_LIST").toString());
equipParamsMap.put("EQU_CATEGORY",equIpClassMap.get("EQU_CATEGORY").toString());
equipParamsMap.put("EQU_DEFINE",equIpClassMap.get("EQU_DEFINE").toString());
equipParamsMap.put("EQU_LIST", String.valueOf(equIpClassMap.get("EQU_LIST")));
equipParamsMap.put("EQU_CATEGORY", String.valueOf(equIpClassMap.get("EQU_CATEGORY")));
equipParamsMap.put("EQU_DEFINE", String.valueOf(equIpClassMap.get("EQU_DEFINE")));
resultMap.put(EQUIP_PARAMS_FORM_ID, equipParamsMap);
}
}
......@@ -285,6 +285,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
resultMap.putAll(equipParamsMap);
}
}
resultMap.remove("instanceId");
return resultMap;
}
......@@ -1091,6 +1092,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
String status = ConstructionEnum.getName.get(integer);
dto2.put(CONSTRUCTIONTYPE, status);
}
if (!ValidationUtil.isEmpty(dto2.get(EQUSTATE))) {
Integer integer = Integer.valueOf(dto2.get(EQUSTATE).toString());
String status = EquimentEnum.getName.get(integer);
dto2.put(EQUSTATE, status);
}
dto2.put("record",dto2.get("SEQUENCE_NBR"));
list.add(dto2);
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationReformServiceImpl.java
View file @ fd2ffced
......@@ -180,7 +180,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
jgRegistrationHistory.setSupervisoryCode(supervisoryCode);
//数据状态
jgChangeRegistrationReform.setUseRegistrationCode(jgRegistrationHistory.getUseRegistrationCode());
String equipListName = Optional.ofNullable(map.get("equListDesc").toString()).orElse(" ");
String equipListName = Optional.ofNullable(map.get("equListDesc")).orElse("无").toString();
jgChangeRegistrationReform.setEquipListName(equipListName);
jgChangeRegistrationReform.setCreateUserId(reginParams.getUserModel().getUserId());
jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName());
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationTransferServiceImpl.java
View file @ fd2ffced
......@@ -337,7 +337,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
this.flowExecute(oldTransfer.getSequenceNbr(), oldTransfer.getInstanceId(), "0", "");
} else {
// 如果是新启动的流程开启自动访问
String equipListName = Optional.ofNullable(tableData.get("equListDesc").toString()).orElse(" ");
String equipListName = Optional.ofNullable(tableData.get("equListDesc")).orElse("无").toString();
oldTransfer.setAuditStatus(WorkFlowStatusEnum.TRANSFER_RECEIVE.getPass());
oldTransfer.setStatus(WorkFlowStatusEnum.TRANSFER_RECEIVE.getPass());
oldTransfer.setEquipListName(equipListName);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationUnitServiceImpl.java
View file @ fd2ffced
......@@ -973,6 +973,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
exportParamsMap.put("factoryNum", factoryInfo.getFactoryNum());
}
//调用生成使用登记证
exportParamsMap.put("excelType","变更登记");
exportParamsMap.put("tableName","特种设备单位变更登记");
commonService.generateCertificateReport(exportParamsMap, response);
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEnableDisableServiceImpl.java
View file @ fd2ffced
......@@ -135,7 +135,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
}
dto.setVariable(commMap);
ProcessTaskDTO processTaskDTO = iCmWorkflowService.completeOrReject(jgEnableDisable.getNextTaskId(), dto, submit);
ProcessTaskDTO processTaskDTO = iCmWorkflowService.completeOrReject(jgEnableDisable.getNextTaskId(), dto, "0");
processTaskDTOS.add(processTaskDTO);
// 提取节点等信息
workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
......@@ -607,6 +607,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
}
resultMap.putAll(map);
}
resultMap.put("sequenceNbr", sequenceNbr);
return resultMap;
}
......
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 @ fd2ffced
......@@ -469,7 +469,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
placeholders.put("useUnitName", getValue.apply("useUnitName"));
placeholders.put("useUnitLeaderName", getValue.apply("safetyManager"));
placeholders.put("useUnitLeaderPhone", getValue.apply("safetyManagerPhone"));
placeholders.put("useUnitLeaderAddress", getValue.apply("address"));
placeholders.put("useUnitLeaderAddress", getValue.apply("useUnitLeaderAddress"));
placeholders.put("installLicenseNoList", installLicenseNoList);
placeholders.put("installLicenseExpirationDateList", installLicenseExpirationDateList);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgTransferNoticeServiceImpl.java
View file @ fd2ffced
......@@ -237,7 +237,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
placeholders.put("useUnitName", getValue.apply("useUnitName"));
placeholders.put("useUnitLeaderName", getValue.apply("safetyManager"));
placeholders.put("useUnitLeaderPhone", getValue.apply("safetyManagerPhone"));
placeholders.put("useUnitLeaderAddress", getValue.apply("useUnitProvinceName") + getValue.apply("useUnitCityName") + getValue.apply("useUnitCountyName") + getValue.apply("streetName") + getValue.apply("useUnitAddress"));
placeholders.put("useUnitLeaderAddress", getValue.apply("useUnitLeaderAddress"));
// 生成二维码
String qrCode = ImageUtils.generateQRCode(getValue.apply("applyNo"), 300, 300);
placeholders.put("qrCode", qrCode);
......
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 @ fd2ffced
......@@ -28,6 +28,7 @@ import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
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.EquimentEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
......@@ -115,8 +116,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
JSONObject map = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
map.remove("status");
map.remove("instanceId");
// 安全管理员
if (map.containsKey("safetyManagerName")){
if (map.containsKey("safetyManagerName")) {
map.put("safetyManager", map.get("safetyManagerName"));
}
IdxBizJgUseInfo useInfo = new IdxBizJgUseInfo();
......@@ -155,6 +157,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
useInfo.setEstateUnitCreditCode(data[0]);
useInfo.setEstateUnitName(data[1]);
}
// 修改设备使用状态为在用
useInfo.setEquState(String.valueOf(EquimentEnum.ZAIYONG.getCode()));
// 更新使用信息
useInfoMapper.update(useInfo, lambda);
InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();
......@@ -173,7 +177,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
public void updateHistory(JSONObject map, String equipId, String currentDocumentId, String supervisoryCode) {
JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
// lambda.eq(JgRegistrationHistory::getEquId, equipId);
// lambda.eq(JgRegistrationHistory::getEquId, equipId);
lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
lambda.eq(JgRegistrationHistory::getRegistrationClass, "使用登记");
Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
......@@ -602,6 +606,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
detail.put("designStandard", JSON.parse(String.valueOf(detail.get("designStandard"))));
detail.put("designDoc", JSON.parse(String.valueOf(detail.get("designDoc"))));
detail.put("longitudeLatitude", JSON.parse(String.valueOf(detail.get("longitudeLatitude"))));
detail.put("province", "610000");
return detail;
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/equipment-registration-certificate-report.ftl
View file @ fd2ffced
......@@ -485,7 +485,7 @@
<w:sz w:val="46"/>
<w:sz-cs w:val="46"/>
</w:rPr>
<w:t>按照《中华人民共和国特种设备安全法》的规定， 依据特种设备安全技术规范要求，予以使用登记。</w:t>
<w:t>按照《中华人民共和国特种设备安全法》的规定， 依据特种设备安全技术规范要求，予以${(excelType)!''}。</w:t>
</w:r>
<w:r>
<w:rPr>
......@@ -611,7 +611,7 @@
<w:sz w:val="58"/>
<w:sz-cs w:val="58"/>
</w:rPr>
<w:t>特种设备使用登记证</w:t>
<w:t>${(tableName)!''}</w:t>
</w:r>
</w:p>
</w:txbxContent>
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/installation-notification-report.ftl
View file @ fd2ffced
......@@ -578,7 +578,7 @@
<w:sz w:val="24"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
<w:t>设备代码</w:t>
<w:t>设备注册代码</w:t>
</w:r>
</w:p>
</w:tc>
......@@ -2934,83 +2934,6 @@
</w:tc>
</w:tr>
</w:tbl>
<w:p>
<w:pPr>
<w:spacing w:line="360" w:lineRule="auto"/>
<w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="黑体" w:hAnsi="黑体" w:eastAsia="黑体" w:cs="黑体"/>
<w:sz w:val="24"/>
<w:szCs w:val="24"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="黑体" w:hAnsi="黑体" w:eastAsia="黑体" w:cs="黑体"/>
<w:sz w:val="24"/>
<w:szCs w:val="24"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
<w:t>注：1、告知单按每台设备填写。</w:t>
</w:r>
</w:p>
<w:p>
<w:pPr>
<w:spacing w:line="240" w:lineRule="auto"/>
<w:ind w:firstLine="480" w:firstLineChars="200"/>
<w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="黑体" w:hAnsi="黑体" w:eastAsia="黑体" w:cs="黑体"/>
<w:sz w:val="24"/>
<w:szCs w:val="24"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="黑体" w:hAnsi="黑体" w:eastAsia="黑体" w:cs="黑体"/>
<w:sz w:val="24"/>
<w:szCs w:val="24"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
<w:t>2、施工单位应提供特种设备许可证书复印件（加盖单位公章）。</w:t>
</w:r>
</w:p>
<w:p>
<w:pPr>
<w:keepNext w:val="0"/>
<w:keepLines w:val="0"/>
<w:pageBreakBefore w:val="0"/>
<w:widowControl w:val="0"/>
<w:numPr>
<w:ilvl w:val="0"/>
<w:numId w:val="0"/>
</w:numPr>
<w:kinsoku/>
<w:wordWrap/>
<w:overflowPunct/>
<w:topLinePunct w:val="0"/>
<w:autoSpaceDE/>
<w:autoSpaceDN/>
<w:bidi w:val="0"/>
<w:adjustRightInd/>
<w:snapToGrid/>
<w:spacing w:line="300" w:lineRule="auto"/>
<w:textAlignment w:val="auto"/>
<w:rPr>
<w:sz w:val="28"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="等线" w:hAnsi="等线" w:eastAsia="等线" w:cs="等线"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
<w:t>&#10;
按照市委政府关于“四改两拆”三年攻坚行动实施方案要求，市域范围内的建筑物和建设项目，须符合城乡建设规划要求和《土地管理法》之要求并须取得合法手续，按要求，特种设备不允许装于不符合相关法规的建筑物之内。据此要求。&#10;
&#10;
</w:t>
</w:r>
</w:p>
<w:sectPr>
<w:pgSz w:w="11906" w:h="16838"/>
<w:pgMar w:top="1440" w:right="1800" w:bottom="1440" w:left="1800" w:header="851" w:footer="992"
......
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