Skip to content

A
amos-boot-biz
Commit 22e3f4f7 authored by tianyiming's avatar tianyiming
Browse files
Options

监管发起相关修改

parent 7c9ffaf7
Hide whitespace changes
Inline Side-by-side
Showing with 208 additions and 27 deletions
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 @ 22e3f4f7
package com.yeejoin.amos.boot.module.jg.biz.controller;
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.JgInstallationNoticeDto;
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.ymt.api.entity.EquipmentCategory;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
......@@ -10,10 +13,7 @@ import io.swagger.annotations.ApiOperation;
import javafx.scene.chart.ValueAxis;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
......@@ -181,5 +181,24 @@ public class CommonController extends BaseController {
}
@Autowired
private IJgInstallationNoticeService iJgInstallationNoticeService;
/**
* 业务发起公共接口
* /jg/jg-installation-notice/save
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/saveOrSubmit")
@ApiOperation(httpMethod = "POST", value = "业务发起公共接口", notes = "业务发起公共接口")
public ResponseModel<Object> save(@RequestParam(value = "submitType", required = false) String submitType,
@RequestBody Map<String, Object> map) {
ReginParams reginParams = getSelectedOrgInfo();
commonService.invokeBusinessProcess(submitType, map, reginParams);
return ResponseHelper.buildResponse("");
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java
View file @ 22e3f4f7
package com.yeejoin.amos.boot.module.jg.biz.service;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
......@@ -42,4 +43,6 @@ public interface ICommonService {
List<LinkedHashMap> creatApproveTree();
List<Map<String, Object>> superviseBusinessCategory(String type);
void invokeBusinessProcess(String submitType, Map<String, Object> obj, ReginParams reginParams);
}
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 @ 22e3f4f7
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.aspose.words.SaveFormat;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
......@@ -8,7 +9,13 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.jg.api.dto.ByteArrayMultipartFile;
import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintainNoticeService;
import com.yeejoin.amos.boot.module.jg.api.service.IJgTransferNoticeService;
import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
import com.yeejoin.amos.boot.module.jg.biz.utils.FileExporter;
import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
......@@ -16,7 +23,7 @@ import com.yeejoin.amos.boot.module.jg.biz.utils.JsonUtils;
import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
import com.yeejoin.amos.boot.module.jg.flc.api.fegin.PrivilegeFeginService;
import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.systemctl.Systemctl;
......@@ -33,6 +40,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import javax.servlet.http.HttpServletResponse;
import java.awt.print.Book;
import java.io.File;
import java.io.FileInputStream;
import java.nio.file.Files;
......@@ -229,11 +237,11 @@ public class CommonServiceImpl implements ICommonService {
case "SBYJ":
mapList = resourceJson.get("SBYJ");
break;
case "TYQY":
mapList = resourceJson.get("TYQY");
case "QTBF":
mapList = resourceJson.get("QTBF");
break;
case "ZXBF":
mapList = resourceJson.get("ZXBF");
case "XZSB":
mapList = resourceJson.get("XZSB");
break;
}
return mapList;
......@@ -447,4 +455,149 @@ public class CommonServiceImpl implements ICommonService {
}
return urlString;
}
// 业务通用发起——基本信息
private static final String basic = "basic";
// 业务通用发起——添加设备
private static final String devices = "devices";
// 业务通用发起——告知单详情
private static final String notice = "notice";
// 业务通用发起——安装告知表单id
private static final String AZGZ_FORM_ID = "1734141426742095873";
private static final String YZBG_PAGE_ID = "changeRegistrationTransfer";
private static final String GZGZ_PAGE_ID = "reformNoticeAdd";
@Autowired
private IJgInstallationNoticeService iJgInstallationNoticeService;
@Autowired
JgMaintenanceContractServiceImpl jgMaintenanceContractServiceImpl;
@Autowired
JgUseRegistrationServiceImpl jgUseRegistrationServiceImpl;
@Autowired
JgEquipTransferServiceImpl jgEquipTransferServiceImpl;
@Autowired
JgReformNoticeServiceImpl jgReformNoticeService;
@Autowired
private IJgMaintainNoticeService iJgMaintainNoticeService;
@Autowired
private IJgTransferNoticeService jgTransferNoticeService;
@Autowired
JgChangeRegistrationReformServiceImpl jgChangeRegistrationReformServiceImpl;
@Autowired
IJgChangeRegistrationTransferService jgChangeRegistrationTransferService;
@Autowired
JgChangeRegistrationUnitServiceImpl jgChangeRegistrationUnitServiceImpl;
@Autowired
JgChangeRegistrationNameServiceImpl jgChangeRegistrationNameService;
@Autowired
JgEnableDisableServiceImpl jgEnableDisableServiceImpl;
@Autowired
JgScrapCancelServiceImpl jgScrapCancelService;
private static final String WXGZ_PAGE_ID = "maintainInfo";
private static final String YZGZ_PAGE_ID = "transferNoticeAdd";
private static final String DWBG_PAGE_ID = "changeRegisInfo";
private static final String SBZX_PAGE_ID = "jgScrapCancelAdd";
private static final String GMBG_PAGE_ID = "jgRegistrationInfo";
@Override
public void invokeBusinessProcess(String submitType, Map<String, Object> map, ReginParams reginParams) {
Map<String, Object> basicObj = (Map<String, Object>) map.get(basic);
Map<String, Object> noticeObj = (Map<String, Object>) map.get(notice);
Map<String, Object> provideMap = new HashMap<>();
String type = (String) basicObj.get("type");
if (type.equals(ApplicationFormTypeEnum.AZGZ.getBusinessCode())) {
JgInstallationNoticeDto jgInstallationNoticeDto = JSON.parseObject(JSON.toJSONString(noticeObj), JgInstallationNoticeDto.class);
jgInstallationNoticeDto.setReceiveOrgCreditCode(!ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
JSONObject jsonObject1 = (JSONObject)JSONObject.toJSON(jgInstallationNoticeDto);
provideMap.put(AZGZ_FORM_ID, jsonObject1);
JSONObject jsonObject = new JSONObject(provideMap);
iJgInstallationNoticeService.saveNotice(submitType, jsonObject, reginParams);
} else if (type.equals(ApplicationFormTypeEnum.GZGZ.getBusinessCode())) {
noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
provideMap.put(GZGZ_PAGE_ID, noticeObj);
JSONObject jsonObject = new JSONObject(provideMap);
jgReformNoticeService.saveNotice(submitType, jsonObject, reginParams);
} else if (type.equals(ApplicationFormTypeEnum.WXGZ.getBusinessCode())) {
noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
provideMap.put(WXGZ_PAGE_ID, noticeObj);
JSONObject jsonObject = new JSONObject(provideMap);
// iJgMaintainNoticeService.saveNotice(submitType, jsonObject, reginParams);
} else if (type.equals(ApplicationFormTypeEnum.YZGZ.getBusinessCode())) {
noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
provideMap.put(YZGZ_PAGE_ID, noticeObj);
JSONObject jsonObject = new JSONObject(provideMap);
// jgTransferNoticeService.saveNotice(submitType, jsonObject, reginParams);
} else if (type.equals(ApplicationFormTypeEnum.SYDJ.getBusinessCode())) {
noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
JSONObject jsonObject = new JSONObject(noticeObj);
jgUseRegistrationServiceImpl.save(jsonObject);
} else if (type.equals(ApplicationFormTypeEnum.GZBG.getBusinessCode())) {
noticeObj.put("receiveCompanyCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
JSONObject jsonObject = new JSONObject(noticeObj);
jgChangeRegistrationReformServiceImpl.save(jsonObject);
} else if (type.equals(ApplicationFormTypeEnum.YZBG.getBusinessCode())) {
noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
provideMap.put(YZBG_PAGE_ID, noticeObj);
JSONObject jsonObject = new JSONObject(provideMap);
jgChangeRegistrationTransferService.createTransfer(submitType, jsonObject, reginParams);
} else if (type.equals(ApplicationFormTypeEnum.DWBG.getBusinessCode())) {
noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
provideMap.put(DWBG_PAGE_ID, noticeObj);
JSONObject jsonObject = new JSONObject(provideMap);
jgChangeRegistrationUnitServiceImpl.saveNotice(submitType, jsonObject, reginParams);
} else if (type.equals(ApplicationFormTypeEnum.WBBA.getBusinessCode())) {
noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
JSONObject jsonObject = new JSONObject(noticeObj);
jgMaintenanceContractServiceImpl.saveOrSubmit(submitType, jsonObject, reginParams);
} else if (type.equals(ApplicationFormTypeEnum.SBYJ.getBusinessCode())) {
JgEquipTransferDto jgEquipTransferDto = JSON.parseObject(JSON.toJSONString(noticeObj), JgEquipTransferDto.class);
JSONObject jsonObject = (JSONObject)JSONObject.toJSON(jgEquipTransferDto);
jgEquipTransferServiceImpl.saveTransfer(submitType, jsonObject, reginParams);
} else if (type.equals(ApplicationFormTypeEnum.SBZX.getBusinessCode())) {
noticeObj.put("receiveOrgCreditCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
provideMap.put(SBZX_PAGE_ID, noticeObj);
JSONObject jsonObject = new JSONObject(provideMap);
jgScrapCancelService.save(submitType, jsonObject);
} else if (type.equals(ApplicationFormTypeEnum.GMBG.getBusinessCode())) {
noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
provideMap.put(GMBG_PAGE_ID, noticeObj);
JSONObject jsonObject = new JSONObject(provideMap);
jgChangeRegistrationNameService.save2(submitType, jsonObject);
} else if (type.equals(ApplicationFormTypeEnum.TYQY.getBusinessCode())) {
noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
JSONObject jsonObject = new JSONObject(noticeObj);
jgEnableDisableServiceImpl.saveOrUpdate(jsonObject);
}
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/superviseBusinessCategory.json
View file @ 22e3f4f7
......@@ -2,7 +2,7 @@
"SGGZ": [
{
"name": "安装告知",
"code": "GZ-AZ"
"code": "GZ_AZ"
},
{
"name": "改造告知",
......@@ -28,7 +28,7 @@
},
{
"name": "移装变更登记",
"code": "DJ_BG"
"code": "DJ_YZ"
},
{
"name": "单位变更登记",
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java
View file @ 22e3f4f7
......@@ -14,25 +14,30 @@ public enum ApplicationFormTypeEnum {
/**
* 申请单枚举
*/
AZGZ("AZGZ"),//安装告知
WBBA("WBBA"),//维保备案
SYDJ("SYDJ"),//使用登记
SBYJ("SBYJ"),//设备移交
GZGZ("GZGZ"),//改造告知
WXGZ("WXGZ"),//维修告知
YZGZ("YZGZ"),//移装告知
GZBG("GZBG"),//改造变更登记
YZBG("YZBG"),//移装变更登记
DWBG("DWBG"),//单位变更登记
JY("JY"),
JG("JG"),// 检验结果
SBZX("SBZX"),//电梯（设备）注销
GMBG("GMBG"),//更名变更
TYQY("TYQY")//停用启用
AZGZ("AZGZ","GZ_AZ"),//安装告知
WBBA("WBBA","WB_BA"),//维保备案
SYDJ("SYDJ","DJ_SY"),//使用登记
SBYJ("SBYJ","SB_YJ"),//设备移交
GZGZ("GZGZ","GZ_GZ"),//改造告知
WXGZ("WXGZ","GZ_WX"),//维修告知
YZGZ("YZGZ","GZ_YZ"),//移装告知
GZBG("GZBG","DJ_GZ"),//改造变更登记
YZBG("YZBG","DJ_YZ"),//移装变更登记
DWBG("DWBG","DJ_DW"),//单位变更登记
JY("JY",""),
JG("JG",""),// 检验结果
SBZX("SBZX","BF_YZ"),//电梯（设备）注销
GMBG("GMBG","DJ_GM"),//更名变更
TYQY("TYQY","SB_QY")//停用启用
;
/**
* 编号
*/
private final String code;
/**
* 业务编号
*/
private final String businessCode;
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/EquipmentCategoryServiceImpl.java
View file @ 22e3f4f7
......@@ -393,7 +393,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
if (ValidationUtil.isEmpty(type)) {
mapList = resourceJson.get(EquipmentClassifityEnum.BDLS.getCode());
} else {
if ("ZXBF".equals(type) || "TYQY".equals(type)) {
if ("QTBF".equals(type)) {
type = "superviseBusiness";
} else {
type = EquipmentClassifityEnum.BDLS.getCode();
......
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