Skip to content

A
amos-boot-biz
Commit 13ab63b2 authored by 麻笑宇's avatar 麻笑宇
Browse files
Options

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

parents 2d5a80b2 b02a3117
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1608 additions and 210 deletions
amos-boot-biz-common/pom.xml
View file @ 13ab63b2
......@@ -15,7 +15,6 @@
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-component-security</artifactId>
<version>1.10.8-TZS</version>
</dependency>
<dependency>
<groupId>org.typroject</groupId>
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java
View file @ 13ab63b2
......@@ -97,11 +97,11 @@ public class ControllerAop {
urls.add("/tcm/flc-unit-info/region/tree");
urls.add("/tcm/reg-unit-info/management-unit/tree");
urls.add("/tcm/reg-unit-info/unit-type/list");
urls.add("^/tcm/flc-unit-info/hasExistPhone/[0-9]+$");
urls.add("^/tcm/flc-unit-info/sendTelCode/[0-9]+$");
urls.add("^/tcm/reg-unit-info/[A-Za-z0-9]+/check$");
urls.add("^/tcm/flc-unit-info/verifyTelCode/[A-Za-z0-9]+/[A-Za-z0-9]+");
urls.add("^/tcm/flc-unit-info/hasExistUser/[A-Za-z0-9_-]+");
urls.add("/tcm/flc-unit-info/hasExistPhone/[0-9]+$");
urls.add("/tcm/flc-unit-info/sendTelCode/[0-9]+$");
urls.add("/tcm/reg-unit-info/[A-Za-z0-9]+/check$");
urls.add("/tcm/flc-unit-info/verifyTelCode/[A-Za-z0-9]+/[A-Za-z0-9]+");
urls.add("/tcm/flc-unit-info/hasExistUser/.+");
urls.add("/tcm/reg-unit-info/save");
urls.add("/tcm/reg-unit-info/child-list");
urls.add("/tcm/reg-unit-info/management-unit/tree");
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/feign/FeignAuthRequestInterceptor.java
View file @ 13ab63b2
......@@ -35,6 +35,15 @@ public class FeignAuthRequestInterceptor implements RequestInterceptor {
if (product == null) {
product = request.getParameter("product");
}
if (authToken == null) {
authToken = RequestContext.getToken();
}
if (appKey == null) {
appKey = RequestContext.getAppKey();
}
if (product == null) {
product = RequestContext.getProduct();
}
template.header("X-Access-Token", authToken);
template.header("token", authToken);
template.header("appKey", appKey);
......
amos-boot-biz-common/src/main/resources/template2/bean.java.ftl
View file @ 13ab63b2
......@@ -6,6 +6,7 @@ import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* ${table.comment!}
......
amos-boot-biz-common/src/main/resources/template2/controller.java.ftl
View file @ 13ab63b2
......@@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import ${package.Xml}.${entity}Model;
import ${package.Xml}.${entity};
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
......@@ -55,9 +55,9 @@ public class ${table.controllerName} {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<${entity}Model> save(@RequestBody ${entity}Model model) {
model = ${table.serviceImplName ?uncap_first}.createWithModel(model);
return ResponseHelper.buildResponse(model);
public ResponseModel<${entity}> save(@RequestBody ${entity} ) {
entity = ${table.serviceImplName ?uncap_first}.createWithModel(entity);
return ResponseHelper.buildResponse(entity);
}
/**
......@@ -69,9 +69,9 @@ public class ${table.controllerName} {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<${entity}Model> updateBySequenceNbr${entity}(@RequestBody ${entity}Model model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.updateWithModel(model));
public ResponseModel<${entity}> updateBySequenceNbr${entity}(@RequestBody ${entity} entity,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
entity.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.updateWithModel(entity));
}
/**
......@@ -96,7 +96,7 @@ public class ${table.controllerName} {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<${entity}Model> selectOne(@PathVariable Long sequenceNbr) {
public ResponseModel<${entity}> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.queryBySeq(sequenceNbr));
}
......@@ -110,9 +110,9 @@ public class ${table.controllerName} {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询")
public ResponseModel<Page<${entity}Model>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
public ResponseModel<Page<${entity}>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<${entity}Model> page = new Page<${entity}Model>();
Page<${entity}> page = new Page<${entity}>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.queryFor${entity}Page(page));
......@@ -126,7 +126,7 @@ public class ${table.controllerName} {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<${entity}Model>> selectForList() {
public ResponseModel<List<${entity}>> selectForList() {
return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.queryFor${entity}List());
}
}
......
amos-boot-biz-common/src/main/resources/template2/serviceImpl.java.ftl
View file @ 13ab63b2
......@@ -3,7 +3,7 @@ package ${package.ServiceImpl};
import ${package.Entity}.${entity};
import ${package.Mapper}.${table.mapperName};
import ${package.Service}.${table.serviceName};
import ${package.Xml}.${entity}Model;
import ${package.Xml}.${entity};
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -16,18 +16,18 @@ import java.util.List;
* @date ${date}
*/
@Service
public class ${table.serviceImplName} extends BaseService<${entity}Model,${entity},${table.mapperName}> implements ${table.serviceName} {
public class ${table.serviceImplName} extends BaseService<${entity},${entity},${table.mapperName}> implements ${table.serviceName} {
/**
* 分页查询
*/
public Page<${entity}Model> queryFor${entity}Page(Page<${entity}Model> page) {
public Page<${entity}> queryFor${entity}Page(Page<${entity}> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<${entity}Model> queryFor${entity}List() {
public List<${entity}> queryFor${entity}List() {
return this.queryForList("" , false);
}
}
\ No newline at end of file
amos-boot-data/amos-boot-data-accessapi/pom.xml
View file @ 13ab63b2
......@@ -181,7 +181,6 @@
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-component-security</artifactId>
<version>${amos.version}</version>
</dependency>
</dependencies>
<build>
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsTcmServiceFeignClient.java
View file @ 13ab63b2
......@@ -29,7 +29,7 @@ public interface TzsTcmServiceFeignClient {
* @param dictCode 字段类型
* @return 列表
*/
@RequestMapping(value = "/getDataDictionary/{dictCode}", method = RequestMethod.GET)
@RequestMapping(value = "/data-dictionary/getDataDictionary/{dictCode}", method = RequestMethod.GET)
ResponseModel<Object> getDataDictionary(@PathVariable String dictCode);
}
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/event/OperateLogRestEventHandler.java
View file @ 13ab63b2
......@@ -26,7 +26,7 @@ public class OperateLogRestEventHandler extends RestEventHandler {
@Value("${spring.application.name}")
private String applicationName;
private ESUserOperateLogDao esUserOperateLogDao;
private final ESUserOperateLogDao esUserOperateLogDao;
public OperateLogRestEventHandler(ESUserOperateLogDao esUserOperateLogDao) {
this.esUserOperateLogDao = esUserOperateLogDao;
......
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DynamicFormInstanceServiceImpl.java
View file @ 13ab63b2
package com.yeejoin.amos.boot.module.common.biz.service.impl;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Sequence;
......@@ -26,6 +10,20 @@ import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
import com.yeejoin.amos.boot.module.common.api.service.IDynamicFormInstanceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
/**
* 动态表单实例表服务实现类
......@@ -136,18 +134,18 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
Page page = new Page();
if (current > 0){
page.setCurrent((long) (current - 1) *size);
if (current > 0) {
page.setCurrent((long) (current - 1) * size);
page.setSize(size);
}
if (!params.isEmpty()&&params !=null){
if (!params.get("sort").isEmpty() && params.get("sort") != null){
if (!params.isEmpty() && params != null) {
if (!ValidationUtil.isEmpty(params.get("sort")) && params.get("sort") != null) {
String[] sorts = params.get("sort").split(",");
params.put("date",sorts[0]);
params.put("lift",sorts[1]);
params.put("date", sorts[0]);
params.put("lift", sorts[1]);
}
}
return this.getBaseMapper().pageList(page, RequestContext.getAppKey(), fieldCodes, groupCode, params);
return this.getBaseMapper().pageList(page, null, fieldCodes, groupCode, params);
}
// 不存在值班数据则不查找 修改sql 方法去除 by kongfm 2021-09-14
public IPage<Map<String, Object>> pageListNew(int current, int size, String groupCode, String beginDate, String endDate) {
......
amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderUnitMapper.xml
View file @ 13ab63b2
......@@ -93,7 +93,7 @@
FROM
tz_cylinder_unit u
WHERE
NOT EXISTS (select 1 from tzs_jg_use_registration r where r.use_unit_credit_code = u.credit_code and r.manage_type='unit' and r.status ='已完成')
NOT EXISTS (select 1 from tzs_jg_use_registration r where r.use_unit_credit_code = u.credit_code and r.manage_type='unit' and r.status ='已完成' and r.is_delete = 0)
and not EXISTS (select 1 from tz_cylinder_question_info q where u.sequence_nbr = q.question_object_id and q.question_type = #{questionType} )
</select>
<insert id="saveOrUpdateBatch" parameterType="com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderUnit">
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationTransferDto.java
View file @ 13ab63b2
......@@ -160,5 +160,7 @@ public class JgChangeRegistrationTransferDto extends BaseDto {
@ApiModelProperty(value = " 转办后执行人的Id逗号分割")
private String transferToUserIds;
@ApiModelProperty (value = "其他附件")
private String otherAccessories;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgEquipInsuranceDto.java 0 → 100644
View file @ 13ab63b2
package com.yeejoin.amos.boot.module.jg.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 设备保险信息
*
* @author LiuLin
* @date 2024-10-17
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "JgEquipInsuranceDto", description = "设备保险信息")
public class JgEquipInsuranceDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "设备id")
private String equId;
@ApiModelProperty(value = "承保单位名称")
private String underWriteName;
@ApiModelProperty(value = "承保单位统一信用代码")
private String underWriteCreditCode;
@ApiModelProperty(value = "保险服务单位")
private String insuranceServiceUnitName;
@ApiModelProperty(value = "保险服务单位统一社会信用代码")
private String insuranceServiceUnitCode;
@ApiModelProperty(value = "理赔电话")
private String claimTelephone;
@ApiModelProperty(value = "保险单号")
private String insuranceNumber;
@ApiModelProperty(value = "保险截止日期")
private Date insuranceExpirationDate;
@ApiModelProperty(value = "设备种类")
private String equList;
@ApiModelProperty(value = "设备类别")
private String equCategory;
@ApiModelProperty(value = "设备品种")
private String equDefine;
@ApiModelProperty(value = "登记机关")
private String receiveOrgName;
@ApiModelProperty(value = "使用单位")
private String useUnitName;
@ApiModelProperty(value = "单位内编号")
private String useInnerCode;
@ApiModelProperty(value = "出厂编号")
private String factoryNum;
@ApiModelProperty(value = "使用登记证编号")
private String useRegistrationCode;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationTransfer.java
View file @ 13ab63b2
......@@ -261,4 +261,10 @@ public class JgChangeRegistrationTransfer extends BaseEntity {
*/
@TableField("transfer_type")
private String transferType;
/**
* 其他附件
*/
@TableField(value = "other_accessories")
private String otherAccessories;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgEquipInsurance.java 0 → 100644
View file @ 13ab63b2
package com.yeejoin.amos.boot.module.jg.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 设备保险信息
*
* @author LiuLin
* @date 2024-10-17
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("tzs_jg_equip_insurance")
public class JgEquipInsurance extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 设备id
*/
@TableField("equ_id")
private String equId;
/**
* 承保单位名称
*/
@TableField("under_write_name")
private String underWriteName;
/**
* 承保单位统一信用代码
*/
@TableField("under_write_credit_code")
private String underWriteCreditCode;
/**
* 保险服务单位
*/
@TableField("insurance_service_unit_name")
private String insuranceServiceUnitName;
/**
* 保险服务单位统一社会信用代码
*/
@TableField("insurance_service_unit_code")
private String insuranceServiceUnitCode;
/**
* 理赔电话
*/
@TableField("claim_telephone")
private String claimTelephone;
/**
* 保险单号
*/
@TableField("insurance_number")
private String insuranceNumber;
/**
* 保险截止日期
*/
@TableField("insurance_expiration_date")
private Date insuranceExpirationDate;
/**
* 设备种类
*/
@TableField("equ_list")
private String equList;
/**
* 设备类别
*/
@TableField("equ_category")
private String equCategory;
/**
* 设备品种
*/
@TableField("equ_define")
private String equDefine;
}
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 @ 13ab63b2
......@@ -59,13 +59,6 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
/**
* 统计设备被引用的次数（只有存在就算引用）
* @param record 设备唯一标识
* @return 被引用次数 > 0 则设备不可删除
*/
Integer countEquipInUseTimesForDel(String record);
/**
* 统计设备被引用的次数（只有存在就算引用-作废除外）
* @param record 设备唯一标识
* @return 被引用次数 > 0 则设备不可删除
......@@ -130,7 +123,7 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
*/
Integer checkFactoryNumUnique(@Param("factoryNum") String factoryNum,
@Param("sequenceNbr") String sequenceNbr,
@Param("useUnitCreditCode") String useUnitCreditCode);
@Param("produceUnitCreditCode") String produceUnitCreditCode);
/**
* 使用登记证编号全库唯一校验
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgEquipInsuranceMapper.java 0 → 100644
View file @ 13ab63b2
package com.yeejoin.amos.boot.module.jg.api.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipInsuranceDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipInsurance;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* Mapper 接口
*
* @author LiuLin
* @date 2024-10-17
*/
public interface JgEquipInsuranceMapper extends BaseMapper<JgEquipInsurance> {
Page<JgEquipInsuranceDto> getListPage(@Param("page") Page<JgEquipInsurance> page,
@Param("sort") SortVo sortMap,
@Param("dto") JgEquipInsuranceDto dto);
JgEquipInsuranceDto getDetailById(@Param("sequenceNbr") 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/mapper/JgRegistrationHistoryMapper.java
View file @ 13ab63b2
......@@ -15,6 +15,6 @@ public interface JgRegistrationHistoryMapper extends BaseMapper<JgRegistrationHi
@Select("select sequence_nbr from tzs_jg_registration_history where equ_id = #{equid} and current_document_id = #{documentId}")
Long getSequenceNbrByEquidAndDocumentId(@Param("equid") String equid, @Param("documentId") String documentId);
@Select("select sequence_nbr from tzs_jg_registration_history where registration_class = #{registratioClass} and current_document_id = #{documentId}")
@Select("select sequence_nbr from tzs_jg_registration_history where registration_class = #{registratioClass} and current_document_id = #{documentId} and is_delete = 0")
Long getSequenceNbrByRegistratioClassAndDocumentId(@Param("registratioClass") String registratioClass, @Param("documentId") String documentId);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationUnitService.java
View file @ 13ab63b2
......@@ -23,9 +23,10 @@ public interface IJgChangeRegistrationUnitService {
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @param selectedOrgInfo
* @return 安装告知
*/
Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr);
Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, ReginParams selectedOrgInfo);
/**
* 更新安装告知
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgEquipInsuranceService.java 0 → 100644
View file @ 13ab63b2
package com.yeejoin.amos.boot.module.jg.api.service;
/**
* 接口类
*
* @author LiuLin
* @date 2024-10-17
*/
public interface IJgEquipInsuranceService {}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgVehicleInformationVo.java
View file @ 13ab63b2
......@@ -263,4 +263,10 @@ public class JgVehicleInformationVo implements Serializable {
private String oRegDate;
private CompanyBo companyInfo;
@ApiModelProperty(value = "主体类型")
private String companyType;
@ApiModelProperty(value = "是否有权限")
private Boolean havingPermission;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEquipInsuranceMapper.xml 0 → 100644
View file @ 13ab63b2
<?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.JgEquipInsuranceMapper">
<sql id="page-list">
select
tjei.sequence_nbr as sequenceNbr,
tjei.equ_id as equId,
tjei.under_write_name as underWriteName,
tjei.under_write_credit_code as underWriteCreditCode,
tjei.insurance_service_unit_name as insuranceServiceUnitName,
tjei.insurance_service_unit_code as insuranceServiceUnitCode,
tjei.claim_telephone as claimTelephone,
tjei.insurance_number as insuranceNumber,
tjei.insurance_expiration_date as insuranceExpirationDate,
date_format(tjei.rec_date,'%Y-%m-%d') as recDate,
jri.ORGANIZATION_NAME as receiveOrgName,
jri.USE_ORG_CODE as useRegistrationCode,
ibjui.USE_UNIT_NAME as useUnitName,
ibjui.USE_INNER_CODE as useInnerCode,
ibjfi.FACTORY_NUM as factoryNum,
GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category where code = jri.EQU_LIST)) AS equList,
GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY)) as equCategory,
GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE)) as equDefine
from
tzs_jg_equip_insurance tjei
LEFT JOIN idx_biz_jg_register_info jri on tjei.equ_id = jri.RECORD
LEFT JOIN idx_biz_jg_use_info ibjui on tjei.equ_id = ibjui.RECORD
LEFT JOIN idx_biz_jg_factory_info ibjfi on tjei.equ_id = ibjfi.RECORD
</sql>
<select id="getListPage" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgEquipInsuranceDto">
<include refid="page-list"/>
<where>
tjei.is_delete = 0
<if test="dto.factoryNum != null and dto.factoryNum != ''">
AND ibjfi.FACTORY_NUM = #{dto.factoryNum}
</if>
<if test="dto.useInnerCode != null and dto.useInnerCode != ''">
AND ibjui.USE_INNER_CODE = #{dto.useInnerCode}
</if>
<if test="dto.underWriteName != null and dto.underWriteName != ''">
AND tjei.under_write_name like concat('%',#{dto.underWriteName},'%')
</if>
<if test="dto.insuranceNumber != null and dto.insuranceNumber != ''">
AND tjei.insurance_number like concat('%',#{dto.insuranceNumber},'%')
</if>
<if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''">
AND jri.USE_ORG_CODE like concat('%',#{dto.useRegistrationCode},'%')
</if>
GROUP BY tjei.equ_id
</where>
order by
<if test="sort != null">
tjei.${sort.field} ${sort.sortType},
</if>
tjei.rec_date DESC
</select>
<select id="getDetailById" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgEquipInsuranceDto">
<include refid="page-list"/>
where tjei.sequence_nbr = #{sequenceNbr} and tjei.is_delete = 0
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml
View file @ 13ab63b2
......@@ -224,6 +224,7 @@
AND SUBSTR(t.use_registration_code, 1, 1) IN ('容', '锅', '管', '瓶', '梯', '起', '索', '游', '车')
AND TRIM(t.use_registration_code) LIKE concat('%(',#{year},')')
and tjur.reg_type is null
and tjur.is_delete = 0
GROUP BY SUBSTR(t.use_registration_code, 1, 5)
HAVING code <![CDATA[ <> ]]> '00000'
ORDER BY prefix
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @ 13ab63b2
......@@ -6,7 +6,8 @@
where sequence_nbr = #{id}
</update>
<sql id="page-list">
select ur.sequence_nbr as sequenceNbr,
select
ur.sequence_nbr as sequenceNbr,
ur.audit_status as auditStatus,
date_format(ur.reg_date,'%Y-%m-%d') as regDate,
ur.use_unit_name as useUnitName,
......@@ -17,7 +18,6 @@
ur.apply_no as applyNo,
ur.next_execute_ids as nextExecuteIds,
ur.promoter,
GROUP_CONCAT(DISTINCT other.supervisory_code) as supervisoryCode,
ur.use_registration_code as useRegistrationCode,
date_format(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
date_format(ur.create_date,'%Y-%m-%d') as createDate,
......@@ -28,6 +28,9 @@
ur.rec_date as recDate,
ur.manage_type as manageType,
ur.reg_type as regType,
ur.use_address as fullAddress,
ur.cancel_reason as cancelReason,
GROUP_CONCAT(DISTINCT other.supervisory_code) as supervisoryCode,
GROUP_CONCAT(DISTINCT other.CODE96333) AS code96333,
GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY)) as equCategory,
GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE)) as equDefine,
......@@ -37,16 +40,12 @@
GROUP_CONCAT(DISTINCT jri.EQU_CODE) AS equCode,
GROUP_CONCAT(DISTINCT jri.EQU_LIST) AS equList,
GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category where code = jri.EQU_LIST)) AS equListName,
GROUP_CONCAT(DISTINCT use.USE_INNER_CODE) AS innerCode,
GROUP_CONCAT(DISTINCT re.equ_id) AS equipId,
concat(use."PROVINCE_NAME", '', use."CITY_NAME", '', use."COUNTY_NAME", '', use."STREET_NAME") as fullAddress,
use."ADDRESS" as detailedAddress,
ibjsi.ORG_BRANCH_NAME as orgBranchName,
ur.cancel_reason as cancelReason
from tzs_jg_use_registration ur
GROUP_CONCAT(DISTINCT ibjsi.ORG_BRANCH_NAME) AS orgBranchName
from
tzs_jg_use_registration ur
LEFT JOIN tzs_jg_use_registration_eq re on ur.sequence_nbr = re.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD
LEFT JOIN idx_biz_jg_other_info other on re.equ_id = other.RECORD
LEFT JOIN idx_biz_jg_supervision_info ibjsi on re.equ_id = ibjsi.RECORD
</sql>
......@@ -135,6 +134,8 @@
</foreach>
</if>
</where>
GROUP BY
re.equip_transfer_id
order by
ur.create_date DESC, ur.apply_no DESC
</select>
......@@ -377,12 +378,14 @@
LEFT JOIN "tzs_jg_use_registration" AS tjur ON tjure."equip_transfer_id" = tjur."sequence_nbr"
WHERE tjure."equ_id" = #{id}
AND tjur."status" = '已完成'
AND tjure.is_delete = 0
ORDER BY tjure."rec_date" desc
LIMIT 1
</select>
<select id="getMaintenanceDetail" resultType="java.util.Map">
SELECT tjmc."maintenance_unit_name" as maintenanceUnitName,
SELECT
tjmc."maintenance_unit_name" as maintenanceUnitName,
tjmc."use_unit_name" as maintenanceUseUnitName,
tjmc."maintenance_manager_name" as maintenanceManagerName,
tjmc."maintenance_manager_phone" as maintenanceManagerPhone,
......@@ -391,11 +394,14 @@
tjmc."maintenance_manager_two_name" as maintenanceManagerTwoName,
tjmc."maintenance_manager_two_phone" as maintenanceManagerTwoPhone,
tjmc."maintenance_contract" as maintenanceContract,
tjmc."other_accessories" as maintOtherAccessories
FROM "tzs_jg_maintenance_contract_eq" as tjmce
LEFT JOIN "tzs_jg_maintenance_contract" as tjmc
ON tjmce."equip_transfer_id" = tjmc."sequence_nbr"
WHERE tjmce."equ_id" = #{id}
tjmc."other_accessories" as maintOtherAccessories,
tjmc."inform_start" as informStart,
tjmc."inform_end" as informEnd
FROM
"tzs_jg_maintenance_contract_eq" as tjmce
LEFT JOIN "tzs_jg_maintenance_contract" as tjmc ON tjmce."equip_transfer_id" = tjmc."sequence_nbr"
WHERE
tjmce."equ_id" = #{id}
AND tjmc."status" = '已完成'
ORDER BY tjmce."rec_date" desc
LIMIT 1
......@@ -439,6 +445,7 @@
LEFT JOIN idx_biz_jg_factory_info jfi on tjure.equ_id = jfi.RECORD
left JOIN idx_biz_jg_register_info jri on tjure.equ_id = jri.RECORD
WHERE tjure.equip_transfer_id = #{id}
AND tjure.is_delete = 0
</select>
<sql id="page-list-pipeline">
SELECT
......@@ -508,7 +515,7 @@
<if test="jsonObject.record == null">
and not exists(SELECT 1 FROM tzs_jg_use_registration v, tzs_jg_use_registration_eq ve WHERE
v.sequence_nbr = ve.equip_transfer_id AND ve.equ_id = ui."RECORD" and v.status !='使用单位待提交' and v.status
!='一级受理已驳回' and v.status !='使用单位已撤回' and v.status !='已作废' )
!='一级受理已驳回' and v.status !='使用单位已撤回' and v.status !='已作废' and v.is_delete = 0)
</if>
ORDER BY ui.REC_DATE DESC
) where uscUnitName is not null
......@@ -654,6 +661,7 @@
where
a.sequence_nbr = b.equip_transfer_id
and a.status not in('使用单位待提交','一级受理已驳回','使用单位已撤回','已作废')
and a.is_delete = 0
</select>
<select id="getEquTypeByUseRegSeq" resultType="java.util.Map">
select ur.sequence_nbr as sequenceNbr,
......@@ -707,6 +715,7 @@
and u."RECORD" = ri."RECORD"
and (a.audit_pass_date between #{beginDate} and #{endDate})
and a.status='已完成'
and a.is_delete = 0
and u."PROVINCE" <![CDATA[<>]]> ''
and u."CITY" <![CDATA[<>]]> ''
and u."COUNTY" <![CDATA[<>]]> ''
......@@ -739,8 +748,8 @@
AND A.sequence_nbr = ae.equip_transfer_id
AND u."RECORD" = ri."RECORD"
and (a.audit_pass_date between #{dpFilterParamDto.beginDate} and #{dpFilterParamDto.endDate})
AND A.status = '已完成'
AND A.is_delete = 0
) C
WHERE
C.areaCode LIKE concat ( '%', #{dpFilterParamDto.cityCode}, '%' )
......
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 @ 13ab63b2
......@@ -18,6 +18,7 @@ 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.dto.EquipmentCategoryDto;
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;
......@@ -150,12 +151,21 @@ public class CommonController extends BaseController {
String companyType = selectedOrgInfo.getCompany().getCompanyType();
if ("个人主体".equals(companyType)) {
String[] code = selectedOrgInfo.getCompany().getCompanyCode().split("_");
map.put("useUnitCreditCode", code.length > 1 ? code[1] : code[0]);
String useUnitCode = code.length > 1 ? code[1] : code[0];
map.put("useUnitCreditCode", useUnitCode);
String[] companyName = selectedOrgInfo.getCompany().getCompanyName().split("_");
map.put("useUnitName", companyName.length > 1 ? companyName[1] : companyName[0]);
map.put("address", commonService.getEnterpriseInfo(useUnitCode).get("address"));
// 冗余兼容其他业务
map.put("useUnitAddress", map.get("address"));
map.put("companyType", "person");
} else {
map.put("useUnitCreditCode", selectedOrgInfo.getCompany().getCompanyCode());
map.put("useUnitName", selectedOrgInfo.getCompany().getCompanyName());
map.put("address", commonService.getEnterpriseInfo(selectedOrgInfo.getCompany().getCompanyCode()).get("address"));
// 冗余兼容其他业务
map.put("useUnitAddress", map.get("address"));
map.put("companyType", "company");
}
return ResponseHelper.buildResponse(map);
}
......@@ -182,7 +192,7 @@ public class CommonController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/equipmentClassification")
@ApiOperation(httpMethod = "GET", value = "设备分类", notes = "1，设备种类 2，设备类别 3，设备品种")
public ResponseModel<List<EquipmentCategory>> equipmentClassification(@RequestParam(value = "type") String type) {
public ResponseModel<List<EquipmentCategoryDto>> equipmentClassification(@RequestParam(value = "type") String type) {
return ResponseHelper.buildResponse(commonService.equipmentClassification(type));
}
......@@ -550,6 +560,7 @@ public class CommonController extends BaseController {
seqLists.forEach(sequenceNbr -> {
LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
lambda.eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr);
lambda.eq(JgRegistrationHistory::getIsDelete, false);
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
String equipId = String.valueOf(jsonObject.get("equipId"));
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java
View file @ 13ab63b2
......@@ -6,7 +6,6 @@ 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.controller.BaseController;
import com.yeejoin.amos.boot.module.jg.api.vo.ElevatorModelVo;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
import com.yeejoin.amos.boot.module.ymt.api.entity.PageParam;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
......@@ -320,4 +319,43 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getCylinderInfo(equCode, startTime, endTime, pageParam));
}
/**
* 初始化接口，调用一次，企业许可到期提醒
*
* @return 返回调用成功信息
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/initEnterpriseLicenseExpirationOnce", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "初始化接口，调用一次，企业许可到期提醒", notes = "初始化接口，调用一次，企业许可到期提醒")
public ResponseModel<String> initEnterpriseLicenseExpirationOnce() {
idxBizJgRegisterInfoService.initEnterpriseLicenseExpirationOnce();
return ResponseHelper.buildResponse("ok");
}
/**
* 初始化接口，调用一次，人员资质过期提醒
*
* @return 返回调用成功信息
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/initUserExpirationReminderOnce", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "初始化接口，调用一次，人员资质过期提醒", notes = "初始化接口，调用一次，人员资质过期提醒")
public ResponseModel<String> initUserExpirationReminderOnce() {
idxBizJgRegisterInfoService.initUserExpirationReminderOnce();
return ResponseHelper.buildResponse("ok");
}
/**
* 初始化接口，调用一次，检验有效期到期提醒
*
* @return 返回调用成功信息
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/inspectionExpirationReminderOnce", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "初始化接口，调用一次，检验有效期到期提醒", notes = "初始化接口，调用一次，检验有效期到期提醒")
public ResponseModel<String> inspectionExpirationReminderOnce() {
idxBizJgRegisterInfoService.inspectionExpirationReminderOnce();
return ResponseHelper.buildResponse("ok");
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationUnitController.java
View file @ 13ab63b2
......@@ -117,7 +117,7 @@ public class JgChangeRegistrationUnitController extends BaseController {
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个单位变更", notes = "根据sequenceNbr查询单个单位变更")
public ResponseModel<Map<String,
Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryBySequenceNbr(sequenceNbr));
return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryBySequenceNbr(sequenceNbr, getSelectedOrgInfo()));
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeVehicleRegistrationUnitController.java
View file @ 13ab63b2
......@@ -13,6 +13,7 @@ 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.component.event.RestEventTrigger;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
......@@ -161,12 +162,13 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
@GetMapping(value = "/details")
@ApiOperation(httpMethod = "GET", value = "获取详情", notes = "获取详情")
public ResponseModel<Map<String, Object>> getDetails(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.getDetails(sequenceNbr));
return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.getDetails(sequenceNbr, getSelectedOrgInfo()));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/withdraw")
@ApiOperation(httpMethod = "POST", value = "撤回", notes = "撤回")
@ApiOperation(httpMethod = "POST", value = "车用气瓶单位变更登记撤回", notes = "撤回")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Object> withdraw(@RequestBody JSONObject map) {
jgChangeVehicleRegistrationUnitServiceImpl.withdraw(String.valueOf(map.get("instanceId")), String.valueOf(map.get("nextTaskId")));
return ResponseHelper.buildResponse("ok");
......@@ -174,14 +176,16 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/delete")
@ApiOperation(httpMethod = "DELETE", value = "删除", notes = "删除")
@ApiOperation(httpMethod = "DELETE", value = "车用气瓶单位变更删除", notes = "删除")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Object> withdraw(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
jgChangeVehicleRegistrationUnitServiceImpl.deleteMessage(sequenceNbr);
return ResponseHelper.buildResponse("ok");
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/flowExecute")
@ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
@ApiOperation(httpMethod = "POST", value = "车用气瓶单位变更执行流程", notes = "执行流程")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
jgChangeVehicleRegistrationUnitServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),
String.valueOf(map.get("instanceId")),
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgEquipInsuranceController.java 0 → 100644
View file @ 13ab63b2
package com.yeejoin.amos.boot.module.jg.biz.controller;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipInsuranceDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipInsurance;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgEquipInsuranceServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
/**
* 设备保险信息控制类
* @author LiuLin
* @date 2024-10-17
*/
@RestController
@Api(tags = "Api")
@RequestMapping(value = "/jg-equip-insurance")
public class JgEquipInsuranceController extends BaseController {
@Autowired
JgEquipInsuranceServiceImpl jgEquipInsuranceServiceImpl;
/**
* 新增
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<Object> save(@RequestBody JSONObject map) {
return ResponseHelper.buildResponse(jgEquipInsuranceServiceImpl.save(map));
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/update")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<JgEquipInsurance> updateBySequenceNbrJgEquipInsurance(@RequestBody JgEquipInsurance entity,
@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
entity.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(jgEquipInsuranceServiceImpl.updateWithModel(entity));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/delete")
@ApiOperation(httpMethod = "POST", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(jgEquipInsuranceServiceImpl.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getDetail")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<JgEquipInsuranceDto> getDetail(@RequestParam Long sequenceNbr) {
return ResponseHelper.buildResponse(jgEquipInsuranceServiceImpl.getDetail(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询")
public ResponseModel<Page<JgEquipInsuranceDto>> queryForPage(@RequestParam(value = "sort", required = false) String sort,
@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
JgEquipInsuranceDto dto){
Page<JgEquipInsurance> page = new Page<>(current, size);
return ResponseHelper.buildResponse(jgEquipInsuranceServiceImpl.queryForJgEquipInsurancePage(page, sort, dto));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<JgEquipInsurance>> selectForList() {
return ResponseHelper.buildResponse(jgEquipInsuranceServiceImpl.queryForJgEquipInsuranceList());
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgInstallationNoticeController.java
View file @ 13ab63b2
......@@ -156,6 +156,7 @@ public class JgInstallationNoticeController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "PUT", value = "安装告知单个作废", notes = "安装告知单个作废")
@PutMapping(value = "/cancel/application")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<JgInstallationNotice> cancelApplication(@RequestBody JgInstallationNoticeDto jgInstallationNoticeDto) {
JgInstallationNotice result = iJgInstallationNoticeService.cancelApplication(jgInstallationNoticeDto.getSequenceNbr(), jgInstallationNoticeDto.getCancelReason());
return ResponseHelper.buildResponse(result);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgMaintenanceContractController.java
View file @ 13ab63b2
......@@ -16,6 +16,7 @@ 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.component.event.RestEventTrigger;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
......@@ -49,6 +50,7 @@ public class JgMaintenanceContractController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/saveOrSubmit")
@ApiOperation(httpMethod = "POST", value = "新增维保合同备案", notes = "新增维保合同备案")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Object> save(@RequestBody Map<String, Object> model,
@RequestParam(value = "submit") String submit) {
ReginParams reginParams = getSelectedOrgInfo();
......@@ -64,6 +66,7 @@ public class JgMaintenanceContractController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/revocation")
@ApiOperation(httpMethod = "POST", value = "维保合同撤回", notes = "维保合同撤回")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Object> revocation(@RequestBody JSONObject map) {
jgMaintenanceContractServiceImpl.revocation(String.valueOf(map.get("instanceId")), String.valueOf(map.get("nextTaskId")));
return ResponseHelper.buildResponse("ok");
......@@ -110,7 +113,8 @@ public class JgMaintenanceContractController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/flowExecute")
@ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
@ApiOperation(httpMethod = "POST", value = "维保备案执行流程", notes = "执行流程")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
jgMaintenanceContractServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),
String.valueOf(map.get("instanceId")),
......@@ -175,6 +179,7 @@ public class JgMaintenanceContractController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/cancelApplication")
@ApiOperation(httpMethod = "POST", value = "维保备案作废", notes = "维保备案作废")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<JgMaintenanceContract> cancelApplication(@RequestBody JgMaintenanceContractDto dto) {
JgMaintenanceContract result = jgMaintenanceContractServiceImpl.cancelApplication(dto.getSequenceNbr(), dto.getCancelReason());
return ResponseHelper.buildResponse(result);
......
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 @ 13ab63b2
......@@ -44,7 +44,7 @@ public class JgUseRegistrationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
@ApiOperation(httpMethod = "POST", value = "使用登记新增", notes = "新增")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Object> save(@RequestBody JSONObject map) {
return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.save(map));
......@@ -52,7 +52,7 @@ public class JgUseRegistrationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/flowExecute")
@ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
@ApiOperation(httpMethod = "POST", value = "使用登记执行流程", notes = "执行流程")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
jgUseRegistrationServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),
......@@ -68,7 +68,7 @@ public class JgUseRegistrationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/withdraw")
@ApiOperation(httpMethod = "POST", value = "撤回", notes = "撤回")
@ApiOperation(httpMethod = "POST", value = "使用登记撤回", notes = "撤回")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Object> withdraw(@RequestBody JSONObject map) {
jgUseRegistrationServiceImpl.withdraw(String.valueOf(map.get("instanceId")), String.valueOf(map.get("nextTaskId")),
......@@ -89,9 +89,7 @@ public class JgUseRegistrationController extends BaseController {
@PostMapping(value = "/deleteMessage")
@ApiOperation(httpMethod = "POST", value = "删除", notes = "删除")
public ResponseModel<Object> deleteMessage(@RequestParam("id") Long id) {
ArrayList<Long> ids = new ArrayList<>();
ids.add(id);
jgUseRegistrationServiceImpl.deleteBatch(ids);
jgUseRegistrationServiceImpl.deleteBatch(Collections.singletonList(id));
return ResponseHelper.buildResponse("ok");
}
......@@ -114,7 +112,10 @@ public class JgUseRegistrationController extends BaseController {
dto.setReceiveCompanyCode(info.getCompany().getCompanyCode());
}
Page<Map<String, Object>> list = jgUseRegistrationServiceImpl.getList(dto, sort, page, dto.getRoleIds());
list.getRecords().forEach(x -> x.put("companyType", info.getCompany().getCompanyType()));
list.getRecords().forEach(x -> {
x.put("companyType", info.getCompany().getCompanyType());
x.put("regTypeDesc", "1".equals(x.get("regType")) ? "历史登记" : "新增登记");
});
return ResponseHelper.buildResponse(list);
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgVehicleInformationController.java
View file @ 13ab63b2
......@@ -13,6 +13,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgVehicleInformationServiceImpl;
import org.typroject.tyboot.component.event.RestEventTrigger;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -57,7 +58,8 @@ public class JgVehicleInformationController extends BaseController {
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/flowExecute")
@ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
@ApiOperation(httpMethod = "POST", value = "车用气瓶登记执行流程", notes = "执行流程")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
jgVehicleInformationServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),
String.valueOf(map.get("instanceId")),
......@@ -76,6 +78,7 @@ public class JgVehicleInformationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/cancel")
@ApiOperation(httpMethod = "POST", value = "车用气瓶撤回", notes = "车用气瓶撤回")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Object> cancel(@RequestBody JSONObject map) {
jgVehicleInformationServiceImpl.cancel(String.valueOf(map.get("instanceId")), String.valueOf(map.get("nextTaskId")));
return ResponseHelper.buildResponse("ok");
......@@ -141,7 +144,10 @@ public class JgVehicleInformationController extends BaseController {
dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
}
Page<Map<String, Object>> list = jgVehicleInformationServiceImpl.getPageList(dto,sort, page, dto.getRoleIds());
list.getRecords().forEach(x -> x.put("companyType", info.getCompany().getCompanyType()));
list.getRecords().forEach(x -> {
x.put("companyType", info.getCompany().getCompanyType());
x.put("regTypeDesc", "1".equals(x.get("regType")) ? "历史登记" : "新增登记");
});
return ResponseHelper.buildResponse(list);
}
......@@ -168,7 +174,7 @@ public class JgVehicleInformationController extends BaseController {
@GetMapping(value = "/details")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个车用气瓶控制类", notes = "根据sequenceNbr查询单个车用气瓶控制类")
public ResponseModel<JgVehicleInformationVo> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(jgVehicleInformationServiceImpl.queryBySequenceNbr(sequenceNbr));
return ResponseHelper.buildResponse(jgVehicleInformationServiceImpl.queryBySequenceNbr(sequenceNbr, getSelectedOrgInfo()));
}
/**
......@@ -202,6 +208,7 @@ public class JgVehicleInformationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "PUT", value = "车用气瓶使用登记单条作废", notes = "车用气瓶使用登记单条作废")
@PutMapping(value = "/cancel/application")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<JgVehicleInformation> cancelApplication(@RequestBody JgVehicleInformationDto vehicleInformationDto) {
JgVehicleInformation result = jgVehicleInformationServiceImpl.cancelApplication(vehicleInformationDto.getSequenceNbr(), vehicleInformationDto.getCancelReason());
return ResponseHelper.buildResponse(result);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/event/listener/CancellationEventListener.java
View file @ 13ab63b2
......@@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper;
import lombok.extern.slf4j.Slf4j;
......@@ -31,7 +31,7 @@ public class CancellationEventListener {
@Value("${cancellation.deal.thread.number:1}")
private int threadNumber;
private CommonMapper commonMapper;
private ICommonService commonService;
private ESEquipmentCategory esEquipmentCategoryDao;
......@@ -39,8 +39,8 @@ public class CancellationEventListener {
private BlockingQueue<String> queue = new LinkedBlockingQueue<>();
public CancellationEventListener(CommonMapper commonMapper, ESEquipmentCategory esEquipmentCategoryDao, IdxBizJgUseInfoMapper idxBizJgUseInfoMapper) {
this.commonMapper = commonMapper;
public CancellationEventListener(ICommonService commonService, ESEquipmentCategory esEquipmentCategoryDao, IdxBizJgUseInfoMapper idxBizJgUseInfoMapper) {
this.commonService = commonService;
this.esEquipmentCategoryDao = esEquipmentCategoryDao;
this.idxBizJgUseInfoMapper = idxBizJgUseInfoMapper;
}
......@@ -52,11 +52,6 @@ public class CancellationEventListener {
queue.addAll(records);
}
private Boolean checkEquipIsUsed(String record) {
Integer useTime = commonMapper.countEquipInUseTimesWithOutZF(record);
return useTime > 0;
}
@PostConstruct
public void init() {
ExecutorService executorService = Executors.newFixedThreadPool(threadNumber);
......@@ -76,8 +71,8 @@ public class CancellationEventListener {
}
private void dealData(String record) {
// 所有业务单据（除去作废状态单据），有在引用设备的则不修改设备纳管状态
Boolean inUsed = this.checkEquipIsUsed(record);
// 所有业务单据（除去作废、删除状态单据），有在引用设备的则不修改设备纳管状态
Boolean inUsed = commonService.checkEquipIsUsed(record);
// 无引用则进行修改纳管状态为未纳管
if (!inUsed) {
// 更新已纳管为未纳管-数据库
......
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 @ 13ab63b2
......@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.jg.api.dto.InstanceRuntimeData;
import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
import javax.servlet.http.HttpServletResponse;
......@@ -171,12 +172,12 @@ public interface ICommonService {
/**
* 统计设备被引用的次数（只有存在就算引用）
* 统计设备是否被引用（只有存在就算引用，作废及删除的单据除外）
*
* @param record 设备唯一标识
* @return 被引用次数 > 0 则设备不可删除
* @return 被引用次数
*/
Integer countEquipInUseTimesForDel(String record);
Boolean checkEquipIsUsed(String record);
/**
* 设备分类
......@@ -184,7 +185,7 @@ public interface ICommonService {
* @param type 1，设备种类 2，设备类别 3，设备品种
* @return
*/
List<EquipmentCategory> equipmentClassification(String type);
List<EquipmentCategoryDto> equipmentClassification(String 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/IIdxBizJgMaintenanceRecordInfoService.java
View file @ 13ab63b2
......@@ -12,5 +12,10 @@ public interface IIdxBizJgMaintenanceRecordInfoService {
boolean saveOrUpdateData(IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo);
/**
* 按照创建日期倒叙排列，查询最新的一条维保信息
* @param record 设备唯一标识
* @return 查询最新的一条维保信息
*/
IdxBizJgMaintenanceRecordInfo queryNewestDetailByRecord(String record);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgRegisterInfoService.java
View file @ 13ab63b2
......@@ -67,4 +67,10 @@ public interface IIdxBizJgRegisterInfoService {
List<Map<String, Object>> getVehicleCylinderInfo(String useCode);
IPage<Map<String, Object>> getCylinderInfo(String equCode, Date startTime, Date endTime, PageParam pageParam);
void initUserExpirationReminderOnce();
void inspectionExpirationReminderOnce();
void initEnterpriseLicenseExpirationOnce();
}
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 @ 13ab63b2
......@@ -47,6 +47,7 @@ import com.yeejoin.amos.boot.module.jg.biz.utils.FileExporter;
import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
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.ymt.api.dto.EquipmentCategoryDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamPipeline;
import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
......@@ -1487,8 +1488,8 @@ public class CommonServiceImpl implements ICommonService {
**/
public TaskV2Model updateTaskModel(Map<String, Object> params) {
String exeUserId = RequestContext.getExeUserId();
List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(params.get("relationId").toString()).getResult();
List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
// 平台接口已调整 按照创建时间倒叙排列
List<TaskV2Model> collect = taskV2FeignService.selectListByRelationId(params.get("relationId").toString()).getResult();
if (collect.isEmpty()) {
return null;
......@@ -1554,13 +1555,9 @@ public class CommonServiceImpl implements ICommonService {
**/
public TaskV2Model updateTaskModelNew(Map<String, Object> params) {
String exeUserId = RequestContext.getExeUserId();
List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(params.get("relationId").toString()).getResult();
// TaskV2Model model = result.stream().filter(e->e.getFlowCode().equals(params.get("flowCode").toString())).sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r2.getSequenceNbr())) // 按时间降序排序
// .findFirst()
// .orElse(null);
List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
if (null == collect || collect.size() == 0) {
// 平台接口已调整 按照创建时间倒叙排列
List<TaskV2Model> collect = taskV2FeignService.selectListByRelationId(params.get("relationId").toString()).getResult();
if (null == collect || collect.isEmpty()) {
TaskV2Model model = new TaskV2Model();
model.setFlowStatus(Integer.valueOf(params.get("flowStatus").toString()));
model.setFlowStatusLabel(params.get("flowStatusLabel").toString());
......@@ -1881,6 +1878,7 @@ public class CommonServiceImpl implements ICommonService {
JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
lambda.eq(JgRegistrationHistory::getIsDelete, false);
Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
if (integer > 0) {
jgRegistrationHistory.setChangeData(JSON.toJSONString(json));
......@@ -1899,6 +1897,7 @@ public class CommonServiceImpl implements ICommonService {
public JSONObject queryHistoryData(Long currentDocumentId) {
LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
lambda.eq(JgRegistrationHistory::getIsDelete, false);
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
return jgRegistrationHistory != null ? JSONObject.parseObject(jgRegistrationHistory.getChangeData()) : null;
}
......@@ -1907,6 +1906,7 @@ public class CommonServiceImpl implements ICommonService {
public JSONArray queryHistoryDataObj(Long currentDocumentId) {
LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
lambda.eq(JgRegistrationHistory::getIsDelete, false);
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
if (jgRegistrationHistory != null) {
String changeData = jgRegistrationHistory.getChangeData();
......@@ -1930,8 +1930,9 @@ public class CommonServiceImpl implements ICommonService {
}
@Override
public Integer countEquipInUseTimesForDel(String record) {
return commonMapper.countEquipInUseTimesForDel(record);
public Boolean checkEquipIsUsed(String record) {
Integer useTime = commonMapper.countEquipInUseTimesWithOutZF(record);
return useTime > 0;
}
/**
......@@ -1968,9 +1969,9 @@ public class CommonServiceImpl implements ICommonService {
* .c@return
*/
@Override
public List<EquipmentCategory> equipmentClassification(String type) {
List<EquipmentCategory> categoryList = equipmentCategoryMapper.selectList(new QueryWrapper<>());
List<EquipmentCategory> result = Collections.emptyList();
public List<EquipmentCategoryDto> equipmentClassification(String type) {
List<EquipmentCategoryDto> categoryList = equipmentCategoryMapper.selectClassifyNoStart7();
List<EquipmentCategoryDto> result = Collections.emptyList();
switch (type) {
case "1":
result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*000$").matcher(category.getCode()).matches()).collect(Collectors.toList());
......@@ -2079,6 +2080,7 @@ public class CommonServiceImpl implements ICommonService {
jgUseRegistrations.forEach(x -> {
LambdaQueryWrapper<JgRegistrationHistory> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(JgRegistrationHistory::getCurrentDocumentId, x.getSequenceNbr());
wrapper.eq(JgRegistrationHistory::getIsDelete, false);
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(wrapper);
try {
if (jgRegistrationHistory.getChangeData().contains("8300")) {
......
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/IdxBizJgMaintenanceRecordInfoServiceImpl.java
View file @ 13ab63b2
......@@ -25,16 +25,19 @@ public class IdxBizJgMaintenanceRecordInfoServiceImpl extends BaseService<IdxBiz
return this.saveOrUpdate(maintenanceRecordInfo);
}
//查询最新的记录
/**
* 查询最新的维保记录
*/
@Override
public IdxBizJgMaintenanceRecordInfo queryNewestDetailByRecord(String record) {
IdxBizJgMaintenanceRecordInfo result = new IdxBizJgMaintenanceRecordInfo();
QueryWrapper<IdxBizJgMaintenanceRecordInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(IdxBizJgMaintenanceRecordInfo::getRecord,record).orderByDesc(IdxBizJgMaintenanceRecordInfo::getInformEnd);
List<IdxBizJgMaintenanceRecordInfo> maintenanceRecordInfoList = list(queryWrapper);
if(!ValidationUtil.isEmpty(maintenanceRecordInfoList)){
BeanUtils.copyProperties(maintenanceRecordInfoList.get(0),result);
queryWrapper.lambda().eq(IdxBizJgMaintenanceRecordInfo::getRecord,record).orderByDesc(IdxBizJgMaintenanceRecordInfo::getRecDate).last("limit 1");
IdxBizJgMaintenanceRecordInfo init = new IdxBizJgMaintenanceRecordInfo();
IdxBizJgMaintenanceRecordInfo last = getOne(queryWrapper);
if(last != null){
init = last;
}
return result;
return init;
}
......
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 @ 13ab63b2
......@@ -176,6 +176,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
lambda.eq(JgRegistrationHistory::getCurrentDocumentId, currentDocumentId);
lambda.eq(JgRegistrationHistory::getRegistrationClass, CHANGE_NAME);
lambda.eq(JgRegistrationHistory::getIsDelete, false);
Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
if (integer > 0) {
jgRegistrationHistory.setChangeData(JSON.toJSONString(map));
......@@ -915,7 +916,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
}
// 业务流水生成
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationName.getSequenceNbr()).one();
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery()
.eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationName.getSequenceNbr())
.eq(JgRegistrationHistory::getIsDelete, false)
.one();
JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
JSONObject dataList = JSONObject.parseObject(jsonObject.get("jgRegistrationInfo").toString());
JSONArray objects = JSONObject.parseArray(dataList.get("dataList").toString());
......@@ -1027,7 +1031,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
dtoMap.put("changeCertificate", JSON.parseArray(jgChangeRegistrationName.getChangeCertificate()));
dtoMap.put("otherAccessories", JSON.parseArray(jgChangeRegistrationName.getOtherAccessories()));
// 查询历史数据中选择的使用登记证信息
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr).one();
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery()
.eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr)
.eq(JgRegistrationHistory::getIsDelete, false)
.one();
if (!ObjectUtils.isEmpty(jgRegistrationHistory)) {
JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
JSONObject dataList = JSONObject.parseObject(jsonObject.get("jgRegistrationInfo").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/JgChangeRegistrationReformServiceImpl.java
View file @ 13ab63b2
......@@ -1239,7 +1239,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
private void restoreTechParams(JgChangeRegistrationReform jgChangeRegistrationReform) {
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(
new LambdaQueryWrapper<JgRegistrationHistory>()
.eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationReform.getApplyNo()));
.eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationReform.getApplyNo())
.eq(JgRegistrationHistory::getIsDelete, false));
if (jgRegistrationHistory == null) {
return;
}
......
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 @ 13ab63b2
......@@ -325,6 +325,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
//设备移装详细地址
oldTransfer.setFullAddress(fullAddress);
oldTransfer.setTransferType((String) tableData.get("transferType"));
if (!ObjectUtils.isEmpty(tableData.get("otherAccessories"))) {
oldTransfer.setOtherAccessories(JSONObject.toJSONString(tableData.get("otherAccessories")));
}
//保存【移装变更登记】基本信息
if (!ValidationUtil.isEmpty(oldTransfer)) {
......@@ -605,7 +608,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
this.doCompensate(transfer);
//查询设备详情
JgRegistrationHistory historyData = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
.eq(JgRegistrationHistory::getCurrentDocumentId, transfer.getApplyNo()));
.eq(JgRegistrationHistory::getCurrentDocumentId, transfer.getApplyNo())
.eq(JgRegistrationHistory::getIsDelete, false));
if (ValidationUtil.equals(FlowStatusEnum.TO_BE_FINISHED.getName(), transfer.getStatus())) {
// 执行完成时查询历史表
if (!ValidationUtil.isEmpty(historyData)) {
......@@ -648,6 +652,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
resultDataMap.put("receiveCompanyCode", transfer.getReceiveCompanyCode() + "_" + transfer.getReceiveOrgName());
resultDataMap.put("registrationList", newRegistrationList);
}
if (!ObjectUtils.isEmpty(resultDataMap.get("otherAccessories"))) {
resultDataMap.put("otherAccessories", JSONObject.parse(resultDataMap.get("otherAccessories").toString()));
}
String transferSafetyManager = Optional.ofNullable(resultDataMap.get("transferSafetyManager")).orElse("").toString();
if (StringUtil.isNotEmpty(transferSafetyManager)) {
String[] transferSafetyManagerList = transferSafetyManager.split("_");
......@@ -673,7 +680,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
private void delRepeatUseEquipData(JgChangeRegistrationTransfer transfer) {
if (NOT_FLOWING_STATE.contains(transfer.getAuditStatus())) {
JgRegistrationHistory historyData = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
.eq(JgRegistrationHistory::getCurrentDocumentId, transfer.getApplyNo()));
.eq(JgRegistrationHistory::getCurrentDocumentId, transfer.getApplyNo())
.eq(JgRegistrationHistory::getIsDelete, false));
JSONObject historyJson = JSON.parseObject(historyData.getChangeData());
List<Map<String, Object>> registrationList = (List<Map<String, Object>>) historyJson.get("registrationList");
List<String> ids = registrationList.stream().map(v -> JSON.parseObject(v.toString()).getString("sequenceNbr")).collect(Collectors.toList());
......@@ -791,7 +799,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
jgChangeRegistrationTransfer.setNextExecuteUserIds("");
//流程执行完成后，更新设备使用信息
JgRegistrationHistory historyData = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
.eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationTransfer.getApplyNo()));
.eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationTransfer.getApplyNo())
.eq(JgRegistrationHistory::getIsDelete, false));
this.updateByFlowEnd(jgChangeRegistrationTransfer.getSequenceNbr().toString(), historyData);
HashMap<String, Object> map = new HashMap<>();
map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
......
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 @ 13ab63b2
......@@ -163,10 +163,11 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
* 根据sequenceNbr查询：1、查询单位变更信息，2、查询使用登记证列表
*
* @param sequenceNbr 主键
* @param selectedOrgInfo
* @return 单位变更
*/
@Override
public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr) {
public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, ReginParams selectedOrgInfo) {
// 单位变更信息
JgChangeRegistrationUnit notice = JgChangeRegistrationUnitMapper.selectById(sequenceNbr);
if (Objects.isNull(notice)) {
......@@ -174,7 +175,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
this.doCompensate(notice);
Map<String, Object> changeInfo = BeanUtil.beanToMap(notice, false, true);
//回填新单位地址，台套办理的使用登记证打印时 需要，用来校验必输
if (!ObjectUtils.isEmpty(notice.getNewUseUnitCreditCode())) {
TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new LambdaQueryWrapper<TzBaseEnterpriseInfo>().eq(TzBaseEnterpriseInfo::getUseUnitCode, notice.getNewUseUnitCreditCode()));
if (useCodeResult != null) {
changeInfo.put("address",useCodeResult.getAddress());
}
}
//组装下拉数据
if (!ValidationUtil.isEmpty(notice.getReceiveOrgCode()) && !ValidationUtil.isEmpty(notice.getReceiveOrgName())) {
changeInfo.put("receiveOrgCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName());
......@@ -190,8 +197,17 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
changeInfo.put("otherAccessoriesList", JSON.parse(notice.getOtherAccessories()));
//查询使用登记证列表
JgRegistrationHistory historyServiceOne = registrationHistoryService.getOne(
new LambdaQueryWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, notice.getApplyNo()));
new LambdaQueryWrapper<JgRegistrationHistory>()
.eq(JgRegistrationHistory::getCurrentDocumentId, notice.getApplyNo())
.eq(JgRegistrationHistory::getIsDelete, false));
changeInfo.put("registrationList", JSON.parse(historyServiceOne.getChangeData()));
changeInfo.put("havingPermission", notice.getNextExecuteUserIds() != null && notice.getNextExecuteUserIds().contains(RequestContext.getExeUserId()));
String companyType = selectedOrgInfo.getCompany().getCompanyType();
if ("个人主体".equals(companyType)) {
changeInfo.put("companyType", "person");
} else {
changeInfo.put("companyType", "company");
}
return new HashMap<String, Map<String, Object>>() {{
// this.put("changeRegisInfo", fillEquipInfoWithRuntimeOrHistoryData(notice, changeInfo));
this.put("changeRegisInfo", changeInfo);
......@@ -312,6 +328,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
notice.setNextExecutorIds(String.join(",", roleListNext));
notice.setStatus(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());
notice.setNextExecuteUserIds(nextUserIds);
setNewUnitInfo(reginParams, notice);
JgChangeRegistrationUnitMapper.updateById(notice);
commonServiceImpl.deleteTasksByRelationId(notice.getSequenceNbr() + "");
createTaskModel(notice, taskname, "1", nextUserIds);
......@@ -359,12 +376,14 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
bean.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
executeOneStep(bean, taskName1, nextUserIds, op);
bean.setNextExecuteUserIds(nextUserIds);
setNewUnitInfo(reginParams, bean);
JgChangeRegistrationUnitMapper.updateById(bean);
commonServiceImpl.saveExecuteFlowData2Redis(bean.getInstanceId(), buildInstanceRuntimeData(bean));
}
} else {
JgChangeRegistrationUnit bean = new JgChangeRegistrationUnit();
BeanUtils.copyProperties(noticeDto, bean);
setNewUnitInfo(reginParams, bean);
JgChangeRegistrationUnitMapper.updateById(bean);
}
List<JgChangeRegistrationUnitEq> jgRelationEquipList = new ArrayList<>();
......@@ -407,6 +426,14 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
return noticeDto;
}
private void setNewUnitInfo(ReginParams reginParams, JgChangeRegistrationUnit notice) {
notice.setNewUseUnitName(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
reginParams.getCompany().getCompanyName().split("_")[1] : reginParams.getCompany().getCompanyName());
notice.setNewUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
reginParams.getCompany().getCompanyCode().split("_")[1] :
reginParams.getCompany().getCompanyCode());
}
/**
* 分页查询
......@@ -611,10 +638,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
model.setPromoter(reginParams.getUserModel().getUserId());
model.setStatus(taskName[0]);
}
model.setNewUseUnitName(reginParams.getCompany().getCompanyName());
model.setNewUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
reginParams.getCompany().getCompanyCode().split("_")[1] :
reginParams.getCompany().getCompanyCode());
if (!CollectionUtils.isEmpty(nextExecutorUserIds)) {
model.setNextExecuteUserIds(nextExecutorUserIds.get(0));
}
......@@ -634,6 +657,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
model.setEquList(registrationList.get(0).get("equList").toString());
JgChangeRegistrationUnit registrationUnit = new JgChangeRegistrationUnit();
BeanUtils.copyProperties(model, registrationUnit);
setNewUnitInfo(reginParams, registrationUnit);
JgChangeRegistrationUnitMapper.insert(registrationUnit);
List<TaskModelDto> modelDtos = new ArrayList<>();
......@@ -763,15 +787,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
}
String newUseUnitId = model.getNewUseUnitCreditCode();
if (!ObjectUtils.isEmpty(newUseUnitId)) {
String[] newUseUnitList = newUseUnitId.split("_");
if (newUseUnitList.length > 1) {
model.setNewUseUnitCreditCode(newUseUnitList[0]);
model.setNewUseUnitName(newUseUnitList[1]);
}
}
String receiveOrgCode = model.getReceiveOrgCode();
if (!ObjectUtils.isEmpty(receiveOrgCode)) {
String[] receiveOrgCodeList = receiveOrgCode.split("_");
......@@ -976,7 +991,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
updateTaskModel(registration, op);
//新增使用登记证和设备变更记录
this.saveRecord(registration);
JgRegistrationHistory history = registrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, registration.getApplyNo()).one();
JgRegistrationHistory history = registrationHistoryService.lambdaQuery()
.eq(JgRegistrationHistory::getCurrentDocumentId, registration.getApplyNo())
.eq(JgRegistrationHistory::getIsDelete, false)
.one();
JSONArray historyJson = JSON.parseArray(history.getChangeData());
List<String> ids = historyJson.stream().map(v -> JSON.parseObject(v.toString()).getString("sequenceNbr")).collect(Collectors.toList());
List<JgUseRegistrationManage> list = useRegistrationManageService.lambdaQuery().in(BaseEntity::getSequenceNbr, ids).list();
......@@ -1035,7 +1053,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
* 删除 redis校验重复引用设备的数据
*/
private void delRepeatUseEquipData(String applyNo, String status, String companyCode) {
JgRegistrationHistory history = registrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, applyNo).one();
JgRegistrationHistory history = registrationHistoryService.lambdaQuery()
.eq(JgRegistrationHistory::getCurrentDocumentId, applyNo)
.eq(JgRegistrationHistory::getIsDelete, false)
.one();
// 获取使用登记证列表
JSONArray registrationList = JSON.parseArray(history.getChangeData());
if (CollectionUtils.isEmpty(registrationList)) {
......
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/JgChangeVehicleRegistrationUnitServiceImpl.java
View file @ 13ab63b2
......@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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;
......@@ -27,9 +28,11 @@ import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper;
import com.yeejoin.amos.component.feign.utils.FeignUtil;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
......@@ -89,8 +92,6 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
@Autowired
private JgUseRegistrationManageServiceImpl jgUseRegistrationManageService;
@Autowired
private JgVehicleInformationServiceImpl jgVehicleInformationService;
@Autowired
private JgChangeVehicleRegistrationUnitEqServiceImpl jgChangeVehicleRegistrationUnitEqService;
@Autowired
private RedissonClient redissonClient;
......@@ -103,6 +104,9 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
@Autowired
private IdxBizJgOtherInfoMapper otherInfoMapper;
@Autowired
private IdxBizJgUseInfoMapper jgUseInfoMapper;
private volatile Map<String, Object> fillingMediumMap;
......@@ -421,6 +425,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
LambdaQueryWrapper<JgRegistrationHistory> lambdaSelect = new QueryWrapper<JgRegistrationHistory>().lambda();
lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr));
lambdaSelect.eq(JgRegistrationHistory::getIsDelete, false);
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
JSONObject historyData = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
// 更新代办
......@@ -442,6 +447,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
HashMap<String, Object> param = new HashMap<>();
param.put("USE_UNIT_NAME", jgChangeVehicleRegistrationUnit.getNewUseUnitName());
param.put("USE_UNIT_CREDIT_CODE", jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
// 更新车用气瓶变更登记后，修改气瓶的单位内部编号为车牌号 bug23732
param.put("USE_INNER_CODE", jgChangeVehicleRegistrationUnit.getNewCarNumber());
if (!ObjectUtils.isEmpty(useRegistCode)) {
param.put("USE_ORG_CODE", useRegistCode);
LambdaQueryWrapper<IdxBizJgOtherInfo> eq = new QueryWrapper<IdxBizJgOtherInfo>().lambda().eq(IdxBizJgOtherInfo::getRecord, item);
......@@ -462,7 +469,10 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
.eq(JgUseRegistrationManage::getIsDelete, 0)
.one();
// 业务流水生成
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeVehicleRegistrationUnit.getSequenceNbr()).one();
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery()
.eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeVehicleRegistrationUnit.getSequenceNbr())
.eq(JgRegistrationHistory::getIsDelete, false)
.one();
JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
JSONArray dataList = JSONObject.parseArray(jsonObject.get("dataList").toString());
ArrayList<JgCertificateChangeRecordEq> jgCertificateChangeRecordEqs = new ArrayList<>();
......@@ -519,6 +529,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
if ("1".equals(jgChangeVehicleRegistrationUnit.getChangeType()) && !ObjectUtils.isEmpty(collect)) {
updateEsData(collect, jgChangeVehicleRegistrationUnit, null);
}
// 更新车用气瓶变更登记后，修改气瓶的单位内部编号为车牌号 bug23732
updateCarNumIntoUseInnerCode(jgChangeVehicleRegistrationUnit, collect);
// 修改证管理信息
manage.setUseUnitName(jgChangeVehicleRegistrationUnit.getNewUseUnitName());
manage.setUseUnitCreditCode(jgChangeVehicleRegistrationUnit.getNewUseUnitCreditCode());
......@@ -547,6 +559,13 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
}
private void updateCarNumIntoUseInnerCode(JgChangeVehicleRegistrationUnit jgChangeVehicleRegistrationUnit, List<String> collect) {
LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(IdxBizJgUseInfo::getRecord, collect);
updateWrapper.set(IdxBizJgUseInfo::getUseInnerCode, jgChangeVehicleRegistrationUnit.getNewCarNumber());
jgUseInfoMapper.update(null, updateWrapper);
}
/**
* 生成监管码
*/
......@@ -646,6 +665,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
lambda.eq(JgRegistrationHistory::getCurrentDocumentId, dto.getSequenceNbr());
lambda.eq(JgRegistrationHistory::getRegistrationClass, BUSINESS_NAME);
lambda.eq(JgRegistrationHistory::getIsDelete, false);
Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
if (integer > 0) {
jgRegistrationHistory.setChangeData(JSON.toJSONString(map));
......@@ -767,10 +787,14 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
return Boolean.TRUE;
}
public Map<String, Object> getDetails(String sequenceNbr) {
public Map<String, Object> getDetails(String sequenceNbr, ReginParams selectedOrgInfo) {
JgChangeVehicleRegistrationUnit registrationUnit = this.getById(sequenceNbr);
this.doCompensate(registrationUnit);
JgRegistrationHistory history = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr).eq(JgRegistrationHistory::getRegistrationClass, BUSINESS_NAME).one();
JgRegistrationHistory history = jgRegistrationHistoryService.lambdaQuery()
.eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr)
.eq(JgRegistrationHistory::getRegistrationClass, BUSINESS_NAME)
.eq(JgRegistrationHistory::getIsDelete, false)
.one();
if (!ObjectUtils.isEmpty(history) && !ObjectUtils.isEmpty(history.getChangeData())) {
JSONObject object = JSONObject.parseObject(history.getChangeData());
object.put("sequenceNbr", sequenceNbr);
......@@ -782,6 +806,13 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
} else {
object.put("newCarNumber", registrationUnit.getCarNumber());
}
String companyType = selectedOrgInfo.getCompany().getCompanyType();
if ("个人主体".equals(companyType)) {
object.put("companyType", "person");
} else {
object.put("companyType", "company");
}
object.put("havingPermission", registrationUnit.getNextExecuteUserIds() != null && registrationUnit.getNextExecuteUserIds().contains(RequestContext.getExeUserId()));
return object;
} else {
return new HashMap<>();
......
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 @ 13ab63b2
......@@ -783,7 +783,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
Map<String, Object> resultMap = new HashMap<>();
JgEnableDisable enableDisable = this.getById(sequenceNbr);
this.doCompensate(enableDisable);
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr));
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
.eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr)
.eq(JgRegistrationHistory::getIsDelete, false));
if (jgRegistrationHistory != null) {
JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
resultMap.putAll(jsonObject);
......
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/JgEquipInsuranceServiceImpl.java 0 → 100644
View file @ 13ab63b2
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.alibaba.fastjson.JSONObject;
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.JgEquipInsuranceDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipInsurance;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipInsuranceMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgEquipInsuranceService;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import io.swagger.annotations.ApiParam;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestParam;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 服务实现类
*
* @author LiuLin
* @date 2024-10-17
*/
@Service
public class JgEquipInsuranceServiceImpl extends BaseService<JgEquipInsurance,JgEquipInsurance,JgEquipInsuranceMapper> implements IJgEquipInsuranceService {
@Autowired
private RedisUtils redisUtils;
@Autowired
private CommonServiceImpl commonServiceImpl;
private static final String SECOND = "second";
private static final String DEVICE_LIST = "deviceList";
/**
* 分页查询
*/
public Page<JgEquipInsuranceDto> queryForJgEquipInsurancePage(Page<JgEquipInsurance> page,
@ApiParam(value = "排序字段") @RequestParam(value = "sort", required = false) String sort,
JgEquipInsuranceDto dto) {
SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
return this.baseMapper.getListPage(page, sortMap, dto);
}
/**
* 列表查询 示例
*/
public List<JgEquipInsurance> queryForJgEquipInsuranceList() {
return this.queryForList("" , false);
}
@Transactional(rollbackFor = Exception.class)
public Object save(JSONObject map) {
// 从 Redis 中获取 ReginParams 对象
ReginParams reginParams = JSONObject.parseObject(
redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(),
ReginParams.class
);
// 解析 secondMap 和设备保险信息
JSONObject secondMap = map.getJSONObject("second");
JgEquipInsurance equipInsurance = map.getObject(SECOND, JgEquipInsurance.class);
// 获取设备列表并进行校验
List<Map> deviceList = secondMap.getJSONArray(DEVICE_LIST).toJavaList(Map.class);
if (CollectionUtils.isEmpty(deviceList)) {
throw new BadRequest("请选择设备信息!");
}
// 使用流创建新的保险对象列表并保存
return this.saveBatch(
deviceList.stream()
.map(x -> {
JgEquipInsurance newInsurance = new JgEquipInsurance();
BeanUtils.copyProperties(equipInsurance, newInsurance);
newInsurance.setEquId(String.valueOf(x.get("record")));
newInsurance.setEquList(String.valueOf(x.get("EQU_LIST_CODE")));
newInsurance.setEquCategory(String.valueOf(x.get("EQU_CATEGORY_CODE")));
newInsurance.setEquDefine(String.valueOf(x.get("EQU_DEFINE_CODE")));
newInsurance.setRecUserId(reginParams.getUserModel().getUserId());
newInsurance.setRecUserName(reginParams.getUserModel().getUserName());
newInsurance.setRecDate(new Date());
newInsurance.setIsDelete(false);
return newInsurance;
})
.collect(Collectors.toList())
);
}
public JgEquipInsuranceDto getDetail(Long sequenceNbr) {
return this.getBaseMapper().getDetailById(sequenceNbr);
}
}
\ No newline at end of file
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 @ 13ab63b2
......@@ -1689,7 +1689,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
list.forEach(item -> {
// 设备信息
List<JgInstallationNoticeEq> equList = jgInstallationNoticeEqService.lambdaQuery().eq(JgInstallationNoticeEq::getEquipTransferId, item.getSequenceNbr()).list();
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, item.getSequenceNbr()).one();
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.lambdaQuery()
.eq(JgRegistrationHistory::getCurrentDocumentId, item.getSequenceNbr())
.eq(JgRegistrationHistory::getIsDelete, false)
.one();
if (!ObjectUtils.isEmpty(jgRegistrationHistory) && !ObjectUtils.isEmpty(jgRegistrationHistory.getChangeData())) {
List<String> ids = equList.stream().map(JgInstallationNoticeEq::getEquId).collect(Collectors.toList());
Iterable<ESEquipmentCategoryDto> equips = esEquipmentCategory.findAllById(ids);
......
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/JgMaintenanceContractServiceImpl.java
View file @ 13ab63b2
......@@ -697,11 +697,13 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
LambdaQueryWrapper<JgMaintenanceContractEq> lambda = new QueryWrapper<JgMaintenanceContractEq>().lambda();
lambda.eq(JgMaintenanceContractEq::getEquipTransferId, id);
List<JgMaintenanceContractEq> list = jgMaintenanceContractEqService.getBaseMapper().selectList(lambda);
ArrayList<IdxBizJgMaintenanceRecordInfo> data = new ArrayList<>();
List<IdxBizJgMaintenanceRecordInfo> maintenanceRecordInfoList = new ArrayList<>();
// 循环设备
list.forEach(item -> {
IdxBizJgMaintenanceRecordInfo info = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(item.getEquId());
if (!ObjectUtils.isEmpty(info)) {
IdxBizJgMaintenanceRecordInfo info = new IdxBizJgMaintenanceRecordInfo();
info.setRecord(item.getEquId());
info.setRecDate(new Date());
info.setRecUserId(RequestContext.getExeUserId());
info.setMeUnitName(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitName()) ? null : jgMaintenanceContract.getMaintenanceUnitName());
info.setMeUnitCreditCode(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitCode()) ? null : jgMaintenanceContract.getMaintenanceUnitCode());
info.setMeMaster(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOneName()) ? null : jgMaintenanceContract.getMaintenanceManagerOneName());
......@@ -713,11 +715,10 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
info.setInformStart(ObjectUtils.isEmpty(jgMaintenanceContract.getInformStart()) ? null : jgMaintenanceContract.getInformStart());
info.setInformEnd(ObjectUtils.isEmpty(jgMaintenanceContract.getInformEnd()) ? null : jgMaintenanceContract.getInformEnd());
info.setRepairInform(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceContract()) ? null : jgMaintenanceContract.getMaintenanceContract());
data.add(info);
}
maintenanceRecordInfoList.add(info);
});
idxBizJgMaintenanceRecordInfoService.updateBatchById(data);
emqKeeper.getMqttClient().publish(SafetyProblemTypeEnum.WBBA.getTopic(), JSON.toJSONBytes(data), 2, false);
idxBizJgMaintenanceRecordInfoService.saveBatch(maintenanceRecordInfoList);
emqKeeper.getMqttClient().publish(SafetyProblemTypeEnum.WBBA.getTopic(), JSON.toJSONBytes(maintenanceRecordInfoList), 2, false);
}
......
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/JgScrapCancelServiceImpl.java
View file @ 13ab63b2
......@@ -774,7 +774,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
Map<String, Object> beanMap = BeanUtil.beanToMap(scrapCancel, false, true);
beanMap.put("cancelCertificateList", JSON.parse(scrapCancel.getCancelCertificate()));
beanMap.put("otherAccessories", JSON.parse(scrapCancel.getOtherAccessories()));
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr));
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
.eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr)
.eq(JgRegistrationHistory::getIsDelete, false));
// 根据不同类型返回不同的字段、用于台套设备、气瓶、车用气瓶
if (jgRegistrationHistory != null) {
JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
......
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 @ 13ab63b2
......@@ -1011,6 +1011,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
LambdaQueryWrapper<JgRegistrationHistory> lambda = new QueryWrapper<JgRegistrationHistory>().lambda();
lambda.eq(JgRegistrationHistory::getCurrentDocumentId, seq);
lambda.eq(JgRegistrationHistory::getIsDelete, false);
Integer integer = jgRegistrationHistoryService.getBaseMapper().selectCount(lambda);
if (integer > 0) {
jgRegistrationHistory.setChangeData(JSON.toJSONString(json));
......
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/JgUseRegistrationManageServiceImpl.java
View file @ 13ab63b2
......@@ -600,13 +600,13 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
return useFlagParamDto;
}
public void setInspectField(String record, UseFlagParamDto useFlagParamDto) {
private void setInspectField(String record, UseFlagParamDto useFlagParamDto) {
Map<String, Object> inspectDetail = jgUseRegistrationMapper.getInspectDetail(record, null);
useFlagParamDto.setInspectionUnitName(inspectDetail.get("inspectOrgName") == null ? "" : inspectDetail.get("inspectOrgName").toString());
useFlagParamDto.setNextInspectionDate(inspectDetail.get("nextInspectDate") == null ? null : (Date) inspectDetail.get("nextInspectDate"));
}
public void setMainInfoField(String record, UseFlagParamDto useFlagParamDto) {
private void setMainInfoField(String record, UseFlagParamDto useFlagParamDto) {
IdxBizJgMaintenanceRecordInfo idxBizJgMaintenanceRecordInfo = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(record);
useFlagParamDto.setEmergencyTel(this.buildEmergencyTel(idxBizJgMaintenanceRecordInfo));
......
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/JgVehicleInformationServiceImpl.java
View file @ 13ab63b2
......@@ -573,9 +573,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
* 查看详情
*
* @param sequenceNbr sequenceNbr
* @param selectedOrgInfo
* @return JgVehicleInformationModel
*/
public JgVehicleInformationVo queryBySequenceNbr(Long sequenceNbr) {
public JgVehicleInformationVo queryBySequenceNbr(Long sequenceNbr, ReginParams selectedOrgInfo) {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
JgVehicleInformationVo vo = new JgVehicleInformationVo();
JgVehicleInformationDto dto = this.baseMapper.queryBySequenceNbr(sequenceNbr);
......@@ -680,6 +681,13 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
vo.setOldUseRegistrationTable(JSONArray.parseArray(useInfo.getOldUseRegistrationTable()));
vo.setOldUseRegistrationCertificate(JSONArray.parseArray(useInfo.getOldUseRegistrationCertificate()));
}
String companyType = selectedOrgInfo.getCompany().getCompanyType();
if ("个人主体".equals(companyType)) {
vo.setCompanyType("person");
} else {
vo.setCompanyType("company");
}
vo.setHavingPermission(dto.getNextExecuteUserIds() != null && dto.getNextExecuteUserIds().contains(RequestContext.getExeUserId()));
return vo;
}
......@@ -837,6 +845,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
LambdaQueryWrapper<JgRegistrationHistory> lambdaSelect = new QueryWrapper<JgRegistrationHistory>().lambda();
lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr));
lambdaSelect.eq(JgRegistrationHistory::getIsDelete, false);
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
String jsonData = jgRegistrationHistory.getChangeData();
JSONArray jsonArray = JSONArray.parseArray(jsonData);
......@@ -1596,9 +1605,6 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
}
private void generateRegistrationManage(JgVehicleInformation jgVehicleInformation, IdxBizJgRegisterInfo registerInfo) {
// 使用单位信息
Map<String, Object> enterpriseInfo = commonService.getEnterpriseInfo(jgVehicleInformation.getUseUnitCreditCode());
//
Map<String, String> equType = new HashMap<>();
equType.put("equList", this.baseMapper.getEquCategoryNameByCode(registerInfo.getEquList()));
equType.put("equListCode", registerInfo.getEquList());
......@@ -1628,7 +1634,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
jgUseRegistrationManage.setCreateDate(jgVehicleInformation.getRecDate());
jgUseRegistrationManage.setEquUseAddress("");
jgUseRegistrationManage.setManageType("unit");
jgUseRegistrationManage.setUseUnitAddress(!ValidationUtil.isEmpty(enterpriseInfo) ? (String) enterpriseInfo.get("address") : "");
jgUseRegistrationManage.setUseUnitAddress(jgVehicleInformation.getUseUnitAddress());
jgUseRegistrationManage.setUseRegistrationCode(jgVehicleInformation.getUseRegistrationCode());
jgUseRegistrationManage.setUseUnitCreditCode(jgVehicleInformation.getUseUnitCreditCode());
jgUseRegistrationManage.setReceiveCompanyCode(jgVehicleInformation.getReceiveCompanyCode());
......@@ -1744,6 +1750,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
if (used){
throw new BadRequest("使用登记证编号已存在！");
}
//使用登记证编号判断是否使用未来系统生成编号
idxBizJgRegisterInfoService.checkUseRegistrationCode(useRegistrationCode1,"vehicle");
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
JgVehicleInformationDto vehicleInfoDto = JSON.parseObject(JSON.toJSONString(map), JgVehicleInformationDto.class);
......
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/TouchRuleEventListener.java
View file @ 13ab63b2
......@@ -41,9 +41,9 @@ public class TouchRuleEventListener implements ApplicationListener<TouchRuleEven
private void touchRuleWithApi(InspectionEquipInfo inspectionEquipInfo) {
try {
RequestContext.setToken(amosRequestContext.getToken());
RequestContext.setAppKey(amosRequestContext.getAppKey());
RequestContext.setProduct(amosRequestContext.getProduct());
RequestContext.setToken(amosRequestContext.getToken());
HashMap<String, byte[]> factMap = new HashMap<>();
List<Object> factList = new ArrayList<>();
factList.add(inspectionEquipInfo);
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java
View file @ 13ab63b2
......@@ -19,6 +19,7 @@ import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
import com.yeejoin.amos.boot.module.common.api.enums.JYJCBusinessTypeEnum;
import com.yeejoin.amos.boot.module.jyjc.api.entity.*;
import com.yeejoin.amos.boot.module.jyjc.api.enums.*;
import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
......@@ -1242,7 +1243,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
String test = QueryParser.escape(map.getString("USE_INNER_CODE"));
boolMust.must(QueryBuilders.matchPhraseQuery("USE_INNER_CODE", test));
}
this.setFilterOfInFlowing(boolMust);
this.setFilterOfInFlowing(boolMust, map.getString("EQU_LIST_CODE"), map.getString("inspectionType"));
builder.query(boolMust);
builder.sort("REC_DATE", SortOrder.DESC);
builder.from((pageNumber - 1) * size);
......@@ -1282,15 +1283,18 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
*
* @param boolMust 条件
*/
private void setFilterOfInFlowing(BoolQueryBuilder boolMust) {
private void setFilterOfInFlowing(BoolQueryBuilder boolMust,String equListCode, String inspectionType) {
Set<String> records = this.getEquipInFlowing();
if (records != null && !records.isEmpty()) {
boolMust.mustNot(QueryBuilders.termsQuery("SEQUENCE_NBR.keyword", records));
}
// 只有纳管的设备才能做业务 TODO
boolMust.must(QueryBuilders.existsQuery("IS_INTO_MANAGEMENT"));
if ("5000".equals(equListCode) && JYJCBusinessTypeEnum.SCJY.getCode().equals(inspectionType)) {
boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", false));
} else {
boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
}
boolMust.must(QueryBuilders.existsQuery("IS_INTO_MANAGEMENT"));
}
private Set<String> getEquipInFlowing() {
return this.getBaseMapper().queryRecordInFlowing();
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/JGStatisticsMapper.xml
View file @ 13ab63b2
......@@ -323,7 +323,7 @@
FROM
tzs_jg_use_registration T
WHERE
T.status = '已完成'
T.status = '已完成' and T.is_delete = 0
AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
</select>
<select id="over15yearsCount" resultType="java.lang.Long">
......@@ -337,6 +337,8 @@
thur.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
AND thur.audit_pass_date &lt; #{time}
AND ibjri."EQU_LIST" = '3000'
AND ibjri.is_delete = 0
AND thur.is_delete = 0
</select>
<select id="constructionNoticeCount" resultType="java.lang.Long">
SELECT SUM
......@@ -666,7 +668,7 @@
FROM
tzs_jg_use_registration T
WHERE
T.audit_status = '已完成'
T.audit_status = '已完成' and T.is_delete = 0
and T.receive_company_org_code like concat(#{orgCode}, '%')
<if test="dto.beginDate !=null and dto.beginDate !=''">
and date_ge(CAST(T.reg_date as date),#{dto.beginDate})
......@@ -1138,7 +1140,7 @@
LEFT JOIN idx_biz_jg_register_info ri ON tne.equ_id = ri.RECORD
WHERE
receive_company_org_code like CONCAT(#{orgCode}, '%')
and tjur.status != '已作废'
and tjur.status != '已作废' and tjur.is_delete = 0
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if>
......@@ -1850,7 +1852,7 @@
LEFT JOIN idx_biz_jg_register_info ri ON tne.equ_id = ri.RECORD
WHERE
receive_company_org_code like CONCAT(#{orgCode}, '%')
and tjur.status != '已作废'
and tjur.status != '已作废' and tjur.is_delete = 0
<if test="dto.beginDate != null and dto.beginDate != ''">
and date_ge(CAST(audit_pass_date as date),#{dto.beginDate})
</if>
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/YJDPStatisticsServiceImpl.java
View file @ 13ab63b2
......@@ -658,7 +658,7 @@ public class YJDPStatisticsServiceImpl {
SearchSourceBuilder builder = new SearchSourceBuilder();
builder.query(boolMust);
request.source(builder);
List<JSONObject> list;
List<JSONObject> list = null;
Set<String> useUnitCreditCodeSet = Sets.newHashSet();
try {
SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
......@@ -667,7 +667,9 @@ public class YJDPStatisticsServiceImpl {
JSONObject source = jsonObject.getJSONObject("sourceAsMap");
useUnitCreditCodeSet.add(source.getString("USE_UNIT_CREDIT_CODE"));
}
if (!ValidationUtil.isEmpty(useUnitCreditCodeSet)) {
list = alertStatisticsMapper.getUseUnitByCreditCode(useUnitCreditCodeSet);
}
} catch (IOException e) {
throw new RuntimeException(e);
}
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/BasePersonRegisterDto.java
View file @ 13ab63b2
package com.yeejoin.amos.boot.module.tcm.api.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.List;
/**
......@@ -29,11 +27,9 @@ public class BasePersonRegisterDto extends BaseDto {
@ApiModelProperty(value = "真实姓名")
private String realName;
@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty(value = "有效期开始")
private Date expirationDateStart;
private String expirationDateStart;
@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty(value = "有效期结束")
private String expirationDateEnd;
......@@ -41,7 +37,6 @@ public class BasePersonRegisterDto extends BaseDto {
private String expirationDateType;
@ApiModelProperty(value = "单位名称")
private String name;
......@@ -85,8 +80,6 @@ public class BasePersonRegisterDto extends BaseDto {
@ApiModelProperty(value = "管理员身份证号")
private String adminIdNumber;
// @ApiModelProperty(value = "个人基本信息")
// private TzsBaseIndividualityDto baseIndividualityDto;
@ApiModelProperty(value = "平台公司id,平台创建公司后更新")
private String amosCompanySeq;
......@@ -94,4 +87,7 @@ public class BasePersonRegisterDto extends BaseDto {
@ApiModelProperty(value = "平台用户id,平台创建用户后更新")
private String adminUserId;
@ApiModelProperty(value = "住所")
private String address;
}
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/ThreeSystemsServiceImpl.java
View file @ 13ab63b2
......@@ -305,7 +305,7 @@ public class ThreeSystemsServiceImpl extends BaseService<ThreeSystemsDto, ThreeS
}
nowDayThreeSystemsDto.setRecDate(new Date());
nowDayThreeSystemsDto.setRecUserId(amosRequestContext.getUserId());
// nowDayThreeSystemsDto.setRecUserId(amosRequestContext.getUserId());
nowDayThreeSystemsDto.setRecUserName(amosRequestContext.getUserName());
nowDayThreeSystemsDto.setIsDelete(false);
......
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/TzsBaseIndividualityServiceImpl.java
View file @ 13ab63b2
......@@ -75,6 +75,7 @@ public class TzsBaseIndividualityServiceImpl extends BaseService<TzsBaseIndividu
companyInfo.setCompanyName(dto.getCredentialsNum() + "_" + dto.getRealName());
companyInfo.setCompanyCode(dto.getUnitCode());
companyInfo.setCompanyType(unitType);
companyInfo.setAddress(dto.getAddress());
try {
FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.create(companyInfo);
if (companyResult == null || companyResult.getResult() == null) {
......
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 @ 13ab63b2
......@@ -399,6 +399,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
if (type.equals(EnterpriseEnums.GR_ZT.getType())) {
baseEnterpriseInfo.setUseUnitCode(regUnitInfo.getUnitCode().split("_")[1]);
baseEnterpriseInfo.setAddress(regUnitInfo.getAddress());
} else {
baseEnterpriseInfo.setOfficeRegion(regUnitInfo.getOfficeRegion());
baseEnterpriseInfo.setOfficeAddress(regUnitInfo.getOfficeAddress());
......
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/UnitInfoServiceImpl.java
View file @ 13ab63b2
......@@ -19,7 +19,7 @@ import com.yeejoin.amos.boot.module.tcm.api.common.BizCommonConstant;
import com.yeejoin.amos.boot.module.tcm.api.dto.WechatMessageDto;
import com.yeejoin.amos.boot.module.tcm.api.entity.WechatRelation;
import com.yeejoin.amos.boot.module.tcm.api.enums.TzsCommonParam;
import com.yeejoin.amos.boot.module.tcm.biz.service.impl.TzsAuthServiceImpl;
import com.yeejoin.amos.boot.module.tcm.biz.service.impl.StartPlatformTokenService;
import com.yeejoin.amos.boot.module.tcm.biz.service.impl.WechatRelationServiceImpl;
import com.yeejoin.amos.boot.module.tcm.biz.service.impl.WechatServiceImpl;
import com.yeejoin.amos.boot.module.tcm.biz.utils.JsonUtils;
......@@ -73,7 +73,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
private Resource stepRegin;
@Autowired
private TzsAuthServiceImpl tzsAuthServiceImpl;
private StartPlatformTokenService platformTokenService;
@Autowired
ISourceFileService ISourceFileService;
......@@ -115,7 +115,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
@Transactional
public UnitInfoDto saveUnitInfo(UnitInfoDto model) {
tzsAuthServiceImpl.setRequestContext();
platformTokenService.setRequestContext();
model.setUnitStatus(0);// 设置为待审核状态
model.setSubmitTime(new Date()); // 提交时间
model.setIsChange(false);// 新增状态不是变更状态
......@@ -650,7 +650,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
@Override
public Collection<RegionModel> getRegionTree(Long parentId, String isNationwide) {
tzsAuthServiceImpl.setRequestContext();
platformTokenService.setRequestContext();
Collection<RegionModel> result = null;
if(parentId == null) {
result = this.getAllRegionTree(isNationwide);
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/EquipmentCategoryMapper.java
View file @ 13ab63b2
......@@ -23,6 +23,10 @@ import java.util.Map;
@Mapper
public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
@Select("SELECT * FROM tz_equipment_category WHERE code NOT LIKE '7%' ORDER BY parent_id")
List<EquipmentCategoryDto> selectClassifyNoStart7();
@Select("select * from tz_equipment_category where code in('1000','2000','3000','4000','5000','6000','8000','9000')")
List<EquipmentCategoryDto> selectClassify();
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/TzBaseEnterpriseInfoMapper.java
View file @ 13ab63b2
......@@ -94,4 +94,6 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
List<TzBaseEnterpriseInfoDto> queryByUseCode(@Param("useCodes") List<String> useCode);
List<TzBaseEnterpriseInfoDto> selectExpiringUnits(@Param("operator")String operator);
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/TzsUserInfoMapper.java
View file @ 13ab63b2
......@@ -7,7 +7,6 @@ import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
......@@ -17,4 +16,6 @@ public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> {
Long countUserByPostAndAreaCode(@Param("orgCode") String orgCode, @Param("post") String post, @Param("regionCode") String regionCode);
List<TzsUserPermissionDto> queryPermissionByUserSeq(@Param("userSeq") Long userSeq, @Param("permissionPost") String permissionPost);
List<TzsUserInfoDto> selectUserPermission(@Param("operator") String operator, @Param("posts") List<String> posts);
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml
View file @ 13ab63b2
......@@ -325,4 +325,14 @@
</foreach>
</if>
</select>
<select id="selectExpiringUnits" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto">
SELECT tbei.*
FROM tz_base_unit_licence tbul
JOIN tz_base_enterprise_info tbei ON tbul.unit_Code = tbei.use_unit_code
WHERE 1 = 1
<if test="operator != null and operator !='' ">
AND tbul.expiry_date ${operator} CURRENT_DATE
</if>
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzsUserInfoMapper.xml
View file @ 13ab63b2
......@@ -71,4 +71,19 @@
user_seq = #{userSeq}
and permission_post like concat(#{permissionPost}, '%')
</select>
<select id="selectUserPermission" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto">
SELECT tup.expiry_date, tui.phone, tui.rec_user_name
FROM tzs_user_permission tup
JOIN tzs_user_info tui ON tup.user_seq = tui.sequence_nbr
WHERE 1 = 1
<if test="operator != null and operator !='' ">
AND tup.expiry_date ${operator} CURRENT_DATE
</if>
AND (
<foreach collection="posts" item="post" separator=" OR ">
tui.new_post LIKE CONCAT('%', #{post}, '%')
</foreach>
)
</select>
</mapper>
\ No newline at end of file
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 @ 13ab63b2
......@@ -175,6 +175,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
private static final String LEVEL = "company";
private static final String EQUSTATE = "EQU_STATE";
private static final String USEPLACE = "USE_PLACE";
private static final String REC_DATE = "REC_DATE";
@Autowired
ESEquipmentCategory esEquipmentCategory;
@Autowired
......@@ -2159,13 +2160,20 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
boolMust.must(meBuilder);
}
builder.query(boolMust);
builder.sort("REC_DATE", SortOrder.DESC);
builder.sort("REC_DATE", Optional.ofNullable(map.getString("sort"))
.map(s -> s.split(","))
.filter(sortParams -> "ascend".equals(sortParams[1]))
.map(s -> SortOrder.ASC)
.orElse(SortOrder.DESC));
builder.from((map.getInteger("number") - 1) * map.getInteger("size"));
builder.size(map.getInteger("size"));
request.source(builder);
List<JSONObject> list = new LinkedList<>();
long totle = 0;
try {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
for (org.elasticsearch.search.SearchHit hit : response.getHits().getHits()) {
System.out.println(hit);
......@@ -2176,6 +2184,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
String status = EquimentEnum.getName.get(integer);
dto2.put(EQUSTATE, status);
}
dto2.put(REC_DATE, dateFormat.format(dto2.get(REC_DATE)));
list.add(dto2);
}
totle = response.getInternalResponse().hits().getTotalHits().value;
......
amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/enums/MaintenanceExpiredEarlyWarningEnum.java 0 → 100644
View file @ 13ab63b2
package com.yeejoin.amos.boot.module.ys.api.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Optional;
/**
* <pre>
* 维保到期预警枚举
* </pre>
*/
@Getter
@AllArgsConstructor
public enum MaintenanceExpiredEarlyWarningEnum {
// 设备
QP("2300", "气瓶", "cylinderMaintenanceExpiredEarlyWarning"),
QZJX("4000", "起重机械", "liftingMachineryMaintenanceExpiredEarlyWarning"),
KYSD("9000", "客运索道", "passengerRopeWayMaintenanceExpiredEarlyWarning"),
YLSS("6000", "游乐设施", "amusementFacilitiesMaintenanceExpiredEarlyWarning"),
GL("1000", "锅炉", "boilerMaintenanceExpiredEarlyWarning"),
YLGD("8000", "压力管道", "pressurePipeMaintenanceExpiredEarlyWarning"),
CNJDCL("5000", "场内机动车辆", "yardMotorVehicleMaintenanceExpiredEarlyWarning"),
// 体系建设统计
TXJS("0001", "体系建设", "systemConstructionStatistics"),
// 教育培训统计
JYPX("0002", "教育培训", "educationAndTrainingStatistics");
private String typeCode; // 设备类型代码 || 业务类型代码
private String typeName; // 设备类型名称
private String groupCode; // 分组代码
/**
* 根据设备类型代码获取对应的枚举实例。
*
* @param equTypeCode 设备类型代码
* @return 对应的枚举实例，如果不存在则返回 Optional.empty()
*/
public static Optional<MaintenanceExpiredEarlyWarningEnum> getEnum(String equTypeCode) {
for (MaintenanceExpiredEarlyWarningEnum status : MaintenanceExpiredEarlyWarningEnum.values()) {
if (status.getTypeCode().equals(equTypeCode)) {
return Optional.of(status);
}
}
return Optional.empty();
}
@Override
public String toString() {
return String.format("MaintenanceExpiredEarlyWarningEnum{equTypeCode='%s', equTypeName='%s', groupCode='%s'}",
typeCode, typeName, groupCode);
}
}
amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/controller/CommonController.java
View file @ 13ab63b2
......@@ -3,12 +3,19 @@ package com.yeejoin.amos.boot.module.ys.biz.controller;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.ys.biz.service.CommonService;
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.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
/**
*
* @author system_generator
* @date 2024-09-24
*/
......@@ -20,10 +27,14 @@ public class CommonController extends BaseController {
@Autowired
private CommonService commonService;
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @ApiOperation(httpMethod = "GET",value = "模板下载", notes = "模板下载")
// @RequestMapping(value = "/templateDownload", method = RequestMethod.GET)
// public void queryForPage(HttpServletResponse response, @RequestParam(value = "path") String path) {
// commonService.templateDownload(response,path);
// }
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "应急保障四项统计", notes = "应急保障四项统计")
@RequestMapping(value = "/emergencySupportStatistics/{businessType}/{componentType}", method = RequestMethod.GET)
public ResponseModel<Object> queryForPage(
@ApiParam(value = "业务类型（教育培训：education、体系建设：construct、应急演练：rehearsal、应急预案：prePlan）", required = true)
@PathVariable(value = "businessType") String businessType,
@ApiParam(value = "组件类型（饼图：pieChart、富文本：richText）", required = true)
@PathVariable(value = "componentType") String componentType) {
return ResponseHelper.buildResponse(commonService.emergencySupportStatistics(businessType, componentType));
}
}
amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/controller/MaintenanceEarlyWarningController.java 0 → 100644
View file @ 13ab63b2
package com.yeejoin.amos.boot.module.ys.biz.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormInstanceServiceImpl;
import com.yeejoin.amos.boot.module.ys.api.enums.MaintenanceExpiredEarlyWarningEnum;
import com.yeejoin.amos.boot.module.ys.biz.service.impl.CommonServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @author system_generator
* @date 2024-09-24
*/
@RestController
@Api(tags = "维保过期预警分析")
@RequestMapping(value = "/maintenanceEarlyWarningWarning/{equTypeCode}")
public class MaintenanceEarlyWarningController extends BaseController {
private static final String SXCode = "50";
private static final HashMap<String, String> unitTypeMap = new HashMap<>();
@Autowired
private DynamicFormInstanceServiceImpl dynamicFormInstanceService;
@Autowired
private CommonServiceImpl commonService;
static {
unitTypeMap.put("useUnit", "使用单位");
}
/**
* 从URL中获取对应的 MaintenanceExpiredEarlyWarningEnum 枚举
*
* @param equTypeCode 设备类型代码
* @return 对应的 MaintenanceExpiredEarlyWarningEnum 枚举
* @throws BadRequest 如果设备类型代码无效
*/
public MaintenanceExpiredEarlyWarningEnum getWaringEnumsForPath(String equTypeCode) {
return MaintenanceExpiredEarlyWarningEnum.getEnum(equTypeCode)
.orElseThrow(() -> new BadRequest("Invalid equipment type code: " + equTypeCode));
}
/**
* 新增或者更新接口
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/saveOrUpdate")
@ApiOperation(httpMethod = "POST", value = "新增或者更新接口", notes = "新增或者更新接口")
public ResponseModel<Object> saveOrUpdate(
@PathVariable(value = "equTypeCode") String equTypeCode,
@RequestBody Map<String, Object> model) {
String groupCode = getWaringEnumsForPath(equTypeCode).getGroupCode();
String instanceId = (String) model.get("instanceId");
try {
// 判断是更新还是新增操作
if (!ValidationUtil.isEmpty(instanceId)) {
// 更新操作：先删除再保存
LambdaQueryWrapper<DynamicFormInstance> lambda =
new QueryWrapper<DynamicFormInstance>().lambda();
lambda.eq(DynamicFormInstance::getInstanceId, instanceId);
dynamicFormInstanceService.getBaseMapper().delete(lambda);
}
// 保存新实例或更新后的实例
// 兼容附件格式新
model.keySet().stream()
.filter(key -> key.endsWith("file") || key.endsWith("File"))
.forEach(key -> model.put(key, JSONObject.toJSONString(model.get(key))));
dynamicFormInstanceService.commonSave(groupCode, model);
return ResponseHelper.buildResponse(instanceId != null
? Long.parseLong(instanceId)
: Long.MIN_VALUE);
} catch (Exception e) {
return ResponseHelper.buildResponse("Error saving or updating instance: " + e.getMessage());
}
}
/**
* 根据sequenceNbr删除
*
* @param instanceId 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/deleteBySeq")
@ApiOperation(httpMethod = "DELETE", value = "根据instanceId删除", notes = "根据sequenceNbr删除")
public ResponseModel<Integer> deleteBySeq(@RequestParam(value = "instanceId") String instanceId) {
LambdaQueryWrapper<DynamicFormInstance> lambda = new QueryWrapper<DynamicFormInstance>().lambda();
lambda.eq(DynamicFormInstance::getInstanceId, instanceId);
return ResponseHelper.buildResponse(dynamicFormInstanceService.getBaseMapper().delete(lambda));
}
/**
* 根据sequenceNbr查询
*
* @param instanceId 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/detailBySeq")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<Map<String, Object>> detailBySeq(@PathVariable(value = "equTypeCode") String equTypeCode,
@RequestParam(value = "instanceId") Long instanceId) {
String groupCode = getWaringEnumsForPath(equTypeCode).getGroupCode();
Map<String, Object> oneMap = dynamicFormInstanceService.getOneMap(instanceId, groupCode);
// 兼容附件格式返回
oneMap.keySet().stream()
.filter(key -> key.endsWith("file") || key.endsWith("File"))
.forEach(key -> oneMap.put(key, JSONObject.parseArray((String) oneMap.get(key))));
return ResponseHelper.buildResponse(oneMap);
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
public ResponseModel<IPage<Map<String, Object>>> queryForPage(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
@PathVariable(value = "equTypeCode") String equTypeCode) {
MaintenanceExpiredEarlyWarningEnum enums = getWaringEnumsForPath(equTypeCode);
IPage<Map<String, Object>> mapIPage = dynamicFormInstanceService.pageList(current, size, enums.getGroupCode());
List<Map<String, Object>> records = mapIPage.getRecords();
List<Map<String, Object>> collect = records.stream().peek(item -> {
String useCompany = (String) item.get("useCompany");
String unitType = (String) item.get("unitType");
if (!ValidationUtil.isEmpty(useCompany)){
item.put("useCompany", useCompany.split("_")[1]);
}
if (!ValidationUtil.isEmpty(unitType)){
item.put("equType", enums.getTypeName());
}
item.put("unitType", unitTypeMap.get(unitType));
}).collect(Collectors.toList());
mapIPage.setRecords(collect);
return ResponseHelper.buildResponse(mapIPage);
}
/**
* 图标统计数量
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/statistics")
@ApiOperation(httpMethod = "GET", value = "图标统计数量", notes = "图标统计数量")
public ResponseModel<JSONObject> statistics(@PathVariable(value = "equTypeCode") String equTypeCode) {
MaintenanceExpiredEarlyWarningEnum enums = getWaringEnumsForPath(equTypeCode);
// 问题设备数
long numberOfProblemEqu = dynamicFormInstanceService.pageList(1, 2, enums.getGroupCode()).getTotal();
// 气瓶总设备数
long numberOfCylinder = commonService.staticsCenterMapCountDataForCylinder(SXCode);
// 各类型设备总数
long totalNumberOfEqu;
if (enums.getTypeCode().equals("2300")) {
totalNumberOfEqu = numberOfCylinder;
} else {
totalNumberOfEqu = commonService.staticsCenterMapCountDataForEquip(enums.getTypeCode(), numberOfCylinder, SXCode);
}
return ResponseHelper.buildResponse(new JSONObject()
.fluentPut("numberOfProblemEqu", numberOfProblemEqu)
.fluentPut("totalNumberOfEqu", totalNumberOfEqu));
}
}
amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/controller/TreeToListController.java 0 → 100644
View file @ 13ab63b2
package com.yeejoin.amos.boot.module.ys.biz.controller;
import com.alibaba.fastjson.JSON;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
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.ys.biz.feign.PrivilegeFeginService;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
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 java.util.*;
import java.util.stream.Collectors;
/**
* @author chang xiangyu
* @date 2024-09-24
*/
@RestController
@Api(tags = "TreeToList")
@RequestMapping(value = "/tree-to-list")
public class TreeToListController extends BaseController {
private static final String REGULATOR_UNIT_TREE = "REGULATOR_UNIT_TREE";
@Autowired
RedisUtils redisUtils;
@Autowired
private PrivilegeFeginService privilegeFeginService;
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getTreeToList")
@ApiOperation(httpMethod = "GET", value = "根据当前登录人获取监管机构平铺列表数据", notes = "根据当前登录人获取监管机构平铺列表数据")
public ResponseModel<Object> getTreeChildList(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size) {
// 获取结果数据
ArrayList<LinkedHashMap> resultLinkedHashMapList = getResultList();
// 分页
int start = (current - 1) * size;
int end = Math.min(start + size, resultLinkedHashMapList.size());
List<LinkedHashMap> pageData = resultLinkedHashMapList.subList(start, end);
Page page = new Page(resultLinkedHashMapList.size(), current, (int) Math.ceil((double) resultLinkedHashMapList.size() / size), size, pageData, true);
return ResponseHelper.buildResponse(page);
}
/**
* 过滤数据
*
* @param resultList
* @param linkedHashMap
*/
private static void clearSafeMap(ArrayList<LinkedHashMap> resultList, LinkedHashMap linkedHashMap,String regionName) {
LinkedHashMap<String, String> safeLinkedHashMap = new LinkedHashMap<>();
safeLinkedHashMap.put("companyName", (String) linkedHashMap.get("companyName"));
safeLinkedHashMap.put("agencyCode", (String) linkedHashMap.get("agencyCode"));
safeLinkedHashMap.put("companyCode", (String) linkedHashMap.get("companyCode"));
safeLinkedHashMap.put("sequenceNbr", (String) linkedHashMap.get("sequenceNbr"));
safeLinkedHashMap.put("parentId", (String) linkedHashMap.get("parentId"));
safeLinkedHashMap.put("regionName",regionName);
resultList.add(safeLinkedHashMap);
}
/**
* @return 返回最终数据对象
*/
private ArrayList<LinkedHashMap> getResultList() {
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
if (ObjectUtils.isEmpty(reginParams)) {
return null;
}
Long id = reginParams.getCompany().getSequenceNbr();
List<LinkedHashMap> data = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE);
ArrayList<LinkedHashMap> result = new ArrayList<>();
List<LinkedHashMap> linkedHashMaps = screenData(result, data, id.toString());
//getFinallyResult
ArrayList<LinkedHashMap> resultLinkedHashMapList = mapToDeepList(linkedHashMaps);
return resultLinkedHashMapList;
}
public List<LinkedHashMap> screenData(List<LinkedHashMap> result, List<LinkedHashMap> data, String id) {
if (!ObjectUtils.isEmpty(result)) {
return result;
}
List<LinkedHashMap> list = data.stream().filter(item -> item.get("sequenceNbr").toString().equals(id)).collect(Collectors.toList());
if (!ObjectUtils.isEmpty(list)) {
return list;
}
for (LinkedHashMap item : data) {
if (!ObjectUtils.isEmpty(item.get("children"))) {
List<LinkedHashMap> children = screenData(result, (List<LinkedHashMap>) item.get("children"), id);
if (!ObjectUtils.isEmpty(children)) {
result = children;
break;
}
}
}
return result;
}
/**
* 将树平铺为列表并返回
*
* @return
*/
public ArrayList<LinkedHashMap> mapToDeepList(List<LinkedHashMap> linkedHashMapList) {
ArrayList<LinkedHashMap> resultList = new ArrayList<>();
FeignClientResult tree = privilegeFeginService.getTree();
//获取机构数据Map(region,regionObjectMap)对象
HashMap<String, HashMap> regionTreeToHashMapByRegionCode = regionTreeToHashMapByRegionCode((ArrayList<LinkedHashMap>) tree.getResult());
insertToResultList(linkedHashMapList, resultList, regionTreeToHashMapByRegionCode,"");
return resultList;
}
/**
* doDepth 深度优先搜索平铺linkedHashMapList并塞入,resultList
*
* @param linkedHashMapList
* @param resultList
* @return
*/
public ArrayList<LinkedHashMap> insertToResultList
(List<LinkedHashMap> linkedHashMapList, ArrayList<LinkedHashMap> resultList, HashMap<String, HashMap> regionTreeToHashMapByRegionCode, String regionNamePrefix) {
for (LinkedHashMap linkedHashMap : linkedHashMapList) {
HashMap companyCodeHashMap = regionTreeToHashMapByRegionCode.get(linkedHashMap.get("companyCode"));
String regionNameSuffix ="";
if(companyCodeHashMap!=null){
regionNameSuffix += (String) companyCodeHashMap.get("regionName");
}
if (linkedHashMap.get("children") != null) {
clearSafeMap(resultList, linkedHashMap,regionNamePrefix+regionNameSuffix);
insertToResultList((ArrayList<LinkedHashMap>) linkedHashMap.get("children"), resultList, regionTreeToHashMapByRegionCode, regionNamePrefix+regionNameSuffix);
} else {
clearSafeMap(resultList, linkedHashMap,regionNamePrefix+regionNameSuffix);
}
}
return resultList;
}
/**
* 广度优先遍历将区划树平铺并加入HashMap<regionCode,regionName>
*
* @param list
* @return 返回区划数据HashMap<regionCode, 区划数据map>
*/
public HashMap<String, HashMap> regionTreeToHashMapByRegionCode(ArrayList<LinkedHashMap> list) {
Queue tempQueue = new LinkedList();
HashMap<String, HashMap> hashMap = new HashMap();
for (LinkedHashMap linkedHashMap : list) {
tempQueue.offer(linkedHashMap);
}
while (tempQueue.size() != 0) {
LinkedHashMap poll = (LinkedHashMap) tempQueue.poll();
//过滤数据,只加入所需数据
HashMap<String, String> objectHashMap = new HashMap<>();
objectHashMap.put("sequenceNbr", (String) poll.get("sequenceNbr"));
objectHashMap.put("regionCode", String.valueOf(poll.get("regionCode")));
objectHashMap.put("regionName", (String) poll.get("regionName"));
objectHashMap.put("parentId", (String) poll.get("parentId"));
hashMap.put(String.valueOf(poll.get("regionCode")), objectHashMap);
if (poll.get("children") != null) {
ArrayList<LinkedHashMap> children = (ArrayList<LinkedHashMap>) poll.get("children");
for (LinkedHashMap child : children) {
tempQueue.offer(child);
}
}
}
return hashMap;
}
@Data
@AllArgsConstructor
@NoArgsConstructor
class Page {
//总条数
private Integer total;
//当前页码
private Integer current;
//总页数
private Integer pages;
//显示条数
private Integer size;
//用来存放查询出来的数据
private Object records;
private boolean searchCount;
}
}
amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/service/CommonService.java
View file @ 13ab63b2
......@@ -2,5 +2,6 @@ package com.yeejoin.amos.boot.module.ys.biz.service;
public interface CommonService {
Object emergencySupportStatistics(String businessType, String componentType);
}
amos-boot-system-tzs/pom.xml
View file @ 13ab63b2
......@@ -76,7 +76,6 @@
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-component-security</artifactId>
<version>${amos.version.tzs}</version>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
......
pom.xml
View file @ 13ab63b2
......@@ -251,7 +251,7 @@
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-feign-workflow</artifactId>
<version>1.10.8</version>
<version>${amos.version}</version>
</dependency>
<dependency>
<groupId>com.yeejoin</groupId>
......
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