Merge branch 'develop_tzs_register_to_0715' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationManageController.java

@@ -30,6 +30,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -112,6 +113,7 @@ public class JgUseRegistrationManageController extends BaseController {
     public ResponseModel<JgUseRegistrationManage> detail(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
         return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryDetailBySeq(sequenceNbr));
     }
+
     /**
      * 根据sequenceNbr查询使用登记证操作流水---使用登记证详情用
      *
@@ -124,9 +126,11 @@ public class JgUseRegistrationManageController extends BaseController {
     public ResponseModel<List<Map<String, String>>> operationRecord(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
         return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.operationRecord(sequenceNbr));
     }
+
     /**
      * 根据sequenceNbr查询使用登记证对应设备列表---使用登记证详情用
      * 分页接口
+     *
      * @param sequenceNbr 主键
      * @return
      */
@@ -134,9 +138,9 @@ public class JgUseRegistrationManageController extends BaseController {
     @GetMapping(value = "/detail/equList")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询使用登记证对应设备列表---使用登记证详情用", notes = "根据sequenceNbr查询使用登记证对应设备列表---使用登记证详情用")
     public ResponseModel<Page<JSONObject>> certificateEquList(@RequestParam(value = "current") int current,
-                                                                  @RequestParam(value = "size") int size,
-                                                                  @RequestParam(value = "sequenceNbr") String sequenceNbr) {
-        return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.certificateEquList(current,size,sequenceNbr));
+                                                              @RequestParam(value = "size") int size,
+                                                              @RequestParam(value = "sequenceNbr") String sequenceNbr) {
+        return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.certificateEquList(current, size, sequenceNbr));
     }
 
     /**
@@ -238,4 +242,25 @@ public class JgUseRegistrationManageController extends BaseController {
                 .collect(Collectors.toList());
         return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquForPageByCertificateSeqList(collect, current, size));
     }
+
+    /**
+     * 证的 相关打印
+     * @param response 响应
+     * @param printType certificateNormalPrint：使用登记证 普打
+     *                  certificateNestedPrint：使用登记证 套打
+     *                  useFlagNormalPrint：使用标志 普打
+     *                  useFlagNestedPrint：使用标志 套打
+     *                  exportSummaryTable；工业管道和气瓶 汇总表下载
+     * @param certificateSeq 证书的seq
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/printCertificate")
+    @ApiOperation(httpMethod = "GET", value = "使用登记证 相关打印", notes = "使用登记证 相关打印")
+    public void printCertificate(HttpServletResponse response,
+                                 @RequestParam(value = "printType") String printType,
+                                 @RequestParam(value = "certificateSeq") String certificateSeq) {
+        jgUseRegistrationManageServiceImpl.printCertificate(response,printType, certificateSeq);
+    }
+
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -123,6 +123,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     public static final String WHETHER_SKID_MOUNTED_PRESSURE_VESSEL = "WHETHER_SKID_MOUNTED_PRESSURE_VESSEL";
     // 检验检测机构
     public static final String INSPECTION_AND_TESTING_INSTITUTIONS = "检验检测机构";
+    // 设备纳管  纳管：true 未纳管：false
+    public static final String IS_INTO_MANAGEMENT = "IS_INTO_MANAGEMENT";
     // 需要转化成jsonObject的附件字段
     public static String[] jsonFields = {"insOtherAccessories", "installContractAttachment", "installProxyStatementAttachment"};
     @Autowired
@@ -1307,6 +1309,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             seqBuilder.must(QueryBuilders.termsQuery("SEQUENCE_NBR.keyword", strings));
             boolMust.must(seqBuilder);
         }
+
+        if (!ObjectUtils.isEmpty(map.getString(IS_INTO_MANAGEMENT))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String param = QueryParser.escape(map.getString(IS_INTO_MANAGEMENT));
+            pBuilder.must(QueryBuilders.matchQuery(IS_INTO_MANAGEMENT, param));
+            boolMust.must(pBuilder);
+        }
         if (!ObjectUtils.isEmpty(map.getString(EQU_CATEGORY))) {
             BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
             String param = QueryParser.escape(map.getString(EQU_CATEGORY));

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

@@ -11,13 +11,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationManageService;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.lucene.queryparser.classic.QueryParser;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
@@ -36,8 +30,8 @@ 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 org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -72,12 +66,16 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
     @Autowired
     private JgVehicleInformationMapper jgVehicleInformationMapper;
 
-    @Autowired
-    private JgVehicleInformationEqMapper jgVehicleInformationEqMapper;
 
     @Autowired
     private JgCertificateChangeRecordServiceImpl jgCertificateChangeRecordService;
 
+    @Autowired
+    private JgUseRegistrationServiceImpl jgUseRegistrationService;
+
+    @Autowired
+    private JgVehicleInformationServiceImpl jgVehicleInformationService;
+
     /**
      * 将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中
      */
@@ -96,10 +94,10 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
             String fullAddress = "";
             // 设备种类/类别/品种
             Map<String, String> equType = jgUseRegistrationMapper.getEquTypeByUseRegSeq(String.valueOf(useRegistration.getSequenceNbr()));
-            if (!"unit".equals(useRegistration.getManageType())){
+            if (!"unit".equals(useRegistration.getManageType())) {
                 List<JgUseRegistrationEq> jgUseRegistrationEqs = jgUseRegistrationEqMapper.selectList(new LambdaQueryWrapper<JgUseRegistrationEq>()
                         .eq(JgUseRegistrationEq::getEquipTransferId, useRegistration.getSequenceNbr()));
-                if (!ValidationUtil.isEmpty(jgUseRegistrationEqs)){
+                if (!ValidationUtil.isEmpty(jgUseRegistrationEqs)) {
                     String equId = jgUseRegistrationEqs.get(0).getEquId();
                     IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.getOne(new QueryWrapper<IdxBizJgUseInfo>()
                             .eq("RECORD", equId));
@@ -147,7 +145,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
             jgUseRegistrationManage.setUseRegistrationCode(useRegistration.getUseRegistrationCode());
             jgUseRegistrationManage.setUseUnitCreditCode(useRegistration.getUseUnitCreditCode());
             jgUseRegistrationManage.setReceiveCompanyCode(useRegistration.getReceiveCompanyCode());
-            jgUseRegistrationManage.setCertificateNo(commonServiceImpl.generateCertificateNo(equType,useRegistration.getAuditPassDate(),useRegistration.getReceiveCompanyCode()));
+            jgUseRegistrationManage.setCertificateNo(commonServiceImpl.generateCertificateNo(equType, useRegistration.getAuditPassDate(), useRegistration.getReceiveCompanyCode()));
             this.baseMapper.insert(jgUseRegistrationManage);
         }
 
@@ -188,7 +186,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
             jgUseRegistrationManage.setUseRegistrationCode(vehicleInformation.getUseRegistrationCode());
             jgUseRegistrationManage.setUseUnitCreditCode(vehicleInformation.getUseUnitCreditCode());
             jgUseRegistrationManage.setReceiveCompanyCode(vehicleInformation.getReceiveCompanyCode());
-            jgUseRegistrationManage.setCertificateNo(commonServiceImpl.generateCertificateNo(equType,vehicleInformation.getAuditPassDate(),vehicleInformation.getReceiveCompanyCode()));
+            jgUseRegistrationManage.setCertificateNo(commonServiceImpl.generateCertificateNo(equType, vehicleInformation.getAuditPassDate(), vehicleInformation.getReceiveCompanyCode()));
             this.baseMapper.insert(jgUseRegistrationManage);
         }
         return Boolean.TRUE;
@@ -202,7 +200,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
                                                                                 JgUseRegistrationManageDto dto,
                                                                                 String sort) {
         SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
-        return jgUseRegistrationManageMapper.queryForPage(page,dto,sortMap);
+        return jgUseRegistrationManageMapper.queryForPage(page, dto, sortMap);
     }
 
     /**
@@ -240,10 +238,11 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
     /**
      * 根据sequenceNbr查询使用登记证对应设备列表---使用登记证详情用
      * 分页接口
+     *
      * @param sequenceNbr 主键
      * @return
      */
-    public Page<JSONObject> certificateEquList(int current,int size,String sequenceNbr) {
+    public Page<JSONObject> certificateEquList(int current, int size, String sequenceNbr) {
         return queryEquForPageByCertificateSeqList(Collections.singletonList(Long.parseLong(sequenceNbr)), current, size);
     }
 
@@ -268,7 +267,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         List<JgUseRegistrationManage> jgUseRegistrationManageList = this.baseMapper.selectList(new LambdaQueryWrapper<JgUseRegistrationManage>()
                 .in(JgUseRegistrationManage::getSequenceNbr, sequenceNbrList)
                 .eq(JgUseRegistrationManage::getIsDelete, 0));
-        if (ValidationUtil.isEmpty(jgUseRegistrationManageList)){
+        if (ValidationUtil.isEmpty(jgUseRegistrationManageList)) {
             return new ArrayList<>();
         }
         List<JSONObject> result = new ArrayList<>();
@@ -292,7 +291,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
                 JSONObject dto2 = jsonObject.getJSONObject("sourceAsMap");
                 result.add(dto2);
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return result;
@@ -300,16 +299,17 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
 
     /**
      * 根据证的sequenceNbr集合，批量查询证下面的所有设备
+     *
      * @param sequenceNbrList 证的sequenceNbr集合
-     * @param current 分页-当前页
-     * @param size 分页-分页数
+     * @param current         分页-当前页
+     * @param size            分页-分页数
      * @return 查询结果
      */
-    public Page<JSONObject> queryEquForPageByCertificateSeqList(List<Long> sequenceNbrList,int current,int size) {
+    public Page<JSONObject> queryEquForPageByCertificateSeqList(List<Long> sequenceNbrList, int current, int size) {
         List<JgUseRegistrationManage> jgUseRegistrationManageList = this.baseMapper.selectList(new LambdaQueryWrapper<JgUseRegistrationManage>()
                 .in(JgUseRegistrationManage::getSequenceNbr, sequenceNbrList)
                 .eq(JgUseRegistrationManage::getIsDelete, 0));
-        if (ValidationUtil.isEmpty(jgUseRegistrationManageList)){
+        if (ValidationUtil.isEmpty(jgUseRegistrationManageList)) {
             return new Page<>();
         }
 
@@ -340,11 +340,76 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
                 list.add(dto);
             }
             totle = Objects.requireNonNull(response.getInternalResponse().hits().getTotalHits()).value;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         result.setRecords(list);
         result.setTotal(totle);
         return result;
     }
+
+    /**
+     * 标志/使用登记证/汇总表 打印
+     *
+     * @param response       响应
+     * @param printType      打印类型
+     * @param certificateSeq 使用登记证的seq
+     */
+    public void printCertificate(HttpServletResponse response, String printType, String certificateSeq) {
+
+        if (StringUtils.isEmpty(printType) || StringUtils.isEmpty(certificateSeq)) {
+            throw new BadRequest("打印失败，请联系管理员！");
+        }
+
+        JgUseRegistrationManage manage = this.baseMapper.selectById(certificateSeq);
+        String regType = manage.getRegType();
+        String useRegistrationCode = manage.getUseRegistrationCode();
+        String sequenceNbr = null;
+        String equCategoryCode = manage.getEquCategoryCode();
+
+        switch (printType) {
+            case "certificateNormalPrint":// 使用登记证 普打
+            case "certificateNestedPrint":// 使用登记证 套打
+            case "useFlagNormalPrint":// 使用标志 普打
+            case "useFlagNestedPrint":// 使用标志 套打
+                if (BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName().equals(regType)) {
+                    JgVehicleInformation vehicleInformation = jgVehicleInformationService.getOne(
+                            new LambdaQueryWrapper<JgVehicleInformation>()
+                                    .eq(JgVehicleInformation::getUseRegistrationCertificate, useRegistrationCode));
+                    sequenceNbr = String.valueOf(vehicleInformation.getSequenceNbr());
+                    jgVehicleInformationService.exportVehicleUseRegistrationCertificate(sequenceNbr, response, getPrintTypeCode(printType));
+                } else if (BusinessTypeEnum.JG_USAGE_REGISTRATION.getName().equals(regType)) {
+                    JgUseRegistration useRegistration = jgUseRegistrationService.getOne(
+                            new LambdaQueryWrapper<JgUseRegistration>()
+                                    .eq(JgUseRegistration::getUseRegistrationCode, useRegistrationCode));
+                    sequenceNbr = String.valueOf(useRegistration.getSequenceNbr());
+                    jgUseRegistrationService.exportUseRegistrationCertificate(sequenceNbr, response, getPrintTypeCode(printType));
+                }
+                break;
+            case "exportSummaryTable":// 工业管道和气瓶 汇总表下载
+                JgUseRegistration useRegistration = jgUseRegistrationService.getOne(
+                        new LambdaQueryWrapper<JgUseRegistration>()
+                                .eq(JgUseRegistration::getUseRegistrationCode, useRegistrationCode));
+                jgUseRegistrationService.exportSummaryBasicInfo(String.valueOf(useRegistration.getSequenceNbr()), response, equCategoryCode);
+                break;
+            default:
+                break;
+        }
+    }
+
+    private String getPrintTypeCode(String printType) {
+        switch (printType) {
+            case "certificateNormalPrint":
+                return "0";
+            case "certificateNestedPrint":
+                return "1";
+            case "useFlagNormalPrint":
+                return "2";
+            case "useFlagNestedPrint":
+                return "3";
+            default:
+                return "";
+        }
+    }
+
 }
\ No newline at end of file