From d0682ef97d8d9a7d1f76e86adc46618e63a38c81 Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Fri, 18 Nov 2022 18:49:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=91=E5=AE=8F=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81=EF=BC=8C=E6=83=B3=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E5=8A=9E=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renren-admin/src/main/resources/db/R__del_token.sql | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 renren-admin/src/main/resources/db/R__del_token.sql diff --git a/renren-admin/src/main/resources/db/R__del_token.sql b/renren-admin/src/main/resources/db/R__del_token.sql deleted file mode 100644 index 9e0a31d9..00000000 --- a/renren-admin/src/main/resources/db/R__del_token.sql +++ /dev/null @@ -1,7 +0,0 @@ -DELETE -FROM sys_user_token -WHERE id NOT IN (SELECT s.id - FROM (SELECT sut.id, - ROW_NUMBER() OVER ( PARTITION BY sut.user_id ORDER BY sut.create_date DESC ) AS group_idx - FROM sys_user_token sut) s - WHERE s.group_idx = 1); \ No newline at end of file From d891593c4b7c0fe5e5d668c9527f8c23294dfdd8 Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Mon, 21 Nov 2022 09:39:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E8=AE=BE=E6=96=BD=E6=96=B0=E9=9C=80=E6=B1=82-?= =?UTF-8?q?=E5=BE=85=E7=94=B3=E8=AF=B7=E5=88=97=E8=A1=A8=E5=A2=9E=E5=88=A0?= =?UTF-8?q?=E6=94=B9=E6=9F=A5=E6=8E=A5=E5=8F=A3=20=E5=B7=B2=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=88=A0=E9=99=A4=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=83=BD=E5=8A=9B=E6=95=B0=E6=8D=AE=E6=9C=AA?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8B=E6=9E=B6=E6=B5=81=E7=A8=8B=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=95=B0=E6=8D=AEbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/db/V7.1__sys_dict_data_col.sql | 4 + config/db/V7.2__sys_user_add_col.sql | 1 + config/db/V7.3__add_sys_data.sql | 11 +++ config/db/V7.4__new_table.sql | 31 ++++++++ config/db/V7.5__resource_add_col.sql | 1 + .../controller/ResourceMountController.java | 5 ++ .../TAbilityApplicationController.java | 18 +++++ .../controller/WillApplyCameraController.java | 59 +++++++++++++++ .../dao/TAbilityApplicationDao.java | 5 ++ .../processForm/dao/WillApplyCameraDao.java | 15 ++++ .../processForm/dto/WillApplyCameraDTO.java | 62 ++++++++++++++++ .../entity/WillApplyCameraEntity.java | 73 +++++++++++++++++++ .../service/TAbilityApplicationService.java | 4 + .../service/WillApplyCameraService.java | 10 +++ .../service/impl/JuApiGateway.java | 2 +- .../impl/TAbilityApplicationServiceImpl.java | 16 ++++ .../impl/WillApplyCameraServiceImpl.java | 35 +++++++++ .../modules/resource/dto/ResourceDTO.java | 3 + .../resource/entity/ResourceEntity.java | 2 + .../service/impl/ResourceServiceImpl.java | 13 +++- .../src/main/resources/db/V7.4__new_table.sql | 31 ++++++++ .../resources/db/V7.5__resource_add_col.sql | 1 + .../processForm/TAbilityApplicationDao.xml | 22 ++++++ .../mapper/processForm/WillApplyCameraDao.xml | 50 +++++++++++++ 24 files changed, 471 insertions(+), 3 deletions(-) create mode 100644 config/db/V7.1__sys_dict_data_col.sql create mode 100644 config/db/V7.2__sys_user_add_col.sql create mode 100644 config/db/V7.3__add_sys_data.sql create mode 100644 config/db/V7.4__new_table.sql create mode 100644 config/db/V7.5__resource_add_col.sql create mode 100644 renren-admin/src/main/java/io/renren/modules/processForm/controller/WillApplyCameraController.java create mode 100644 renren-admin/src/main/java/io/renren/modules/processForm/dao/WillApplyCameraDao.java create mode 100644 renren-admin/src/main/java/io/renren/modules/processForm/dto/WillApplyCameraDTO.java create mode 100644 renren-admin/src/main/java/io/renren/modules/processForm/entity/WillApplyCameraEntity.java create mode 100644 renren-admin/src/main/java/io/renren/modules/processForm/service/WillApplyCameraService.java create mode 100644 renren-admin/src/main/java/io/renren/modules/processForm/service/impl/WillApplyCameraServiceImpl.java create mode 100644 renren-admin/src/main/resources/db/V7.4__new_table.sql create mode 100644 renren-admin/src/main/resources/db/V7.5__resource_add_col.sql create mode 100644 renren-admin/src/main/resources/mapper/processForm/WillApplyCameraDao.xml diff --git a/config/db/V7.1__sys_dict_data_col.sql b/config/db/V7.1__sys_dict_data_col.sql new file mode 100644 index 00000000..3f6ffc79 --- /dev/null +++ b/config/db/V7.1__sys_dict_data_col.sql @@ -0,0 +1,4 @@ +ALTER TABLE `sys_dict_data` +ADD COLUMN `status` int NULL DEFAULT 1 COMMENT '启用状态(0未启用 1启用)' AFTER `update_date`; +ALTER TABLE `sys_dict_type` +ADD COLUMN `status` int NULL DEFAULT 1 COMMENT '启用状态(0未启用 1启用)' AFTER `update_date`; \ No newline at end of file diff --git a/config/db/V7.2__sys_user_add_col.sql b/config/db/V7.2__sys_user_add_col.sql new file mode 100644 index 00000000..299510e8 --- /dev/null +++ b/config/db/V7.2__sys_user_add_col.sql @@ -0,0 +1 @@ +ALTER TABLE `sys_user` ADD COLUMN `frequency` int NULL DEFAULT 0 COMMENT '登录失败次数'; \ No newline at end of file diff --git a/config/db/V7.3__add_sys_data.sql b/config/db/V7.3__add_sys_data.sql new file mode 100644 index 00000000..bf6ffb18 --- /dev/null +++ b/config/db/V7.3__add_sys_data.sql @@ -0,0 +1,11 @@ +INSERT INTO `sys_dict_type`(`id`, `dict_type`, `dict_name`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`, `status`) VALUES (1592357067014803457, ' encryptedRoute', '加密路由', '', 0, 1067246875800000001, '2022-11-15 11:21:24', 1067246875800000001, '2022-11-15 11:21:24', 1); + +INSERT INTO `sys_dict_data`(`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`, `status`) VALUES (1592357815098281986, 1592357067014803457, '个人中心', '/personalCenter', '', 0, 1067246875800000001, '2022-11-15 11:24:22', 1067246875800000001, '2022-11-15 11:24:22', 1); +INSERT INTO `sys_dict_data`(`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`, `status`) VALUES (1592357749759414274, 1592357067014803457, '消息通知', '/mynoticeView', '', 0, 1067246875800000001, '2022-11-15 11:24:07', 1067246875800000001, '2022-11-15 11:24:07', 1); +INSERT INTO `sys_dict_data`(`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`, `status`) VALUES (1592357668599631874, 1592357067014803457, '融合服务详情', '/integrationServicesDetails', '', 0, 1067246875800000001, '2022-11-15 11:23:47', 1067246875800000001, '2022-11-15 11:23:47', 1); +INSERT INTO `sys_dict_data`(`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`, `status`) VALUES (1592357561145757698, 1592357067014803457, '融合服务', '/integrationServices', '', 0, 1067246875800000001, '2022-11-15 11:23:22', 1067246875800000001, '2022-11-15 11:23:22', 1); +INSERT INTO `sys_dict_data`(`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`, `status`) VALUES (1592357495567814658, 1592357067014803457, '能力统计', '/abilityStatistics', '', 0, 1067246875800000001, '2022-11-15 11:23:06', 1067246875800000001, '2022-11-15 11:23:06', 1); +INSERT INTO `sys_dict_data`(`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`, `status`) VALUES (1592357417113358338, 1592357067014803457, '能力详情', '/details', '', 0, 1067246875800000001, '2022-11-15 11:22:47', 1067246875800000001, '2022-11-15 11:22:47', 1); +INSERT INTO `sys_dict_data`(`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`, `status`) VALUES (1592357337807458305, 1592357067014803457, '能力集市', '/DetailsPageconetent', '', 0, 1067246875800000001, '2022-11-15 11:22:29', 1067246875800000001, '2022-11-15 11:22:29', 1); + + diff --git a/config/db/V7.4__new_table.sql b/config/db/V7.4__new_table.sql new file mode 100644 index 00000000..9d05cda2 --- /dev/null +++ b/config/db/V7.4__new_table.sql @@ -0,0 +1,31 @@ +-- ---------------------------- +-- Table structure for t_will_apply_camera +-- ---------------------------- +DROP TABLE IF EXISTS `t_will_apply_camera`; +CREATE TABLE `t_will_apply_camera` ( + `id` bigint(0) NOT NULL COMMENT '主键ID', + `user_id` bigint(0) NULL DEFAULT NULL COMMENT '用户', + `del_flag` int(0) NULL DEFAULT NULL COMMENT '删除标志：0正常，1删除，', + `camera_point_type_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `channel_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `channel_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `channel_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `check_status` int(0) NULL DEFAULT NULL, + `gpsX` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `gpsY` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `idt_camera_channel` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `management_unit_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `node_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `parent_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `status` int(0) NULL DEFAULT NULL, + `creator` bigint(0) NULL DEFAULT NULL, + `create_date` datetime(0) NULL DEFAULT NULL, + `updater` bigint(0) NULL DEFAULT NULL, + `update_date` datetime(0) NULL DEFAULT NULL, +PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +SET FOREIGN_KEY_CHECKS = 1; + + + diff --git a/config/db/V7.5__resource_add_col.sql b/config/db/V7.5__resource_add_col.sql new file mode 100644 index 00000000..9d044101 --- /dev/null +++ b/config/db/V7.5__resource_add_col.sql @@ -0,0 +1 @@ +ALTER TABLE tb_data_resource ADD COLUMN `undercarriage_instance_id` bigint NULL COMMENT '下架流程实例ID'; \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java b/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java index b19829de..67e7542b 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java +++ b/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java @@ -236,6 +236,11 @@ public class ResourceMountController { ProcessInstanceDTO index_ = actRunningService.startOfBusinessKey(processStartDTO); logger.info("-------------------2.启动流程成功--------------------------"); logger.info("ProcessInstanceDTO.getBusinessKey:{}", index_.getBusinessKey()); + + //11-18 新增下架流程实例id + dto.setUndercarriageInstanceId(Long.parseLong(index_.getProcessInstanceId())); + resourceService.update(dto); + dtoList.add(index_); }); return dtoList.stream().findAny().orElse(null); diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java index bdd8ccf3..3c941356 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java @@ -453,4 +453,22 @@ public class TAbilityApplicationController { return new Result().ok(tAbilityApplicationService.getApplyDeptList()); } + @GetMapping("/getApplyCameraList") + @ApiOperation("/西海岸-根据用户获取已申请摄像头列表") + @LogOperation("/西海岸-根据用户获取已申请摄像头列表") + public Result getApplyCameraList() { + return new Result().ok(tAbilityApplicationService.getApplyCameraList()); + } + + @GetMapping("/delApplyCamera") + @ApiOperation("/西海岸-用户删除已申请摄像头") + @LogOperation("/西海岸-用户删除已申请摄像头") + public Result delApplyCamera(@RequestBody List ids) { + tAbilityApplicationService.delApplyCamera(ids); + return new Result().ok("删除成功。"); + } + + + + } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/WillApplyCameraController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/WillApplyCameraController.java new file mode 100644 index 00000000..d8657ea7 --- /dev/null +++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/WillApplyCameraController.java @@ -0,0 +1,59 @@ +package io.renren.modules.processForm.controller; + +import io.renren.common.annotation.LogOperation; +import io.renren.common.utils.Result; +import io.renren.modules.processForm.dto.WillApplyCameraDTO; +import io.renren.modules.processForm.entity.WillApplyCameraEntity; +import io.renren.modules.processForm.service.WillApplyCameraService; +import io.renren.modules.security.user.SecurityUser; +import io.renren.modules.security.user.UserDetail; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; + +@RestController +@RequestMapping("/willApplyCamera") +@Api(tags = "西海岸待申请摄像头") +public class WillApplyCameraController { + + @Autowired + private WillApplyCameraService willApplyCameraService; + + @GetMapping("/select") + @LogOperation("/查询") + @ApiOperation("/查询") + public Result select() { + UserDetail user = SecurityUser.getUser(); + return new Result().ok(willApplyCameraService.selectByUserId(user.getId())); + } + + @PostMapping("/batchInsert") + @ApiOperation("/保存") + @LogOperation("/保存") + public Result batchInsert(@RequestBody List willApplyCameraDTOList) { + ArrayList list = new ArrayList<>(); + willApplyCameraDTOList.forEach(index -> { + WillApplyCameraEntity cameraEntity = new WillApplyCameraEntity(); + BeanUtils.copyProperties(index, cameraEntity); + cameraEntity.setUserId(SecurityUser.getUserId()); + cameraEntity.setDelFlag(0); + list.add(cameraEntity); + }); + willApplyCameraService.insertBatch(list); + return new Result().ok("数据保存成功。"); + } + + @PostMapping("/batchDelete") + @ApiOperation("/删除") + @LogOperation("/删除") + public Result batchDelete(@RequestBody List ids) { + willApplyCameraService.deleteBatchIds(ids); + return new Result().ok("数据删除成功。"); + } + +} diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/dao/TAbilityApplicationDao.java b/renren-admin/src/main/java/io/renren/modules/processForm/dao/TAbilityApplicationDao.java index b76b42fe..b4a160dc 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/dao/TAbilityApplicationDao.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/dao/TAbilityApplicationDao.java @@ -3,6 +3,7 @@ package io.renren.modules.processForm.dao; import io.renren.common.dao.BaseDao; import io.renren.modules.processForm.entity.TAbilityApplicationEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -49,4 +50,8 @@ public interface TAbilityApplicationDao extends BaseDao getInstanceIdByResId(Long id); List getApplyDeptList(); + + List getApplyCameraList(@Param("userId") Long userId, @Param("date") String date); + + Integer delApplyCamera(@Param("ids") List ids); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/dao/WillApplyCameraDao.java b/renren-admin/src/main/java/io/renren/modules/processForm/dao/WillApplyCameraDao.java new file mode 100644 index 00000000..087bc513 --- /dev/null +++ b/renren-admin/src/main/java/io/renren/modules/processForm/dao/WillApplyCameraDao.java @@ -0,0 +1,15 @@ +package io.renren.modules.processForm.dao; + +import io.renren.common.dao.BaseDao; +import io.renren.modules.processForm.entity.WillApplyCameraEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface WillApplyCameraDao extends BaseDao { + + List select(@Param("userId") Long userId); +} diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/dto/WillApplyCameraDTO.java b/renren-admin/src/main/java/io/renren/modules/processForm/dto/WillApplyCameraDTO.java new file mode 100644 index 00000000..9eef2d63 --- /dev/null +++ b/renren-admin/src/main/java/io/renren/modules/processForm/dto/WillApplyCameraDTO.java @@ -0,0 +1,62 @@ +package io.renren.modules.processForm.dto; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +@ApiModel(value = "西海岸待申请摄像头") +public class WillApplyCameraDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + private Long userId; + + private Integer delFlag; + + private String cameraPointTypeName; + + private String channelCode; + + private String channelId; + + private String channelName; + + private Integer checkStatus; + + private String gpsX; + + private String gpsY; + + private String idtCameraChannel; + + private String managementUnitName; + + private String nodeName; + + private String parentId; + + private Integer status; + + /** + * 创建者 + */ + private Long creator; + /** + * 创建时间 + */ + private Date createDate; + /** + * 创建者 + */ + private Long updater; + /** + * 创建时间 + */ + private Date updateDate; + +} diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/entity/WillApplyCameraEntity.java b/renren-admin/src/main/java/io/renren/modules/processForm/entity/WillApplyCameraEntity.java new file mode 100644 index 00000000..dcb25402 --- /dev/null +++ b/renren-admin/src/main/java/io/renren/modules/processForm/entity/WillApplyCameraEntity.java @@ -0,0 +1,73 @@ +package io.renren.modules.processForm.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = false) +@TableName(value = "t_will_apply_camera", autoResultMap = true) +public class WillApplyCameraEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId + private Long id; + + private Long userId; + + private Integer delFlag; + + private String cameraPointTypeName; + + private String channelCode; + + private String channelId; + + private String channelName; + + private Integer checkStatus; + + @TableField("gpsX") + private String gpsX; + + @TableField("gpsY") + private String gpsY; + + private String idtCameraChannel; + + private String managementUnitName; + + private String nodeName; + + private String parentId; + + private Integer status; + + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private Long creator; + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createDate; + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long updater; + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateDate; +} diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/service/TAbilityApplicationService.java b/renren-admin/src/main/java/io/renren/modules/processForm/service/TAbilityApplicationService.java index 5d379a62..b48c93a1 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/service/TAbilityApplicationService.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/service/TAbilityApplicationService.java @@ -1,6 +1,7 @@ package io.renren.modules.processForm.service; import io.renren.common.service.CrudService; +import io.renren.common.utils.Result; import io.renren.modules.processForm.dto.TAbilityApplicationDTO; import io.renren.modules.processForm.entity.TAbilityApplicationEntity; @@ -58,4 +59,7 @@ public interface TAbilityApplicationService extends CrudService ids); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/service/WillApplyCameraService.java b/renren-admin/src/main/java/io/renren/modules/processForm/service/WillApplyCameraService.java new file mode 100644 index 00000000..fb56fe5d --- /dev/null +++ b/renren-admin/src/main/java/io/renren/modules/processForm/service/WillApplyCameraService.java @@ -0,0 +1,10 @@ +package io.renren.modules.processForm.service; + +import io.renren.common.service.CrudService; +import io.renren.modules.processForm.dto.WillApplyCameraDTO; +import io.renren.modules.processForm.entity.WillApplyCameraEntity; + +public interface WillApplyCameraService extends CrudService { + + Object selectByUserId(Long id); +} diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/JuApiGateway.java b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/JuApiGateway.java index 411fb3b4..19264860 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/JuApiGateway.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/JuApiGateway.java @@ -73,7 +73,7 @@ public class JuApiGateway implements ApiGateway { HashSet supportMethod = Sets.newHashSet("POST", "GET"); if (StringUtils.isBlank(apiUrl) || deptId == null || deptId == 0 || StringUtils.isBlank(methods) || !supportMethod.contains(methods)) { - String msg = String.format("注册api参数为空，跳过 apiUrl:%s, deptId:%ld methods:%s, resourceId:%s", apiUrl, deptId, methods, resourceId); + String msg = String.format("注册api参数为空，跳过 apiUrl:%s, deptId:%d methods:%s, resourceId:%s", apiUrl, deptId, methods, resourceId); //重要参数没有当成不需要注册 log.info(msg); diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java index 3b8bb582..39083f5c 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java @@ -3,15 +3,19 @@ package io.renren.modules.processForm.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.renren.common.service.impl.CrudServiceImpl; import io.renren.common.utils.ConvertUtils; +import io.renren.common.utils.DateUtils; import io.renren.modules.processForm.dao.TAbilityApplicationDao; import io.renren.modules.processForm.dto.TAbilityApplicationDTO; import io.renren.modules.processForm.entity.TAbilityApplicationEntity; import io.renren.modules.processForm.service.TAbilityApplicationService; +import io.renren.modules.security.user.SecurityUser; +import io.renren.modules.security.user.UserDetail; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -137,5 +141,17 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl ids) { + abilityApplicationDao.delApplyCamera(ids); + } + } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/WillApplyCameraServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/WillApplyCameraServiceImpl.java new file mode 100644 index 00000000..f45d9e40 --- /dev/null +++ b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/WillApplyCameraServiceImpl.java @@ -0,0 +1,35 @@ +package io.renren.modules.processForm.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import io.renren.common.service.impl.CrudServiceImpl; +import io.renren.modules.processForm.dao.WillApplyCameraDao; +import io.renren.modules.processForm.dto.WillApplyCameraDTO; +import io.renren.modules.processForm.entity.WillApplyCameraEntity; +import io.renren.modules.processForm.service.WillApplyCameraService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Map; + +@Service +public class WillApplyCameraServiceImpl extends CrudServiceImpl implements WillApplyCameraService { + + @Autowired + private WillApplyCameraDao willApplyCameraDao; + + + @Override + public QueryWrapper getWrapper(Map params) { + + return null; + } + + @Override + public Object selectByUserId(Long id) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("user_id", id) + .orderByDesc("create_date"); + return willApplyCameraDao.selectList(wrapper) == null ? new ArrayList<>() : willApplyCameraDao.selectList(wrapper); + } +} diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java b/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java index d56c9f5c..bc70e01a 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java @@ -129,6 +129,9 @@ public class ResourceDTO extends AuditingBaseDTO implements Serializable { @ApiModelProperty(value = "置顶时间") private Date pinTopTime; + @ApiModelProperty(value = "下架流程实例ID") + private Long undercarriageInstanceId; + public String getDelFlagTip() { if (this.delFlag != null) { Optional resourceEntityDelFlagOptional = Optional.ofNullable(ResourceEntityDelFlag.getByFlag(this.delFlag)); diff --git a/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java b/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java index 15bbaf5d..54c350e2 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java @@ -173,4 +173,6 @@ public class ResourceEntity extends BaseEntity { * 申请单号 */ private String applyNumber; + + private Long undercarriageInstanceId; } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index 3efa2614..3ca7a805 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -2607,6 +2607,7 @@ public class ResourceServiceImpl extends CrudServiceImpl delRes = CompletableFuture.runAsync(() -> { + resourceDao.deleteById(id); Map map = new HashMap<>(); map.put("data_resource_id", id); @@ -2639,6 +2640,12 @@ public class ResourceServiceImpl extends CrudServiceImpl delUnderData = CompletableFuture.runAsync(() -> { + Long instanceId = resourceDao.selectById(id).getUndercarriageInstanceId(); + this.delProcinstBySuAd(instanceId, "能力下架", null); + }, executor); + //会客厅 CompletableFuture delRoom = CompletableFuture.runAsync(() -> { meetingroomMapper.deleteById(id); @@ -2658,7 +2665,7 @@ public class ResourceServiceImpl extends CrudServiceImpl all = CompletableFuture.allOf(delRes, delResOthers, delMountData, delAbilityData, delRoom, delFormData); + CompletableFuture all = CompletableFuture.allOf(delRes, delResOthers, delMountData, delUnderData, delAbilityData, delRoom, delFormData); all.join(); } @@ -2717,7 +2724,9 @@ public class ResourceServiceImpl extends CrudServiceImpl + + UPDATE t_ability_application taa + SET expire_date = now() + WHERE id IN + + #{item} + + + + + \ No newline at end of file diff --git a/renren-admin/src/main/resources/mapper/processForm/WillApplyCameraDao.xml b/renren-admin/src/main/resources/mapper/processForm/WillApplyCameraDao.xml new file mode 100644 index 00000000..6b11273c --- /dev/null +++ b/renren-admin/src/main/resources/mapper/processForm/WillApplyCameraDao.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file