fix(jg)：车用气瓶单位变更代码生成

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

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 单位变更登记
+ *
+ * @author system_generator
+ * @date 2024-07-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgChangeVehicleRegistrationUnitDto", description="单位变更登记")
+public class JgChangeVehicleRegistrationUnitDto extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "变更类型（0区内，1区外）")
+    private String changeType;
+
+    @ApiModelProperty(value = "申请编号")
+    private String applyNo;
+
+    @ApiModelProperty(value = "申请日期")
+    private Date applyDate;
+
+    @ApiModelProperty(value = "登记机构")
+    private String receiveOrgName;
+
+    @ApiModelProperty(value = "登记机构代码")
+    private String receiveOrgCode;
+
+    @ApiModelProperty(value = "登记机构公司代码")
+    private String receiveCompanyCode;
+
+    @ApiModelProperty(value = "终审通过时间")
+    private Date auditPassDate;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String createUserId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "原使用单位统一信用代码")
+    private String useUnitCreditCode;
+
+    @ApiModelProperty(value = "原使用单位名称")
+    private String useUnitName;
+
+    @ApiModelProperty(value = "新使用单位统一信用代码")
+    private String newUseUnitCreditCode;
+
+    @ApiModelProperty(value = "新使用单位名称")
+    private String newUseUnitName;
+
+    @ApiModelProperty(value = "变更证明（买卖合同或其他变更使用单位证明）")
+    private String changeCertificate;
+
+    @ApiModelProperty(value = "流程实例id")
+    private String instanceId;
+
+    @ApiModelProperty(value = "流程执行顺序标识")
+    private String executeSequence;
+
+    @ApiModelProperty(value = "下一执行节点ids")
+    private String nextExecutorIds;
+
+    @ApiModelProperty(value = "任务发起人id")
+    private String promoter;
+
+    @ApiModelProperty(value = "流程已执行记录角色id")
+    private String instanceStatus;
+
+    @ApiModelProperty(value = "办理状态")
+    private String status;
+
+    @ApiModelProperty(value = "设备使用登记注册编号")
+    private String useRegistCode;
+
+    @ApiModelProperty(value = "工作流下一节点任务id")
+    private String nextTaskId;
+
+    @ApiModelProperty(value = "下一节点执行人userIds")
+    private String nextExecuteUserIds;
+
+    @ApiModelProperty(value = "其他附件")
+    private String otherAccessories;
+
+    @ApiModelProperty(value = "接收单位org_code本来应该为receive_org_code但该字段被占用故同一此字段")
+    private String receiveCompanyOrgCode;
+
+    @ApiModelProperty(value = "经办人")
+    private String agent;
+
+    @ApiModelProperty(value = "经办人联系电话")
+    private String agentPhone;
+
+    @ApiModelProperty(value = "行驶证正面附件")
+    private String driveLicenseFront;
+
+    @ApiModelProperty(value = "行驶证背面附件")
+    private String driveLicenseBack;
+
+    @ApiModelProperty(value = "机动车登记证书附件")
+    private String vehicleRegistrationCertificate;
+
+    @ApiModelProperty(value = "属地监管部门code")
+    private String orgBranchCode;
+
+    @ApiModelProperty(value = "属地监管部门name")
+    private String orgBranchName;
+
+    @ApiModelProperty(value = "车辆属地")
+    private String vehicleApanage;
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 单位变更登记设备关系表
+ *
+ * @author system_generator
+ * @date 2024-07-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgChangeVehicleRegistrationUnitEqDto", description="单位变更登记设备关系表")
+public class JgChangeVehicleRegistrationUnitEqDto extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "单位变更登记申请id")
+    private String unitChangeId;
+
+    @ApiModelProperty(value = "设备id")
+    private String equId;
+
+    @ApiModelProperty(value = "创建时间")
+    private String createDate;
+
+    @ApiModelProperty(value = "创建人id")
+    private String createUserId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "使用登记证编号")
+    private String registrationCertificate;
+
+    @ApiModelProperty(value = "设备信息json")
+    private String deviceInfo;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/model/SafetyProblemTracingModel.java → amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/SafetyProblemTracingDto.java

-package com.yeejoin.amos.boot.module.jg.api.model;
+package com.yeejoin.amos.boot.module.jg.api.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.typroject.tyboot.core.rdbms.model.BaseModel;
-
 import java.util.Date;
 import java.util.Map;
 
@@ -18,8 +17,8 @@ import java.util.Map;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "SafetyProblemTracingModel", description = "安全追溯问题")
-public class SafetyProblemTracingModel extends BaseModel {
+@ApiModel(value = "SafetyProblemTracingDto", description = "安全追溯问题")
+public class SafetyProblemTracingDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
 

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

+package com.yeejoin.amos.boot.module.jg.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 单位变更登记
+ *
+ * @author system_generator
+ * @date 2024-07-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_change_vehicle_registration_unit")
+public class JgChangeVehicleRegistrationUnit extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 变更类型（0区内，1区外）
+     */
+	@TableField("change_type")
+    private String changeType;
+
+    /**
+     * 申请编号
+     */
+	@TableField("apply_no")
+    private String applyNo;
+
+    /**
+     * 申请日期
+     */
+	@TableField("apply_date")
+    private Date applyDate;
+
+    /**
+     * 登记机构
+     */
+	@TableField("receive_org_name")
+    private String receiveOrgName;
+
+    /**
+     * 登记机构代码
+     */
+	@TableField("receive_org_code")
+    private String receiveOrgCode;
+
+    /**
+     * 登记机构公司代码
+     */
+	@TableField("receive_company_code")
+    private String receiveCompanyCode;
+
+    /**
+     * 终审通过时间
+     */
+	@TableField("audit_pass_date")
+    private Date auditPassDate;
+
+    /**
+     * 备注
+     */
+	@TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人ID
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 创建时间
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     * 创建人
+     */
+	@TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 原使用单位统一信用代码
+     */
+	@TableField("use_unit_credit_code")
+    private String useUnitCreditCode;
+
+    /**
+     * 原使用单位名称
+     */
+	@TableField("use_unit_name")
+    private String useUnitName;
+
+    /**
+     * 新使用单位统一信用代码
+     */
+	@TableField("new_use_unit_credit_code")
+    private String newUseUnitCreditCode;
+
+    /**
+     * 新使用单位名称
+     */
+	@TableField("new_use_unit_name")
+    private String newUseUnitName;
+
+    /**
+     * 变更证明（买卖合同或其他变更使用单位证明）
+     */
+	@TableField("change_certificate")
+    private String changeCertificate;
+
+    /**
+     * 流程实例id
+     */
+	@TableField("instance_id")
+    private String instanceId;
+
+    /**
+     * 流程执行顺序标识
+     */
+	@TableField("execute_sequence")
+    private String executeSequence;
+
+    /**
+     * 下一执行节点ids
+     */
+	@TableField("next_executor_ids")
+    private String nextExecutorIds;
+
+    /**
+     * 任务发起人id
+     */
+	@TableField("promoter")
+    private String promoter;
+
+    /**
+     * 流程已执行记录角色id
+     */
+	@TableField("instance_status")
+    private String instanceStatus;
+
+    /**
+     * 办理状态
+     */
+	@TableField("status")
+    private String status;
+
+    /**
+     * 设备使用登记注册编号
+     */
+	@TableField("use_regist_code")
+    private String useRegistCode;
+
+    /**
+     * 工作流下一节点任务id
+     */
+	@TableField("next_task_id")
+    private String nextTaskId;
+
+    /**
+     * 下一节点执行人userIds
+     */
+	@TableField("next_execute_user_ids")
+    private String nextExecuteUserIds;
+
+    /**
+     * 其他附件
+     */
+	@TableField("other_accessories")
+    private String otherAccessories;
+
+    /**
+     * 接收单位org_code本来应该为receive_org_code但该字段被占用故同一此字段
+     */
+	@TableField("receive_company_org_code")
+    private String receiveCompanyOrgCode;
+
+    /**
+     * 经办人
+     */
+	@TableField("agent")
+    private String agent;
+
+    /**
+     * 经办人联系电话
+     */
+	@TableField("agent_phone")
+    private String agentPhone;
+
+    /**
+     * 行驶证正面附件
+     */
+	@TableField("drive_license_front")
+    private String driveLicenseFront;
+
+    /**
+     * 行驶证背面附件
+     */
+	@TableField("drive_license_back")
+    private String driveLicenseBack;
+
+    /**
+     * 机动车登记证书附件
+     */
+	@TableField("vehicle_registration_certificate")
+    private String vehicleRegistrationCertificate;
+
+    /**
+     * 属地监管部门code
+     */
+	@TableField("org_branch_code")
+    private String orgBranchCode;
+
+    /**
+     * 属地监管部门name
+     */
+	@TableField("org_branch_name")
+    private String orgBranchName;
+
+    /**
+     * 车辆属地
+     */
+	@TableField("vehicle_apanage")
+    private String vehicleApanage;
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 单位变更登记设备关系表
+ *
+ * @author system_generator
+ * @date 2024-07-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_change_vehicle_registration_unit_eq")
+public class JgChangeVehicleRegistrationUnitEq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位变更登记申请id
+     */
+	@TableField("unit_change_id")
+    private String unitChangeId;
+
+    /**
+     * 设备id
+     */
+	@TableField("equ_id")
+    private String equId;
+
+    /**
+     * 创建时间
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     * 创建人id
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 创建人
+     */
+	@TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 使用登记证编号
+     */
+	@TableField("registration_certificate")
+    private String registrationCertificate;
+
+    /**
+     * 设备信息json
+     */
+	@TableField("device_info")
+    private String deviceInfo;
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeVehicleRegistrationUnitEq;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 单位变更登记设备关系表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-07-10
+ */
+public interface JgChangeVehicleRegistrationUnitEqMapper extends BaseMapper<JgChangeVehicleRegistrationUnitEq> {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeVehicleRegistrationUnit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 单位变更登记 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-07-10
+ */
+public interface JgChangeVehicleRegistrationUnitMapper extends BaseMapper<JgChangeVehicleRegistrationUnit> {
+
+}

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

@@ -3,7 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.entity.SafetyProblemTracing;
-import com.yeejoin.amos.boot.module.jg.api.model.SafetyProblemTracingModel;
+import com.yeejoin.amos.boot.module.jg.api.dto.SafetyProblemTracingDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -17,7 +17,7 @@ import java.util.Map;
  */
 public interface SafetyProblemTracingMapper extends BaseMapper<SafetyProblemTracing> {
 
-    Page<SafetyProblemTracingModel> queryForSafetyProblemTracingPage(Page<SafetyProblemTracingModel> page, @Param("problemModel")SafetyProblemTracingModel problemModel);
+    Page<SafetyProblemTracingDto> queryForSafetyProblemTracingPage(Page<SafetyProblemTracingDto> page, @Param("problemModel")SafetyProblemTracingDto problemModel);
 
     Page<Map<String, Object>> queryEquipListByProblemId(Page<Map<String, Object>> page, String problemId);
 

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

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+/**
+ * 单位变更登记设备关系表接口类
+ *
+ * @author system_generator
+ * @date 2024-07-10
+ */
+public interface IJgChangeVehicleRegistrationUnitEqService {}

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

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+/**
+ * 单位变更登记接口类
+ *
+ * @author system_generator
+ * @date 2024-07-10
+ */
+public interface IJgChangeVehicleRegistrationUnitService {}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeVehicleRegistrationUnitEqMapper.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.JgChangeVehicleRegistrationUnitEqMapper">
+
+</mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeVehicleRegistrationUnitMapper.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.JgChangeVehicleRegistrationUnitMapper">
+
+</mapper>

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.SafetyProblemTracingMapper">
 
     <select id="queryForSafetyProblemTracingPage"
-            resultType="com.yeejoin.amos.boot.module.jg.api.model.SafetyProblemTracingModel">
+            resultType="com.yeejoin.amos.boot.module.jg.api.dto.SafetyProblemTracingDto">
         select
             spt.*,
             (select extend::json->>'pic' from cb_data_dictionary where type = 'ISSUE_TYPE' and code = spt.problem_type_code) problemTypePic

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

+package com.yeejoin.amos.boot.module.jg.biz.controller;
+
+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 com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeVehicleRegistrationUnitServiceImpl;
+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.JgChangeVehicleRegistrationUnitDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ *
+ * @author system_generator
+ * @date 2024-07-10
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jg-change-vehicle-registration-unit")
+public class JgChangeVehicleRegistrationUnitController extends BaseController {
+
+    @Autowired
+    JgChangeVehicleRegistrationUnitServiceImpl jgChangeVehicleRegistrationUnitServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<JgChangeVehicleRegistrationUnitDto> save(@RequestBody JgChangeVehicleRegistrationUnitDto model) {
+	    model = jgChangeVehicleRegistrationUnitServiceImpl.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<JgChangeVehicleRegistrationUnitDto> updateBySequenceNbrJgChangeVehicleRegistrationUnit(@RequestBody JgChangeVehicleRegistrationUnitDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.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(jgChangeVehicleRegistrationUnitServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<JgChangeVehicleRegistrationUnitDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<JgChangeVehicleRegistrationUnitDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<JgChangeVehicleRegistrationUnitDto> page = new Page<JgChangeVehicleRegistrationUnitDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.queryForJgChangeVehicleRegistrationUnitPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<JgChangeVehicleRegistrationUnitDto>> selectForList() {
+	    return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitServiceImpl.queryForJgChangeVehicleRegistrationUnitList());
+	}
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.controller;
+
+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 com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeVehicleRegistrationUnitEqServiceImpl;
+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.JgChangeVehicleRegistrationUnitEqDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ *
+ * @author system_generator
+ * @date 2024-07-10
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jg-change-vehicle-registration-unit-eq")
+public class JgChangeVehicleRegistrationUnitEqController extends BaseController {
+
+    @Autowired
+    JgChangeVehicleRegistrationUnitEqServiceImpl jgChangeVehicleRegistrationUnitEqServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<JgChangeVehicleRegistrationUnitEqDto> save(@RequestBody JgChangeVehicleRegistrationUnitEqDto model) {
+	    model = jgChangeVehicleRegistrationUnitEqServiceImpl.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<JgChangeVehicleRegistrationUnitEqDto> updateBySequenceNbrJgChangeVehicleRegistrationUnitEq(@RequestBody JgChangeVehicleRegistrationUnitEqDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitEqServiceImpl.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(jgChangeVehicleRegistrationUnitEqServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<JgChangeVehicleRegistrationUnitEqDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitEqServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<JgChangeVehicleRegistrationUnitEqDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<JgChangeVehicleRegistrationUnitEqDto> page = new Page<JgChangeVehicleRegistrationUnitEqDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitEqServiceImpl.queryForJgChangeVehicleRegistrationUnitEqPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<JgChangeVehicleRegistrationUnitEqDto>> selectForList() {
+	    return ResponseHelper.buildResponse(jgChangeVehicleRegistrationUnitEqServiceImpl.queryForJgChangeVehicleRegistrationUnitEqList());
+	}
+}

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

@@ -4,7 +4,7 @@ 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.model.SafetyProblemTracingModel;
+import com.yeejoin.amos.boot.module.jg.api.dto.SafetyProblemTracingDto;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.SafetyProblemTracingGenServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.SafetyProblemTracingServiceImpl;
 import io.swagger.annotations.Api;
@@ -45,7 +45,7 @@ public class SafetyProblemTracingController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增安全追溯问题", notes = "新增安全追溯问题")
-	public ResponseModel<SafetyProblemTracingModel> save(@RequestBody SafetyProblemTracingModel model) {
+	public ResponseModel<SafetyProblemTracingDto> save(@RequestBody SafetyProblemTracingDto model) {
 	    model = safetyProblemTracingServiceImpl.createWithModel(model);
 	    return ResponseHelper.buildResponse(model);
 	}
@@ -59,7 +59,7 @@ public class SafetyProblemTracingController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新安全追溯问题", notes = "根据sequenceNbr更新安全追溯问题")
-	public ResponseModel<SafetyProblemTracingModel> updateBySequenceNbrSafetyProblemTracing(@RequestBody SafetyProblemTracingModel model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	public ResponseModel<SafetyProblemTracingDto> updateBySequenceNbrSafetyProblemTracing(@RequestBody SafetyProblemTracingDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 	    model.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.updateWithModel(model));
 	}
@@ -86,7 +86,7 @@ public class SafetyProblemTracingController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个安全追溯问题",  notes = "根据sequenceNbr查询单个安全追溯问题")
-	public ResponseModel<SafetyProblemTracingModel> selectOne(@PathVariable Long sequenceNbr) {
+	public ResponseModel<SafetyProblemTracingDto> selectOne(@PathVariable Long sequenceNbr) {
 	    return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.selectOne(sequenceNbr));
 	}
 
@@ -100,14 +100,14 @@ public class SafetyProblemTracingController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/page")
 	@ApiOperation(httpMethod = "POST",value = "分页查询安全追溯问题",  notes = "分页查询安全追溯问题")
-	public ResponseModel<Page<SafetyProblemTracingModel>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size, @RequestBody(required = false) SafetyProblemTracingModel problemModel) {
+	public ResponseModel<Page<SafetyProblemTracingDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size, @RequestBody(required = false) SafetyProblemTracingDto problemModel) {
 		ReginParams loginParams = getSelectedOrgInfo();
 		CompanyBo company = loginParams.getCompany();
 		if (company.getLevel().equals("company")) {
 			return ResponseHelper.buildResponse(new Page<>());
 		}
-	    Page<SafetyProblemTracingModel> page = new Page<>();
+	    Page<SafetyProblemTracingDto> page = new Page<>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 		problemModel.setGoverningBodyOrgCode(loginParams.getCompany().getOrgCode());
@@ -124,9 +124,9 @@ public class SafetyProblemTracingController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/equipId/page")
 	@ApiOperation(httpMethod = "GET",value = "设备问题列表分页查询",  notes = "设备问题列表分页查询")
-	public ResponseModel<Page<SafetyProblemTracingModel>> queryProblemPageByEquipId(@RequestParam(value = "current") int current,@RequestParam
+	public ResponseModel<Page<SafetyProblemTracingDto>> queryProblemPageByEquipId(@RequestParam(value = "current") int current,@RequestParam
 			(value = "size") int size, @RequestParam(value = "record") String equipId) {
-		Page<SafetyProblemTracingModel> page = new Page<>();
+		Page<SafetyProblemTracingDto> page = new Page<>();
 		page.setCurrent(current);
 		page.setSize(size);
 		return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.queryProblemPageByEquipId(page, equipId));
@@ -140,7 +140,7 @@ public class SafetyProblemTracingController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询安全追溯问题",   notes = "列表全部数据查询安全追溯问题")
 	@GetMapping(value = "/list")
-	public ResponseModel<List<SafetyProblemTracingModel>> selectForList() {
+	public ResponseModel<List<SafetyProblemTracingDto>> selectForList() {
 	    return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.queryForSafetyProblemTracingList());
 	}
 

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeVehicleRegistrationUnitEq;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeVehicleRegistrationUnitEqMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeVehicleRegistrationUnitEqService;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeVehicleRegistrationUnitEqDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 单位变更登记设备关系表服务实现类
+ *
+ * @author system_generator
+ * @date 2024-07-10
+ */
+@Service
+public class JgChangeVehicleRegistrationUnitEqServiceImpl extends BaseService<JgChangeVehicleRegistrationUnitEqDto,JgChangeVehicleRegistrationUnitEq,JgChangeVehicleRegistrationUnitEqMapper> implements IJgChangeVehicleRegistrationUnitEqService {
+    /**
+     * 分页查询
+     */
+    public Page<JgChangeVehicleRegistrationUnitEqDto> queryForJgChangeVehicleRegistrationUnitEqPage(Page<JgChangeVehicleRegistrationUnitEqDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<JgChangeVehicleRegistrationUnitEqDto> queryForJgChangeVehicleRegistrationUnitEqList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/JgChangeVehicleRegistrationUnitServiceImpl.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeVehicleRegistrationUnit;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeVehicleRegistrationUnitMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeVehicleRegistrationUnitService;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeVehicleRegistrationUnitDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 单位变更登记服务实现类
+ *
+ * @author system_generator
+ * @date 2024-07-10
+ */
+@Service
+public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgChangeVehicleRegistrationUnitDto,JgChangeVehicleRegistrationUnit,JgChangeVehicleRegistrationUnitMapper> implements IJgChangeVehicleRegistrationUnitService {
+    /**
+     * 分页查询
+     */
+    public Page<JgChangeVehicleRegistrationUnitDto> queryForJgChangeVehicleRegistrationUnitPage(Page<JgChangeVehicleRegistrationUnitDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<JgChangeVehicleRegistrationUnitDto> queryForJgChangeVehicleRegistrationUnitList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/SafetyProblemTracingServiceImpl.java

@@ -16,7 +16,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.SafetyProblemTracing;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemSourceTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.SafetyProblemTracingMapper;
-import com.yeejoin.amos.boot.module.jg.api.model.SafetyProblemTracingModel;
+import com.yeejoin.amos.boot.module.jg.api.dto.SafetyProblemTracingDto;
 import com.yeejoin.amos.boot.module.jg.api.service.ISafetyProblemTracingService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
 import org.apache.ibatis.session.SqlSession;
@@ -41,7 +41,7 @@ import static org.springframework.jdbc.object.BatchSqlUpdate.DEFAULT_BATCH_SIZE;
  * @date 2024-05-21
  */
 @Service
-public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTracingModel, SafetyProblemTracing, SafetyProblemTracingMapper> implements ISafetyProblemTracingService {
+public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTracingDto, SafetyProblemTracing, SafetyProblemTracingMapper> implements ISafetyProblemTracingService {
 
     @Autowired
     IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
@@ -49,12 +49,12 @@ public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTr
     /**
      * 分页查询
      */
-    public Page<SafetyProblemTracingModel> queryForSafetyProblemTracingPage(Page<SafetyProblemTracingModel> page, SafetyProblemTracingModel problemModel) {
+    public Page<SafetyProblemTracingDto> queryForSafetyProblemTracingPage(Page<SafetyProblemTracingDto> page, SafetyProblemTracingDto problemModel) {
         return this.baseMapper.queryForSafetyProblemTracingPage(page, problemModel);
     }
 
-    public Page<SafetyProblemTracingModel> queryProblemPageByEquipId(Page<SafetyProblemTracingModel> page, String equipId) {
-        SafetyProblemTracingModel problemModel = new SafetyProblemTracingModel();
+    public Page<SafetyProblemTracingDto> queryProblemPageByEquipId(Page<SafetyProblemTracingDto> page, String equipId) {
+        SafetyProblemTracingDto problemModel = new SafetyProblemTracingDto();
         problemModel.setSourceId(equipId);
         return this.baseMapper.queryForSafetyProblemTracingPage(page, problemModel);
     }
@@ -62,8 +62,8 @@ public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTr
     /**
      * 根据ID查询
      */
-    public SafetyProblemTracingModel selectOne(Long sequenceNbr) {
-        SafetyProblemTracingModel entity = new SafetyProblemTracingModel();
+    public SafetyProblemTracingDto selectOne(Long sequenceNbr) {
+        SafetyProblemTracingDto entity = new SafetyProblemTracingDto();
         LambdaQueryWrapper<SafetyProblemTracing> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SafetyProblemTracing::getSequenceNbr, sequenceNbr);
         SafetyProblemTracing problem = this.baseMapper.selectOne(queryWrapper);
@@ -77,7 +77,7 @@ public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTr
     /**
      * 列表查询 示例
      */
-    public List<SafetyProblemTracingModel> queryForSafetyProblemTracingList() {
+    public List<SafetyProblemTracingDto> queryForSafetyProblemTracingList() {
         return this.queryForList("", false);
     }