diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java index 4202e677b..e4a420bef 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java @@ -6,6 +6,7 @@ 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.sync.BasicDownloadStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.http.sync.SpGetHttpClient; @@ -13,10 +14,13 @@ import com.glxp.api.req.sync.BasicExportStatusRequest; import com.glxp.api.req.sync.BasicExportTimeRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.sync.BasicDownloadService; import com.glxp.api.service.sync.BasicExportService; import com.glxp.api.service.sync.BasicExportTimeService; +import com.glxp.api.util.BeanCopyUtils; import com.glxp.api.util.RedisUtil; 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; @@ -41,6 +45,8 @@ public class SpsSyncExportStatusController { @Resource BasicExportService basicExportService; @Resource + BasicDownloadService basicDownloadService; + @Resource BasicExportTimeService basicExportTimeService; @Resource RedisUtil redisUtil; @@ -125,7 +131,14 @@ public class SpsSyncExportStatusController { if (StrUtil.isBlank(deleteRequest.getId())) { throw new RuntimeException("缺少唯一标识"); } - BasicExportStatusEntity info = basicExportService.getById(deleteRequest.getId()); + BasicExportStatusEntity info = new BasicExportStatusEntity(); + if (deleteRequest.getDlType() != null && deleteRequest.getDlType() == 1) { + info = basicExportService.getById(deleteRequest.getId()); + } else { + BasicDownloadStatusEntity basicDownloadStatusEntity = basicDownloadService.getById(deleteRequest.getId()); + BeanUtils.copyProperties(basicDownloadStatusEntity, info); + } + if (info == null) { throw new RuntimeException("数据不存在"); } diff --git a/src/main/java/com/glxp/api/req/system/DeleteRequest.java b/src/main/java/com/glxp/api/req/system/DeleteRequest.java index 005102efb..ddad45de9 100644 --- a/src/main/java/com/glxp/api/req/system/DeleteRequest.java +++ b/src/main/java/com/glxp/api/req/system/DeleteRequest.java @@ -11,4 +11,5 @@ public class DeleteRequest { List ids; String billNo; List billNos; + Integer dlType; //1:同步任务,2:下载记录 } diff --git a/src/main/resources/mybatis/mapper/auth/SysRoleMenuMapper.xml b/src/main/resources/mybatis/mapper/auth/SysRoleMenuMapper.xml index dccd92d55..e51e077ba 100644 --- a/src/main/resources/mybatis/mapper/auth/SysRoleMenuMapper.xml +++ b/src/main/resources/mybatis/mapper/auth/SysRoleMenuMapper.xml @@ -3,7 +3,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - @@ -15,10 +14,10 @@ SELECT * FROM auth_role_menu - + and role_id = #{roleId} - + and menu_id = #{menuId} @@ -34,27 +33,21 @@ > delete from auth_role_menu - where role_id in + where role_id in #{item} - - insert INTO auth_role_menu - ( - role_id,menu_id - ) - values + replace INTO auth_role_menu + (role_id, menu_id) + values - ( - #{item.roleId}, - #{item.menuId} - ) + (#{item.roleId}, + #{item.menuId}) - diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index ffa006a6c..ff8aef013 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -388,4 +388,4 @@ CALL Pro_Temp_ColumnWork('thr_corp', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('auth_dept_user', 'userId', 'bigint', 2); CALL Pro_Temp_ColumnWork('auth_dept_user', 'deptId', 'bigint', 2); CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'Id', 'bigint', 2); - +CALL Pro_Temp_ColumnWork('sup_cert', 'filePath', 'text', 2);