Skip to content

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

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

parents d821beed a7a0c2d5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 315 additions and 135 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgTransferNoticeDto.java
View file @ c3ec77b8
......@@ -166,6 +166,9 @@ public class JgTransferNoticeDto extends BaseDto {
@ApiModelProperty(value = "委托书附件")
private List<Map<String, Object>> powerOfAttorneyList;
@ApiModelProperty(value = "其他附件")
private List<Map<String, Object>> otherAccessoriesList;
@ApiModelProperty(value = "施工合同附件")
private List<Map<String, Object>> constructionContractList;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/BusinessTypeEnum.java
View file @ c3ec77b8
......@@ -44,7 +44,7 @@ public enum BusinessTypeEnum {
JY_INSPECTION_APPLICATION_DS("116", "定（首）检验"),
JY_INSPECTION_APPLICATION_CHECK("117", "检验（含安全阀效验）"),
JY_INSPECTION_APPLICATION_CHECK("117", "电梯检测"),
JG_VEHICLE_GAS_APPLICATION("118", "车用气瓶登记");
private final String code;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgMaintainNoticeService.java
View file @ c3ec77b8
......@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
......@@ -64,7 +66,7 @@ public interface IJgMaintainNoticeService extends IService<JgMaintainNotice> {
* @param sequenceNbr 主键
* @return pdf文件路径
*/
String generateMaintainNoticeReport(Long sequenceNbr);
void generateMaintainNoticeReport(Long sequenceNbr,HttpServletResponse response);
boolean deleteBySequenceNbr(Long[] sequenceNbr);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgReformNoticeService.java
View file @ c3ec77b8
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
......@@ -65,5 +66,5 @@ public interface IJgReformNoticeService extends IService<JgReformNotice> {
* @param sequenceNbr 主键
* @return pdf文件路径
*/
String generateInstallationNoticeReport(Long sequenceNbr);
void generateInstallationNoticeReport(Long sequenceNbr,HttpServletResponse response);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgTransferNoticeService.java
View file @ c3ec77b8
......@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
import jdk.nashorn.api.scripting.JSObject;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
......@@ -29,6 +30,6 @@ public interface IJgTransferNoticeService extends IService<JgTransferNotice> {
List<JgTransferNotice> saveNotice(String submitType, Map<String, Object> model, ReginParams reginParams);
String generateTransferNoticeReport(Long sequenceNbr);
void generateTransferNoticeReport(Long sequenceNbr, HttpServletResponse response);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgMaintainNoticeController.java
View file @ c3ec77b8
......@@ -19,6 +19,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletResponse;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
......@@ -140,7 +141,7 @@ public class JgMaintainNoticeController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "维修告知列表全部数据查询", notes = "维修告知列表全部数据查询")
@GetMapping(value = "/generate-report")
public ResponseModel<String> generateReport(@RequestParam("sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(iJgMaintainNoticeService.generateMaintainNoticeReport(sequenceNbr));
public void generateReport(HttpServletResponse response, @RequestParam("sequenceNbr") Long sequenceNbr) {
iJgMaintainNoticeService.generateMaintainNoticeReport(sequenceNbr,response);
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgReformNoticeController.java
View file @ c3ec77b8
......@@ -18,6 +18,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
import java.util.Objects;
......@@ -140,7 +141,7 @@ public class JgReformNoticeController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "改造告知列表全部数据查询", notes = "改造告知列表全部数据查询")
@GetMapping(value = "/generate-report")
public ResponseModel<String> generateReport(@RequestParam("sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(jgReformNoticeService.generateInstallationNoticeReport(sequenceNbr));
public void generateReport(HttpServletResponse response, @RequestParam("sequenceNbr") Long sequenceNbr) {
jgReformNoticeService.generateInstallationNoticeReport(sequenceNbr,response);
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgTransferNoticeController.java
View file @ c3ec77b8
......@@ -167,8 +167,8 @@ public class JgTransferNoticeController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "移装告知列表全部数据查询", notes = "移装造告知列表全部数据查询")
@GetMapping(value = "/generate-report")
public ResponseModel<String> selectForList(@RequestParam("sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(jgTransferNoticeService.generateTransferNoticeReport(sequenceNbr));
public void selectForList(HttpServletResponse response,@RequestParam("sequenceNbr") Long sequenceNbr) {
jgTransferNoticeService.generateTransferNoticeReport(sequenceNbr,response);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
......
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/JgMaintainNoticeServiceImpl.java
View file @ c3ec77b8
......@@ -53,6 +53,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.util.*;
import java.util.concurrent.TimeUnit;
......@@ -365,7 +366,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
* @return pdf文件路径
*/
@Override
public String generateMaintainNoticeReport(Long sequenceNbr) {
public void generateMaintainNoticeReport(Long sequenceNbr, HttpServletResponse response) {
if (Objects.isNull(sequenceNbr)) {
throw new IllegalArgumentException("参数不能为空");
}
......@@ -377,11 +378,11 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
Map<String, Object> placeholders = jgInstallationNoticeService.fullFillTemplateObj(informationList, BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName().substring(0,2));
String tempFileName = "维修告知单_" + System.currentTimeMillis() + "_temp";
String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders);
// 更新到数据库
JgMaintainNotice.setNoticeReportUrl(url);
this.updateById(JgMaintainNotice);
return url;
// String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders);
// // 更新到数据库
// JgMaintainNotice.setNoticeReportUrl(url);
// this.updateById(JgMaintainNotice);
WordTemplateUtils.templateToPdfDownload(tempFileName, "installation-notification-report.ftl", placeholders, response);
}
@Override
......@@ -805,7 +806,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
jgMaintainNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
jgMaintainNotice.setNextTaskId(workflowResultDto.getNextTaskId());
jgMaintainNoticeMapper.updateById(jgMaintainNotice);
this.generateMaintainNoticeReport(jgMaintainNotice.getSequenceNbr());
} else {
jgMaintainNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
if (!ObjectUtils.isEmpty(jgMaintainNotice.getInstanceStatus())) {
......
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/JgReformNoticeServiceImpl.java
View file @ c3ec77b8
......@@ -51,6 +51,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.util.*;
import java.util.concurrent.TimeUnit;
......@@ -321,7 +322,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
* @return pdf文件路径
*/
@Override
public String generateInstallationNoticeReport(Long sequenceNbr) {
public void generateInstallationNoticeReport(Long sequenceNbr, HttpServletResponse response) {
if (Objects.isNull(sequenceNbr)) {
throw new IllegalArgumentException("参数不能为空");
}
......@@ -334,13 +335,13 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
Map<String, Object> placeholders = jgInstallationNoticeService.fullFillTemplateObj(informationList, BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName().substring(0, 2));
String tempFileName = "改造告知单_" + System.currentTimeMillis() + "_temp";
String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders);
// String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders);
//
// // 更新到数据库
// JgReformNotice.setNoticeReportUrl(url);
// this.updateById(JgReformNotice);
// 更新到数据库
JgReformNotice.setNoticeReportUrl(url);
this.updateById(JgReformNotice);
return url;
WordTemplateUtils.templateToPdfDownload(tempFileName, "installation-notification-report.ftl", placeholders, response);
}
......@@ -754,7 +755,6 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
jgReformNotice.setPromoter("");
this.updateLastTodo(jgReformNotice, FlowStatusEnum.TO_BE_FINISHED);
this.updateById(jgReformNotice);
this.generateInstallationNoticeReport(jgReformNotice.getSequenceNbr());
} else {
jgReformNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
if (!ObjectUtils.isEmpty(jgReformNotice.getInstanceStatus())) {
......
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 @ c3ec77b8
......@@ -50,6 +50,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.util.*;
import java.util.concurrent.TimeUnit;
......@@ -209,7 +210,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
* @return pdf文件路径
*/
@Override
public String generateTransferNoticeReport(Long sequenceNbr) {
public void generateTransferNoticeReport(Long sequenceNbr, HttpServletResponse response) {
if (Objects.isNull(sequenceNbr)) {
throw new IllegalArgumentException("参数不能为空");
}
......@@ -223,13 +224,13 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
Map<String, Object> placeholders = jgInstallationNoticeService.fullFillTemplateObj(informationList, BusinessTypeEnum.JG_ADVICE_REMOVAL.getName().substring(0, 2));
String tempFileName = "移装告知单_" + System.currentTimeMillis() + "_temp";
String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders);
// String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders);
//
// // 更新到数据库
// jgTransferNotice.setNoticeReportUrl(url);
// this.updateById(jgTransferNotice);
// 更新到数据库
jgTransferNotice.setNoticeReportUrl(url);
this.updateById(jgTransferNotice);
return url;
WordTemplateUtils.templateToPdfDownload(tempFileName, "installation-notification-report.ftl", placeholders, response);
}
......@@ -573,8 +574,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
if (!ValidationUtil.isEmpty(model.getPowerOfAttorneyList())) {
model.setPowerOfAttorney(JSON.toJSONString(model.getPowerOfAttorneyList()));
}
if (!ValidationUtil.isEmpty(model.getOtherAccessories())) {
model.setOtherAccessories(JSON.toJSONString(model.getOtherAccessories()));
if (!ValidationUtil.isEmpty(model.getOtherAccessoriesList())) {
model.setOtherAccessories(JSON.toJSONString(model.getOtherAccessoriesList()));
}
// 分割省市区字段
String province = model.getProvince();
......@@ -784,7 +785,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
jgTransferNoticeMapper.updateById(jgTransferNotice);
this.generateTransferNoticeReport(jgTransferNotice.getSequenceNbr());
} else {
jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/BizTypeEnum.java
View file @ c3ec77b8
......@@ -20,8 +20,8 @@ import java.util.List;
public enum BizTypeEnum {
SUPERVISE("supervise", "监督检验","115"),
FIRST_INSPECTION("firstinspect", "定检","116"),
DETECTION("detection", "检测","117"),
FIRST_INSPECTION("firstinspect", "定(首)检","116"),
DETECTION("detection", "电梯检测","117"),
BUSINESS_OPEN("businessOpen", "检验检测业务开通","114");
private String code;
......@@ -46,6 +46,15 @@ public enum BizTypeEnum {
return null;
}
public static BizTypeEnum getInstance(String code) {
for (BizTypeEnum c : BizTypeEnum.values()) {
if (c.getCode().equals(code)){
return c;
}
}
return null;
}
public static String getNumByCode(String code) {
for (BizTypeEnum c : BizTypeEnum.values()) {
if (c.getCode().equals(code)){
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/BusinessTypeEnum.java
View file @ c3ec77b8
......@@ -44,7 +44,7 @@ public enum BusinessTypeEnum {
JY_INSPECTION_APPLICATION_DS("116", "定（首）检验"),
JY_INSPECTION_APPLICATION_CHECK("117", "检验（含安全阀效验）");
JY_INSPECTION_APPLICATION_CHECK("117", "电梯检测");
private final String code;
private final String name;
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcBaseMapper.java
View file @ c3ec77b8
......@@ -30,4 +30,11 @@ public interface JyjcBaseMapper {
void updateBusinessData(String tableName, String assignee, String transferToUserIds, String instanceId, String nextTaskId,String key);
List<TzsUserInfoDto> selectParentOrgUsers(@Param("parentOrgCodeList") Set<String> parentOrgCodeList);
/**
* 按照公司编码查询公司下的人
* @param companyCodes
* @return List<TzsUserInfoDto>
*/
List<TzsUserInfoDto> selectUserByCompanyCodes(@Param("companyCodes") List<String> companyCodes);
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcBaseMapper.xml
View file @ c3ec77b8
......@@ -52,6 +52,22 @@
</foreach>
GROUP BY c.org_code
</select>
<select id="selectUserByCompanyCodes" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto">
SELECT
group_concat(u.user_id) as amos_user_id,
c.company_code as unitCode
FROM
"privilege_user_org_role" u,
"privilege_company" c
WHERE
u.company_seq = c.sequence_nbr
and
c.company_code in
<foreach collection="companyCodes" item="companyCode" open="(" close=")" separator=",">
#{companyCode}
</foreach>
GROUP BY c.company_code
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/pom.xml
View file @ c3ec77b8
......@@ -30,6 +30,10 @@
<groupId>net.javacrumbs.shedlock</groupId>
<artifactId>shedlock-spring</artifactId>
</dependency>
<dependency>
<groupId>net.javacrumbs.shedlock</groupId>
<artifactId>shedlock-provider-redis-spring</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/ShedLockConfig.java 0 → 100644
View file @ c3ec77b8
package com.yeejoin.amos.boot.module.jyjc.biz.config;
import net.javacrumbs.shedlock.core.LockProvider;
import net.javacrumbs.shedlock.provider.redis.spring.RedisLockProvider;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.RedisConnectionFactory;
/**
* @author Administrator
*/
@Configuration
public class ShedLockConfig {
@Bean
public LockProvider lockProvider(RedisConnectionFactory connectionFactory) {
return new RedisLockProvider(connectionFactory);
}
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java
View file @ c3ec77b8
package com.yeejoin.amos.boot.module.jyjc.biz.controller;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
......@@ -225,7 +224,7 @@ public class JyjcInspectionApplicationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "接收", notes = "接收")
@PostMapping(value = "/flow/{type}/receive")
public ResponseModel<HashMap<String, String>> execueFlow(@PathVariable(value = "type") String type, @RequestBody Map<String, Object> params) {
public ResponseModel executeFlow(@PathVariable(value = "type") String type, @RequestBody Map<String, Object> params) {
params.put("type", type);
try {
jyjcInspectionApplicationServiceImpl.doReceive(params);
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/listener/InspectionApplicationPushEventListener.java
View file @ c3ec77b8
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jyjc.biz.event.listener;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Sequence;
......@@ -16,6 +17,7 @@ import com.yeejoin.amos.boot.module.jyjc.biz.event.InspectionApplicationPushEven
import com.yeejoin.amos.boot.module.jyjc.biz.kafka.KafkaProducer;
import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationEquipServiceImpl;
import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationPushLogServiceImpl;
import com.yeejoin.amos.boot.module.jyjc.biz.util.JyjcConstant;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
......@@ -204,35 +206,55 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
private Map<String, Object> populateEquipInfoWithTechParams(String equList, String record) {
EquipCategoryEnum productType = EquipCategoryEnum.of(Integer.parseInt(equList));
Map<String, Object> echParamMap = new HashMap<>();
switch (Objects.requireNonNull(productType)) {
// 锅炉 - 监管未调整
case IDX_BIZ_JG_TECH_PARAMS_BOILER:
return BeanUtil.beanToMap(equipTechParamBoilerMapper.queryTechParamInUse(record));
// 压力容器 - 监管未调整
// 锅炉-已确认
echParamMap = BeanUtil.beanToMap(equipTechParamBoilerMapper.queryTechParamInUse(record));
break;
case IDX_BIZ_JG_TECH_PARAMS_VESSEL:
return BeanUtil.beanToMap(equipTechParamVesselMapper.queryTechParamInUse(record));
// 电梯
// 压力容器-待核对
echParamMap = BeanUtil.beanToMap(equipTechParamVesselMapper.queryTechParamInUse(record));
break;
case IDX_BIZ_JG_TECH_PARAMS_ELEVATOR:
return BeanUtil.beanToMap(equipTechParamElevatorMapper.queryTechParamInUse(record));
// 起重机械
// 电梯-已确认
echParamMap = BeanUtil.beanToMap(equipTechParamElevatorMapper.queryTechParamInUse(record));
break;
case IDX_BIZ_JG_TECH_PARAMS_LIFTING:
return BeanUtil.beanToMap(equipTechParamLiftingMapper.queryTechParamInUse(record));
// 场（厂）内专用机动车辆
// 起重机械-已确认
echParamMap = BeanUtil.beanToMap(equipTechParamLiftingMapper.queryTechParamInUse(record));
break;
case IDX_BIZ_JG_TECH_PARAMS_VEHICLE:
return BeanUtil.beanToMap(equipTechParamVehicleMapper.queryTechParamInUse(record));
// 大型游乐设施
// 场（厂）内专用机动车辆-已确认
echParamMap = BeanUtil.beanToMap(equipTechParamVehicleMapper.queryTechParamInUse(record));
break;
case IDX_BIZ_JG_TECH_PARAMS_RIDES:
return BeanUtil.beanToMap(equipTechParamRidesMapper.queryTechParamInUse(record));
// 压力管道 - 监管未调整
// 大型游乐设施-已确认
echParamMap = BeanUtil.beanToMap(equipTechParamRidesMapper.queryTechParamInUse(record));
break;
case IDX_BIZ_JG_TECH_PARAMS_PIPELINE:
return BeanUtil.beanToMap(equipTechParamPipelineMapper.queryTechParamInUse(record));
// 客运索道
// 压力管道-已确认
echParamMap = BeanUtil.beanToMap(equipTechParamPipelineMapper.queryTechParamInUse(record));
break;
case IDX_BIZ_JG_TECH_PARAMS_ROPEWAY:
return BeanUtil.beanToMap(equipTechParamRopewayMapper.queryTechParamInUse(record));
// 客运索道-已确认
echParamMap = BeanUtil.beanToMap(equipTechParamRopewayMapper.queryTechParamInUse(record));
break;
default:
break;
}
return null;
this.castStr2JsonField(echParamMap);
return echParamMap;
}
private void castStr2JsonField(Map<String, Object> echParamMap) {
if(echParamMap != null){
echParamMap.forEach((k, v) -> {
if (JyjcConstant.TECH_PARAM_JSON_FIELDS.contains(k) && v != null) {
echParamMap.put(k, JSON.parse(v.toString()));
}
});
}
}
private String getAddressByRecord(String equipUnicode) {
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/job/InspectionExpireRemindJob.java
View file @ c3ec77b8
......@@ -2,13 +2,10 @@ package com.yeejoin.amos.boot.module.jyjc.biz.job;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
import com.yeejoin.amos.boot.module.jyjc.api.model.NeedTipEquipInfo;
import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.UseInfoModel;
import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper;
......@@ -20,7 +17,6 @@ import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.util.*;
......@@ -96,12 +92,14 @@ public class InspectionExpireRemindJob {
// 使用单位
List<String> allUnitCodes = needTipEquipList.stream().map(NeedTipEquipInfo::getUseUnitCreditCode).distinct().collect(Collectors.toList());
// 查询使用单位下的人-数据库-批量查询
List<TzsUserInfo> useUnitUserList = this.getUseUnitUserList(allUnitCodes);
List<TzsUserInfoDto> useUnitUserList = this.getUseUnitUserList(allUnitCodes);
// 查询管辖单位下的人-数据库-批量查询
List<TzsUserInfoDto> superviseUnitUserList = this.getSuperviseUnitUserList(needTipEquipList);
// 以设备为维度，把 需要发送消息的人进行合并
needTipEquipList.forEach(e -> {
e.setReceiveUsers(useUnitUserList.stream().filter(u -> e.getUseUnitCreditCode().equals(u.getUnitCode())).map(TzsUserInfo::getAmosUserId).collect(Collectors.toSet()));
// 本使用单位下的人
e.setReceiveUsers(useUnitUserList.stream().filter(u -> e.getUseUnitCreditCode().equals(u.getUnitCode())).map(TzsUserInfoDto::getAmosUserId).collect(Collectors.toSet()));
// 父级的人(所、区县、地市、省)
e.getReceiveUsers().addAll(superviseUnitUserList.stream().filter(u -> e.getParentOrgBranchCode().contains(u.getOrgCode())).map(TzsUserInfoDto::getAmosUserId).collect(Collectors.toSet()));
});
// 人员去重，字符串可能为:元素1：8551496,8551496,8551496，元素2：8551496,8551497，需要转为8551496、8551497
......@@ -120,13 +118,8 @@ public class InspectionExpireRemindJob {
return jyjcBaseMapper.selectParentOrgUsers(allParentOrgCodes);
}
private List<TzsUserInfo> getUseUnitUserList(List<String> allUnitCodes) {
LambdaQueryWrapper<TzsUserInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.select(TzsUserInfo::getAmosUserId, TzsUserInfo::getUnitCode);
queryWrapper.in(TzsUserInfo::getUnitCode, allUnitCodes);
queryWrapper.eq(BaseEntity::getIsDelete, false);
queryWrapper.isNotNull(TzsUserInfo::getAmosUserId);
return tzsUserInfoMapper.selectList(queryWrapper);
private List<TzsUserInfoDto> getUseUnitUserList(List<String> allUnitCodes) {
return jyjcBaseMapper.selectUserByCompanyCodes(allUnitCodes);
}
private List<NeedTipEquipInfo> buildTipEquipInfoList(List<UseInfoModel> needTipEquipList) {
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/util/JyjcConstant.java
View file @ c3ec77b8
package com.yeejoin.amos.boot.module.jyjc.biz.util;
import java.util.Arrays;
import java.util.List;
/**
* @author Administrator
*/
......@@ -8,5 +11,5 @@ public class JyjcConstant {
/**
* 技术参数json类型字段
*/
public static final String[] TECH_PARAM_JSON_FIELDS = {"safetyAccessoriesAndRelatedDevices", "gasCylinderAccessories"};
public static final List<String> TECH_PARAM_JSON_FIELDS = Arrays.asList("safetyAccessoriesAndRelatedDevices", "gasCylinderAccessories", "pipeInfo");
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/EquipTechParamLifting.java
View file @ c3ec77b8
......@@ -1044,5 +1044,17 @@ public class EquipTechParamLifting extends AbstractEquipBaseEntity {
@TableField(value = "\"MAIN_PART\"")
private String mainPart;
/**
* 整机防爆标志
*/
@TableField("\"EXPLOSIONPROOF_SIGN_COMPLETE\"")
private String explosionproofSignComplete;
/**
* 燃爆物质
*/
@TableField("\"EXPLOSIVE_SUBSTANCE\"")
private String explosiveSubstance;
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/EquipTechParamPipeline.java
View file @ c3ec77b8
......@@ -22,112 +22,145 @@ public class EquipTechParamPipeline extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
/**
* * $column.comments
* */
*/
@TableField(value ="\"INSTANCE_ID\"")
@TableField(value = "\"INSTANCE_ID\"")
private String instanceId;
/**
* * $column.comments
* */
*/
@TableField(value ="\"STATUS\"")
@TableField(value = "\"STATUS\"")
private String status;
/**
* * 工程(装置)名称
* */
*/
@TableField(value ="\"DEVICE_NAME\"")
@TableField(value = "\"DEVICE_NAME\"")
private String deviceName;
/**
* * 管道类别
* */
*/
@TableField(value ="\"PIPELINE_CLASS\"")
@TableField(value = "\"PIPELINE_CLASS\"")
private String pipelineClass;
/**
* * 管道名称（登记单元）
* */
*/
@TableField(value ="\"PIPE_NAME\"")
@TableField(value = "\"PIPE_NAME\"")
private String pipeName;
/**
* * 管道编号
* */
*/
@TableField(value ="\"PIPELINE_NUMBER\"")
@TableField(value = "\"PIPELINE_NUMBER\"")
private String pipelineNumber;
/**
* * 设备级别
* */
*/
@TableField(value ="\"DEVICE_LEVEL\"")
@TableField(value = "\"DEVICE_LEVEL\"")
private String deviceLevel;
/**
* * 设计标准
* */
*/
@TableField(value ="\"DESIGN_STANDARD\"")
@TableField(value = "\"DESIGN_STANDARD\"")
private String designStandard;
/**
* * 管道图号
* */
*/
@TableField(value ="\"PIPE_DRAW_NUMBER\"")
@TableField(value = "\"PIPE_DRAW_NUMBER\"")
private String pipeDrawNumber;
/**
* * 公称直径
* */
*/
@TableField(value ="\"NOMINAL_DIAMETER\"")
@TableField(value = "\"NOMINAL_DIAMETER\"")
private BigDecimal nominalDiameter;
/**
* * 公称壁厚
* */
*/
@TableField(value ="\"WALL_THICKNESS\"")
@TableField(value = "\"WALL_THICKNESS\"")
private BigDecimal wallThickness;
/**
* * 管道长度
* */
*/
@TableField(value ="\"PIPE_LENGTH\"")
@TableField(value = "\"PIPE_LENGTH\"")
private BigDecimal pipeLength;
/**
* * 起始位置起点
* */
*/
@TableField(value ="\"STARTE_POSITION\"")
@TableField(value = "\"STARTE_POSITION\"")
private String startePosition;
/**
* * 压力
* */
* * 设计压力
*/
@TableField(value ="\"PRESSURE\"")
private BigDecimal pressure;
@TableField(value = "\"PRESSURE\"")
private String pressure;
/**
* * 温度
* */
* * 设计温度
*/
@TableField(value ="\"TEMPERATURE\"")
private BigDecimal temperature;
@TableField(value = "\"TEMPERATURE\"")
private String temperature;
/**
* * 介质
* */
* * 设计介质
*/
@TableField(value ="\"MEDIUM\"")
@TableField(value = "\"MEDIUM\"")
private String medium;
/**
* * 备注
* */
* * 设计备注
*/
@TableField(value ="\"REMARKS\"")
@TableField(value = "\"REMARKS\"")
private String remarks;
/**
* 终点位置
*/
@TableField("\"END_POSITION\"")
private String endPosition;
/**
* 管道信息
*/
@TableField(value = "\"PIPE_INFO\"")
private String pipeInfo;
/**
* * 工作压力
*/
@TableField(value = "\"WORK_PRESSURE\"")
private String workPressure;
/**
* * 工作温度
*/
@TableField(value = "\"WORK_TEMPERATURE\"")
private String workTemperature;
/**
* * 工作介质
*/
@TableField(value = "\"WORK_MEDIUM\"")
private String workMedium;
/**
* * 工作备注
*/
@TableField(value = "\"WORK_REMARKS\"")
private String workRemarks;
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgTechParamsPipeline.java
View file @ c3ec77b8
......@@ -2,12 +2,10 @@ package com.yeejoin.amos.boot.module.ymt.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 安全追溯-压力管道
......@@ -22,8 +20,6 @@ import java.util.Date;
public class IdxBizJgTechParamsPipeline extends TzsBaseEntity {
/**
*
*/
......@@ -109,6 +105,12 @@ public class IdxBizJgTechParamsPipeline extends TzsBaseEntity {
private String startePosition;
/**
* 终点位置
*/
@TableField("\"END_POSITION\"")
private String endPosition;
/**
*
*/
@TableField("\"PRESSURE\"")
......@@ -132,4 +134,37 @@ public class IdxBizJgTechParamsPipeline extends TzsBaseEntity {
@TableField("\"REMARKS\"")
private String remarks;
/**
* 管道信息
*/
@TableField(value = "\"PIPE_INFO\"")
private String pipeInfo;
/**
* * 工作压力
*/
@TableField(value = "\"WORK_PRESSURE\"")
private String workPressure;
/**
* * 工作温度
*/
@TableField(value = "\"WORK_TEMPERATURE\"")
private String workTemperature;
/**
* * 工作介质
*/
@TableField(value = "\"WORK_MEDIUM\"")
private String workMedium;
/**
* * 工作备注
*/
@TableField(value = "\"WORK_REMARKS\"")
private String workRemarks;
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgTechParamsVessel.java
View file @ c3ec77b8
......@@ -528,4 +528,22 @@ public class IdxBizJgTechParamsVessel extends TzsBaseEntity {
@TableField("\"PER_CAPITA_CABIN_CAPACITY\"")
private String perCapitaCabinCapacity;
/**
* 气瓶
*/
@TableField(value = "\"GAS_CYLINDER\"")
private String gasCylinder;
/**
* 气瓶安全附件
*/
@TableField(value = "\"GAS_CYLINDER_ACCESSORIES\"")
private String gasCylinderAccessories;
/**
* 车辆VIN码
*/
@TableField(value = "\"VIN\"")
private String vin;
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/EquipTechParamLiftingMapper.java
View file @ c3ec77b8
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.ymt.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamLifting;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsLifting;
import org.apache.ibatis.annotations.Param;
public interface EquipTechParamLiftingMapper extends BaseMapper<EquipTechParamLifting> {
......@@ -9,8 +10,9 @@ public interface EquipTechParamLiftingMapper extends BaseMapper<EquipTechParamLi
/**
* 在用的最新需求整理的技术参数
*
* @param record 设备唯一标识
* @return EquipTechParamLifting
*/
EquipTechParamLifting queryTechParamInUse(@Param("record") String record);
IdxBizJgTechParamsLifting queryTechParamInUse(@Param("record") String record);
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipTechParamLiftingMapper.xml
View file @ c3ec77b8
......@@ -2,13 +2,12 @@
<!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.ymt.api.mapper.EquipTechParamLiftingMapper">
<select id="queryTechParamInUse"
resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamLifting">
resultType="com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsLifting">
SELECT
"EXPLOSIONPROOF_GRADE",
"EXPLOSIVE_SUBSTANCE",
"EXPLOSIONPROOF_SIGN_COMPLETE",
"CHECK_FINISHED_HEIGHT",
"HEIGHT_FREE_END",
"RATED_LIFTING_SPEED",
"RATED_LOAD_CAPACITY",
"WORK_STROKE_CAGE",
......@@ -28,7 +27,6 @@
"RATED_LIFT_SPEED",
"RATED_TRAVERSE_SPEED",
"BICYCLE_MAX_EXIT_TIME",
"STORAGE_CAPACITY",
"CANTILEVER_LENGTH",
"DERRICKING_SPEED",
"BICYCLE_MAX_COME_TIME",
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipTechParamPipelineMapper.xml
View file @ c3ec77b8
......@@ -6,19 +6,20 @@
SELECT
"DEVICE_NAME",
"PIPELINE_CLASS",
"PIPE_NAME",
"PIPELINE_NUMBER",
"DEVICE_LEVEL",
"DESIGN_STANDARD",
"PIPE_DRAW_NUMBER",
"STARTE_POSITION",
"END_POSITION",
"NOMINAL_DIAMETER",
"WALL_THICKNESS",
"PIPE_LENGTH",
"STARTE_POSITION",
"PRESSURE",
"TEMPERATURE",
"MEDIUM",
"REMARKS"
"REMARKS",
"WORK_PRESSURE",
"WORK_TEMPERATURE",
"WORK_MEDIUM",
"WORK_REMARKS",
"PIPE_INFO"
FROM
idx_biz_jg_tech_params_pipeline
WHERE
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipTechParamRopewayMapper.xml
View file @ c3ec77b8
......@@ -10,16 +10,13 @@
"MAIN_MOTOR_MODEL",
"MAIN_MOTOR_POWER",
"ALTITUDE_DIFFERENCE",
"OIL_PRESSURE_HEAVY_HAMMER",
"OIL_PRESSURE_OIL_PRESSURE",
"FREIGHT_VOLUME",
"CARRIER_LINE",
"SPEED",
"BEARING_CABLE",
"CABLE_PITCH",
"NUMBER_AND_TYPE_OF_VEHICLES",
"TRACTION_ROPE",
"BALANCE_CABLE"
"OIL_PRESSURE_HEAVY_HAMMER",
"NUMBER_AND_TYPE_OF_VEHICLES"
FROM
idx_biz_jg_tech_params_ropeway
WHERE
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipTechParamVesselMapper.xml
View file @ c3ec77b8
......@@ -4,6 +4,7 @@
<select id="queryTechParamInUse"
resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamVessel">
SELECT
vin,
rated_quality,
ambient_temperature,
model_number,
......@@ -84,7 +85,9 @@
chamber_pressure,
temperature,
pressure_medium,
per_capita_cabin_capacity
per_capita_cabin_capacity,
gas_cylinder_accessories,
gas_cylinder
FROM idx_biz_jg_tech_params_vessel
where record = #{record}
</select>
......
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