From c34e0b2c272143787be0d14f3ce60dc88211f712 Mon Sep 17 00:00:00 2001 From: 1178634255 <1178634255@qq.com> Date: Thu, 6 Jul 2023 10:25:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=E5=A4=87?= =?UTF-8?q?=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/SupCertController.java | 2 +- .../sup/UserRegisterController.java | 4 +- .../controller/trace/TraceTaskController.java | 34 ++- .../api/entity/sup/UserCompanyEntity.java | 238 +----------------- .../trace/TraceTaskHistoryService.java | 3 + .../mybatis/mapper/sup/UserCertMapper.xml | 4 + 6 files changed, 47 insertions(+), 238 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index b7e3acc..88ee4c9 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -297,7 +297,7 @@ public class SupCertController { return ResultVOUtils.success("成功"); } - @AuthRuleAnnotation("") +// @AuthRuleAnnotation("") @PostMapping("/sup/info/insertCompanyCert") @Log(title = "资质证书", businessType = BusinessType.INSERT) public BaseResponse cptInsertCompanyCert(@RequestBody SupCertEntity supCertEntity) { diff --git a/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java b/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java index b73abaf..36fbcc9 100644 --- a/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java +++ b/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java @@ -315,10 +315,10 @@ public class UserRegisterController extends BaseController { userRegisterEntity.setId(Long.valueOf(registComPerResponse.getId())); userRegisterEntity.setCheckStatus(registComPerResponse.getCheckStatus()); userCompanyEntity.setId(Long.valueOf(registComPerResponse.getUcId())); - userCompanyEntity.setCustomerId(registComPerResponse.getUcId()); +// userCompanyEntity.setCustomerId(registComPerResponse.getUcId()); userCompanyEntity.setCheckStatus(registComPerResponse.getCheckStatus()); userCompanyEntity.setReason(registComPerResponse.getReason()); - userCompanyEntity.setAuditStatus(Integer.valueOf(company.getCheckStatus())); +// userCompanyEntity.setAuditStatus(Integer.valueOf(company.getCheckStatus())); String queueName = "fanout_" + userCompanyEntity.getId() + ""; rabbitQueueService.createQueue(queueName); userRegisterService.updateById(userRegisterEntity); diff --git a/src/main/java/com/glxp/api/controller/trace/TraceTaskController.java b/src/main/java/com/glxp/api/controller/trace/TraceTaskController.java index 13347bf..df486d3 100644 --- a/src/main/java/com/glxp/api/controller/trace/TraceTaskController.java +++ b/src/main/java/com/glxp/api/controller/trace/TraceTaskController.java @@ -1,15 +1,19 @@ package com.glxp.api.controller.trace; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.basic.BasicUdiProductEntity; import com.glxp.api.entity.trace.TraceTaskNoticeEntity; +import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.trace.TraceDlTaskRequest; import com.glxp.api.req.trace.TraceTaskDetailRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.trace.TraceTaskDlResponse; import com.glxp.api.service.trace.TraceTaskHistoryService; +import com.glxp.api.service.trace.TraceTaskNoticeService; import com.glxp.api.service.trace.TraceTaskService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,6 +21,8 @@ import io.swagger.annotations.ApiResponses; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; @@ -38,7 +44,8 @@ public class TraceTaskController { @Resource TraceTaskHistoryService traceTaskHistoryService; - + @Resource + TraceTaskNoticeService traceTaskNoticeService; //任务列表 @ApiOperation(value = "查询任务列表", response = TraceTaskDlResponse.class) @@ -84,4 +91,29 @@ public class TraceTaskController { pageSimpleResponse.setList(traceTaskDlResponses); return ResultVOUtils.success(pageSimpleResponse); } + + //任务列表删除 + @ApiOperation(value = "任务列表删除", response = BaseResponse.class) + @AuthRuleAnnotation("udi/trace/task/delete") + @PostMapping("udi/trace/task/delete") + public BaseResponse deleteTask(@RequestBody DeleteRequest deleteRequest) { + + traceTaskNoticeService.removeById(deleteRequest.getId()); + return ResultVOUtils.success("删除成功！"); + } + + //历史任务列表删除 + @ApiOperation(value = "历史任务列表删除", response = BaseResponse.class) + @AuthRuleAnnotation("udi/trace/task/deleteTaskList") + @PostMapping("udi/trace/task/deleteTaskList") + public BaseResponse deleteTaskList(@RequestBody DeleteRequest deleteRequest) { + + traceTaskHistoryService.removeById(deleteRequest.getId()); + return ResultVOUtils.success("删除成功！"); + } + + + + + } diff --git a/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java b/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java index 4c1ee6b..48fc6f6 100644 --- a/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java +++ b/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; -import java.time.LocalDate; import java.util.Date; import io.swagger.annotations.ApiModel; @@ -105,242 +104,13 @@ public class UserCompanyEntity implements Serializable { @TableField(value = "`reason`") private String reason; - - private String customerId; - - private String classes; - - /** - * 地址 - */ - private String area; - - /** - * 详细地址 - */ - private String detailAddr; - - /** - * 应用码x - */ - private String appId; - - /** - * 授权码x - */ - private String appSecret; - - /** - * 联系人 - */ - private String contacts; - - /** - * 联系电话 - */ - private String mobile; - - /** - * 电话 - */ - private String tel; - - /** - * 邮箱 - */ - private String email; - - private String areaCode; - - /** - * 企业唯一标识x - */ - private String refEntId; - - /** - * 企业IDx - */ - private String entId; - - /** - * 入网标识【0非入网1入网2入驻马上放心】x - */ - private Integer networkType; - - /** - * 绑定appkey外键IDx - */ - private Integer certIdFk; - - /** - * 所属总部x - */ - private String parentCompany; - - /** - * 所属总部Idx - */ - private String parentIdFk; - - /** - * 法人证件类型：1：身份证 - */ - private String contactsPapersType; - - /** - * 法人证件号码 - */ - private String contactsPapersCode; - - /** - * 登记状态：1：续存（在营，开业，在册），2：吊销，3：注销，4：迁出 - */ - private String registerStatus; - - /** - * 经营许可证号（Ⅲ类） - */ - private String jyxkzh; - - /** - * 经营许可证发证机关 - */ - private String jyxkzfzjg; - - /** - * 经营许可证有效期至 - */ - private LocalDate jyxkzyxq; - /** - * 经营备案凭证号（Ⅱ类） + * 在线状态 1：在线；2：离线 */ - private String jybapzh; - - /** - * 经营备案部门 - */ - private String jybabm; - - /** - * 发证日期 - */ - @TableField("fzrq") - private Date fzrq; - - /** - * 税号 - */ - private String suihao; - - /** - * 开户行 - */ - private String kaihuhang; - - /** - * 开户账号 - */ - private String kaihuzhanghao; - - /** - * 审核状态 0：草稿，4：申请变更，3：允许变更，5：拒绝变更，6：未审核，1：通过，2：不通过 - */ - private Integer auditStatus; - - /** - * 文件路径 - */ - private String filePath; - - /** - * 文件路径 - */ - private String filePath2; - - /** - * 文件路径 - */ - private String filePath3; - - /** - * 文件路径 - */ - private String filePath4; - - /** - * 往来单位外键 - */ - private String unitIdFk; - - /** - * 创建人 - */ - private String createBy; - - /** - * 审核时间 - */ - private Date auditTime; - - /** - * 审核意见 - */ - private String auditComment; - - /** - * 保存状态（1.草稿保存，2.已提交保存) - */ - - private Integer editStatus; - - - - /** - * 备注 - */ - - private String remark; - - /** - * 创建人 - */ - - private String createUser; - - /** - * 创建时间 - */ - - private Date createTime; - - /** - * 更新人 - */ - - private String updateUser; - - /** - * 更新时间 - */ - - private Date updateTime; - - - private String auditor; - - - private String roleId; - - + @ApiModelProperty(value = "在线状态 1：在线；2：离线") @TableField(exist = false) - private String failCout; - @TableField(exist = false) - private String passCout; - @TableField(exist = false) - private String productFailCout; - @TableField(exist = false) - private String prouctPassCout; + private Integer onLineStatus; private static final long serialVersionUID = 1L; } + diff --git a/src/main/java/com/glxp/api/service/trace/TraceTaskHistoryService.java b/src/main/java/com/glxp/api/service/trace/TraceTaskHistoryService.java index b7d8207..a89d5e7 100644 --- a/src/main/java/com/glxp/api/service/trace/TraceTaskHistoryService.java +++ b/src/main/java/com/glxp/api/service/trace/TraceTaskHistoryService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.trace; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.trace.TraceTaskNoticeMapper; import com.glxp.api.req.trace.TraceTaskDetailRequest; @@ -28,4 +29,6 @@ public class TraceTaskHistoryService extends ServiceImpl