Merge branch 'develop_tzs_register_to_0715' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationManageDto.java

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2024-07-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgUseRegistrationManageDto", description="")
+public class JgUseRegistrationManageDto extends BaseModel {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "使用单位名称")
+    private String useUnitName;
+
+    @ApiModelProperty(value = "申请编号")
+    private String applyNo;
+
+    @ApiModelProperty(value = "使用登记证状态（登记，注销）")
+    private String certificateStatus;
+
+    @ApiModelProperty(value = "接收机构")
+    private String receiveOrgName;
+
+    @ApiModelProperty(value = "办理日期")
+    private Date auditPassDate;
+
+    @ApiModelProperty(value = "登记类别")
+    private String regType;
+
+    @ApiModelProperty(value = "申请日期")
+    private Date regDate;
+
+    @ApiModelProperty(value = "设备种类")
+    private String equList;
+
+ @ApiModelProperty(value = "设备类别")
+ private String equCategory;
+
+    @ApiModelProperty(value = "设备品种")
+    private String equDefine;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String createUserId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "使用登记编号")
+    private String useRegistrationCode;
+
+    @ApiModelProperty(value = "使用单位统一信用代码")
+    private String useUnitCreditCode;
+
+    @ApiModelProperty(value = "接收机构公司代码")
+    private String receiveCompanyCode;
+
+    @ApiModelProperty(value = "使用登记证书参数")
+    private String useRegistrationCertificateParam;
+
+    @ApiModelProperty(value = "登记证书编号")
+    private String certificateNo;
+
+    @ApiModelProperty(value = "使用标志参数")
+    private String useFlagCertificateParam;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistrationManage.java

+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 system_generator
+ * @date 2024-07-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_use_registration_manage")
+public class JgUseRegistrationManage extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 使用单位名称
+     */
+	@TableField("use_unit_name")
+    private String useUnitName;
+
+    /**
+     * 申请编号
+     */
+	@TableField("apply_no")
+    private String applyNo;
+
+    /**
+     * 使用登记证状态（登记，注销）
+     */
+	@TableField("certificate_status")
+    private String certificateStatus;
+
+    /**
+     * 接收机构
+     */
+	@TableField("receive_org_name")
+    private String receiveOrgName;
+
+    /**
+     * 办理日期
+     */
+	@TableField("audit_pass_date")
+    private Date auditPassDate;
+
+    /**
+     * 登记类别
+     */
+	@TableField("reg_type")
+    private String regType;
+
+    /**
+     * 申请日期
+     */
+	@TableField("reg_date")
+    private Date regDate;
+
+    /**
+     * 设备种类
+     */
+	@TableField("equ_list")
+    private String equList;
+
+    /**
+     * 设备类别
+     */
+    @TableField("equ_category")
+    private String equCategory;
+
+    /**
+     * 设备品种
+     */
+	@TableField("equ_define")
+    private String equDefine;
+
+    /**
+     * 备注
+     */
+	@TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人ID
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 创建时间
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     * 使用登记编号
+     */
+	@TableField("use_registration_code")
+    private String useRegistrationCode;
+
+    /**
+     * 使用单位统一信用代码
+     */
+	@TableField("use_unit_credit_code")
+    private String useUnitCreditCode;
+
+    /**
+     * 接收机构公司代码
+     */
+	@TableField("receive_company_code")
+    private String receiveCompanyCode;
+
+    /**
+     * 使用登记证书参数
+     */
+	@TableField("use_registration_certificate_param")
+    private String useRegistrationCertificateParam;
+
+    /**
+     * 登记证书编号
+     */
+	@TableField("certificate_no")
+    private String certificateNo;
+
+    /**
+     * 使用标志参数
+     */
+	@TableField("use_flag_certificate_param")
+    private String useFlagCertificateParam;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationManageMapper.java

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-07-03
+ */
+public interface JgUseRegistrationManageMapper extends BaseMapper<JgUseRegistrationManage> {
+
+    List<JgUseRegistrationManageDto> queryByUseUnitCreditCode(@Param("dto") JgUseRegistrationManageDto dto);
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgUseRegistrationManageService.java

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2024-07-03
+ */
+public interface IJgUseRegistrationManageService {}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml

+<?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.JgUseRegistrationManageMapper">
+
+
+    <select id="queryByUseUnitCreditCode"
+            resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto">
+        select
+        tjurm.sequence_nbr                                                  AS sequence_nbr,
+        tjurm.use_unit_name                                                 AS use_unit_name,
+        tjurm.apply_no                                                      AS apply_no,
+        tjurm.certificate_status                                            AS certificate_status,
+        tjurm.receive_org_name                                              AS receive_org_name,
+        tjurm.audit_pass_date                                               AS audit_pass_date,
+        tjurm.reg_type                                                      AS reg_type,
+        DATE_FORMAT(tjurm.reg_date,'%Y-%m-%d')                              AS reg_date,
+        tjurm.equ_list                                                      AS equ_list,
+        tjurm.equ_define                                                    AS equ_define,
+        tjurm.remark                                                        AS remark,
+        tjurm.rec_user_id                                                   AS rec_user_id,
+        DATE_FORMAT(tjurm.rec_date,'%Y-%m-%d')                              AS rec_date,
+        tjurm.create_user_id                                                AS create_user_id,
+        DATE_FORMAT(tjurm.create_date,'%Y-%m-%d')                           AS create_date,
+        tjurm.rec_user_name                                                 AS rec_user_name,
+        tjurm.use_registration_code                                         AS use_registration_code,
+        tjurm.use_unit_credit_code                                          AS use_unit_credit_code,
+        tjurm.receive_company_code                                          AS receive_company_code,
+        tjurm.use_registration_certificate_param                            AS use_registration_certificate_param,
+        tjurm.certificate_no                                                AS certificate_no,
+        tjurm.use_flag_certificate_param                                    AS use_flag_certificate_param,
+        tjurm.equ_category                                                  AS equ_category
+        from tzs_jg_use_registration_manage tjurm
+        <where>
+            tjurm.is_delete = 0
+            <if test="dto.useUnitCreditCode != null and dto.useUnitCreditCode != ''">
+                and tjurm.use_unit_credit_code = #{dto.useUnitCreditCode}
+            </if>
+            ORDER BY tjurm.rec_date DESC
+        </where>
+    </select>
+</mapper>

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

+package com.yeejoin.amos.boot.module.jg.biz.controller;
+
+import cn.hutool.poi.excel.sax.SheetRidReader;
+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 java.util.List;
+import java.util.Map;
+
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationManageServiceImpl;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+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 com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ *
+ * @author system_generator
+ * @date 2024-07-03
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jg-use-registration-manage")
+public class JgUseRegistrationManageController extends BaseController {
+
+    @Autowired
+    JgUseRegistrationManageServiceImpl jgUseRegistrationManageServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<JgUseRegistrationManageDto> save(@RequestBody JgUseRegistrationManageDto model) {
+	    model = jgUseRegistrationManageServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<JgUseRegistrationManageDto> updateBySequenceNbrJgUseRegistrationManage(@RequestBody JgUseRegistrationManageDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<JgUseRegistrationManageDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<JgUseRegistrationManageDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+                    (value = "size") int size) {
+	    Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePage(page));
+	}
+
+	/**
+	 * 按照单位统一代码查询当前单位下的证
+	 * @param dto  dto中的使用单位统一代码（useUnitCreditCode） 非必填，前端不传的话取当前登录单位的统一信用代码 ，有值的话查询该单位的所有证
+	 * @return 证的列表
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/list")
+	@ApiOperation(httpMethod = "GET",value = "按照单位统一代码查询当前单位下的证",  notes = "按照单位统一代码查询当前单位下的证")
+	public ResponseModel<List<JgUseRegistrationManageDto>> queryByUseUnitCreditCode(JgUseRegistrationManageDto dto) {
+		if (ValidationUtil.isEmpty(dto.getUseUnitCreditCode())){
+			// 不传的话取当前登录单位的统一信用代码
+			dto.setUseUnitCreditCode(getSelectedOrgInfo().getCompany().getCompanyCode());
+		}
+		return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryByUseUnitCreditCode(dto));
+	}
+
+	/**
+	 * 根据证的sequenceNbr 查询证下面的所有设备
+	 * @param sequenceNbr  证的sequenceNbr
+	 * @return 证下的所有设备
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/queryEquByCertificateSeq")
+	@ApiOperation(httpMethod = "GET",value = "根据证的sequenceNbr 查询证下面的所有设备",  notes = "根据证的sequenceNbr 查询证下面的所有设备")
+	public ResponseModel<List<Map<String, Object>>> queryEquByCertificateSeq(Long sequenceNbr) {
+		return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquByCertificateSeq(sequenceNbr));
+	}
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.netflix.discovery.converters.Auto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationManageMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationManageService;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2024-07-03
+ */
+@Service
+public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistrationManageDto,JgUseRegistrationManage,JgUseRegistrationManageMapper> implements IJgUseRegistrationManageService {
+
+    @Autowired
+    private JgUseRegistrationManageMapper jgUseRegistrationManageMapper;
+
+    @Autowired
+    private JgUseRegistrationMapper jgUseRegistrationMapper;
+
+    @Autowired
+    private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
+
+    /**
+     * 分页查询
+     */
+    public Page<JgUseRegistrationManageDto> queryForJgUseRegistrationManagePage(Page<JgUseRegistrationManageDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+    /**
+     * 列表查询
+     */
+    public List<JgUseRegistrationManageDto> queryByUseUnitCreditCode(JgUseRegistrationManageDto dto)   {
+        return jgUseRegistrationManageMapper.queryByUseUnitCreditCode(dto);
+    }
+
+    /**
+     * 根据证的sequenceNbr 查询证下面的所有设备
+     */
+    public List<Map<String, Object>> queryEquByCertificateSeq(Long sequenceNbr)   {
+        // JgUseRegistrationManage jgUseRegistrationManage = this.baseMapper.selectOne(new LambdaQueryWrapper<JgUseRegistrationManage>()
+        //         .eq(JgUseRegistrationManage::getSequenceNbr, sequenceNbr)
+        //         .eq(JgUseRegistrationManage::getIsDelete, 0));
+        // if (ValidationUtil.isEmpty(jgUseRegistrationManage.getApplyNo())){
+        //     return new ArrayList<>();
+        // }
+        // JgUseRegistration useRegistration = jgUseRegistrationMapper.selectOne(new LambdaQueryWrapper<JgUseRegistration>()
+        //         .eq(JgUseRegistration::getApplyNo, jgUseRegistrationManage.getApplyNo()));
+        // JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
+        //         .eq(JgRegistrationHistory::getCurrentDocumentId, useRegistration.getSequenceNbr()));
+        // jgRegistrationHistory.
+        return new ArrayList<Map<String, Object>>();
+    }
+}
\ No newline at end of file

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/RuleCommonServiceImpl.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.sun.org.apache.regexp.internal.RE;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.TopicEnum;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.UseInfo;
@@ -14,7 +13,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.component.emq.EmqKeeper;
-
 import java.util.Arrays;
 import java.util.List;