diff --git a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskStore.java b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskStore.java index 9d5f44c..c6244c8 100644 --- a/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskStore.java +++ b/njzscloud-common/njzscloud-common-sichen/src/main/java/com/njzscloud/common/sichen/support/TaskStore.java @@ -6,7 +6,8 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.njzscloud.common.core.tuple.Tuple2; import com.njzscloud.common.core.utils.GroupUtil; -import com.njzscloud.common.sichen.*; +import com.njzscloud.common.sichen.SysTaskEntity; +import com.njzscloud.common.sichen.SysTaskService; import com.njzscloud.common.sichen.contant.ScheduleType; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -87,7 +88,7 @@ public class TaskStore implements BeanPostProcessor { if (StrUtil.isNotBlank(cron) || period > 0) { String memo_ = task.memo(); String memo = StrUtil.isBlank(memo_) ? clazz.getCanonicalName() + "#" + method.getName() : memo_; - String scheduleConf = cron != null ? cron : String.valueOf(period); + String scheduleConf = StrUtil.isNotBlank(cron) ? cron : String.valueOf(period); ScheduleType scheduleType = StrUtil.isNotBlank(cron) ? ScheduleType.Cron : ScheduleType.Fixed; tasks.add(new TaskInfo() .setId(IdUtil.getSnowflakeNextId()) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/contant/TimeOutStatus.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/contant/TimeOutStatus.java new file mode 100644 index 0000000..752a212 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/contant/TimeOutStatus.java @@ -0,0 +1,21 @@ +package com.njzscloud.supervisory.dispose.contant; + +import com.njzscloud.common.core.ienum.DictStr; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +/** + * 字典代码：time_out_status + * 字典名称：超时状态 + */ +@Getter +@RequiredArgsConstructor +public enum TimeOutStatus implements DictStr { + WeiChaoShi("WeiChaoShi", "未超时"), + YiChaoShi("YiChaoShi", "已超时"), + ; + + private final String val; + + private final String txt; +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/pojo/DisposeRecordEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/pojo/DisposeRecordEntity.java index 6d44b07..8d47792 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/pojo/DisposeRecordEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/pojo/DisposeRecordEntity.java @@ -3,6 +3,7 @@ package com.njzscloud.supervisory.dispose.pojo; import com.baomidou.mybatisplus.annotation.*; import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler; import com.njzscloud.supervisory.dispose.contant.GarbageCategory; +import com.njzscloud.supervisory.dispose.contant.TimeOutStatus; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -84,6 +85,8 @@ public class DisposeRecordEntity { */ private String disposalSite; + private TimeOutStatus timeOutStatus; + private String dataSn; private String inFrontPhoto; private String inBodyPhoto; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/service/DisposeRecordService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/service/DisposeRecordService.java index 61d22af..9c32a96 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/service/DisposeRecordService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/service/DisposeRecordService.java @@ -5,7 +5,9 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; +import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.core.ex.Exceptions; @@ -83,7 +85,12 @@ public class DisposeRecordService extends ServiceImpl paging(PageParam pageParam, DisposeRecordPagingParam disposeRecordPagingParam) { String keywords = disposeRecordPagingParam.getKeywords(); - return PageResult.of(this.page(pageParam.toPage(), Wrappers.lambdaQuery() + Page page = pageParam.toPage(); + page.addOrder( + new OrderItem().setColumn("time_out_status").setAsc(false), + new OrderItem().setColumn("id").setAsc(false) + ); + return PageResult.of(this.page(page, Wrappers.lambdaQuery() .and(StrUtil.isNotBlank(keywords), it -> it.like(DisposeRecordEntity::getOrigin, keywords) .or().like(DisposeRecordEntity::getClearingCompany, keywords) @@ -137,7 +144,42 @@ public class DisposeRecordService extends ServiceImplupdate() + .set("time_out_status", TimeOutStatus.YiChaoShi) + .leSql("create_time", "DATE_SUB(NOW(), INTERVAL 12 HOUR)") + .eq("time_out_status", TimeOutStatus.WeiChaoShi) + ); + log.info("超时警告任务执行结束：{}", update); + } +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/pojo/TempStoragePointEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/pojo/TempStoragePointEntity.java index 3179387..084390a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/pojo/TempStoragePointEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/pojo/TempStoragePointEntity.java @@ -54,6 +54,10 @@ public class TempStoragePointEntity { * 视频URL */ private String videoUrl; + /** + * 负责人 Id; sys_user.id + */ + private Long managerId; /** * 创建人 Id; sys_user.id diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/service/TempStoragePointService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/service/TempStoragePointService.java index 9ac637e..ce80fe3 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/service/TempStoragePointService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/service/TempStoragePointService.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.common.security.support.UserDetail; +import com.njzscloud.common.security.util.SecurityUtil; import com.njzscloud.supervisory.tsp.contant.PointStatus; import com.njzscloud.supervisory.tsp.mapper.TempStoragePointMapper; import com.njzscloud.supervisory.tsp.pojo.TempStoragePointEntity; @@ -69,10 +71,19 @@ public class TempStoragePointService extends ServiceImpl paging(PageParam pageParam, TempStoragePointEntity tempStoragePointEntity) { + UserDetail userDetail = SecurityUtil.loginUser(); + boolean isAdmin = userDetail.getRoles().contains("admin"); + Long userId = userDetail.getUserId(); String pointName = tempStoragePointEntity.getPointName(); PointStatus status = tempStoragePointEntity.getStatus(); return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query() - .like(StrUtil.isNotBlank(pointName), "point_name", pointName) + .eq(!isAdmin, "manager_id", userId) + .and(StrUtil.isNotBlank(pointName), it -> + it.like("point_name", pointName) + .or().like("street_name", pointName) + .or().like("microdistrict", pointName) + .or().like("property_management", pointName)) + .eq(status != null, "status", status) .eq("deleted", 0)) ); diff --git a/z-doc/zsy-recycling-supervision.pdma.json b/z-doc/zsy-recycling-supervision.pdma.json index 13f0b22..75cb3c4 100644 --- a/z-doc/zsy-recycling-supervision.pdma.json +++ b/z-doc/zsy-recycling-supervision.pdma.json @@ -4,7 +4,7 @@ "avatar": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABAEAYAAAD6+a2dAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAACv9JREFUeNrtnHtUVNUex7+/M+ADNBgkynfKDIiEmsrN11UhUYsB35ilBWoODBY+1l2+uHot8uYbCwZGE9EUn3nVQUEx8xFmoiGhYszgVdPsijJoXeR1zr5/4LC8oJnMwMHmfP5hLdj795ove++zZ+8DSEhISEhISNgiJHYAjYVWe9cvvfR5y5ZCaFkKlzdwIPIpn9vfurWgYCuRmp19965Go1CcPSt2nNbG5gTwXLJOZ5ju7s7FVI7ALpUKodSOOgQGUgnccHbQICQgml1q0qRmP7YIDGznzuIZrq7l8ydOBELGe+8qLxc7H0v5EwpgEfua2dk5xzy/pe3Ffv3QjUviClUqtMRcvK1S0WgY2VEvrzqbVwBYM3euKUujUcYtXSp2tpbyzArguT6fz7ww1sVF5lDWyX7osGEslVvN3Q4KotFMhtxhw/AdZrEPXVys7ngFDuKwwWCaotmrjPDwELsOlmIndgBPwiUj/sf8T7y82EnqiCEqFb6iv3KTVSq8WL4Ypf36IYM2Mz87O2rL/sbMncY9hYM38Aq9eecOCiGwXWlpCIOKzqWmMo7dYP8dPZrCKRmvhoRUtz+BYbRIJgOwV+zaWINGIIAdOxiTyeTOhTsuF/Tty66QP3tXpUI2FLgSHMxG4ys25uEhm4WxLwHkYvNTuRkBUP/LlzEMC6BLTSVvxAg79PqibrKcu4nHjgHq8N6dKipwqKq5c7iWM1wPCAAA3Be7RvVHgwmgxRld4o+Jrq5NAnie8/fzYyOxDGeCgrDndoYxIzgYIH90cnKiTgCSAQDGp3LQG8exhufZfhiAU6eoP6YAej0tYa+xdvv2FQVEeipv5eUhGcAoAEBkdd+tDVWFxofVBSA3xl0wDvX2ZqfJDuNHjgTP9cDyoCBS896szNeXAbkgjsMezIFvHRy8ilW0sKgIP7H9+DotDdHUBwl6vfBmWZHss4MH79JM6kTFxQCqHtkCxC1wY8cKAljEGOM45zy3GwUbtVoMpWHMbdo0MiESSiKArcRAAEDu01hlazGDIi9dQlMMwHy9Hj8Ik4XnU1OLo92WKFIyM4EQTyKexwRU/UdPeHYXtGJisQDki18oM5ydPRv9sI/6q9V4eGj9PcajmIIqKtALP7AhJ05QDPPBmNTUytbIpr16/b1xkeWKQ0YjgCMP5uUjYhfrz4jFAmAyakbJU6cSmBZRj2jwe0N23v8N2dsQB+Cq2CWxLSwWADVj+zGrY0cAV8E/9Ac/rMCaJUtMu10/cU9ZuFAashsnnMUWivAeKanWh8nimQ4TbtwAQkKIeL4upiXqH8sFIPFMIwnAxpEEYOM0gq3gKuQliXqjvG9frBN+QpaPj9UMv0WzoRIEbjgXy8/45ps7Z9Vqz/BLl8TOt7EgugDkzvFjC4wDBuBlYa6Qf/w4TIgEI+s9IfyDrYQe4FP4Am5NSYnrCZ0ur7lCcXuJWu11/+ZNsfMXG/GngN34C0vx8kL1zmH9QG/hJUQ5OPBXhdeaDOrcWey0GwuiC6BiFn+E3dqzB2PxLdpkZ1vdQWf44IAgsHRaiMz0dNMW7rDpo9On62wvFz5swUsvyb9NaGucERv7QsDyTTmzHR3FrKEliD4F/Hbug3RlXGEhzgGI69kTwBdWdWA+xfdq9W/CLbJ3Gbl4g+PwBlvAEBVV3r/F+45Tg4NdftDG50+YNq2omybSY+vhww1aRAsQfQR45slk/2Sfd+rERkJLkw4dkodpOxpSNm0yn1gSO7wnIQnAWpjXMHswB76TJnH7KnY1icvJkcu13fNnBwaKHd7jkATwtHjiDK28coUABhYSghmYjOaFhTWbkSebh1/btQOgpvDUVOdYbbwhf8cO88EYsdMwIwmgjhSZNJFKj507hVVIasJ7erIdAMauXfu49rQYBBo3zv4Uf4dTXrjgPD7+lDHhnXfEzkMSgIXcvavRdOxoMhUHaDTKHLUa/blkbnlgIAAdMq5dq9Xh75Cjg5sbHaLv2ZCNG+Ve2q7GgXq9S0mCPt+lbduGjl/0pwAzrXU63c/vOTjcb81vL/VVKNgkjBX87e0ttcudFQZBU1pqUtifKP44Px9Qh/f2raiorzxMqeGn3dceOODy+qfDDdN9fIRVsmByWLaMAqtOStXa7/gF09l6lYoNYj/RmtxcZ2/tTePymTOLL2haK5pv3FjfdRd9BHBy0mrzJ3TuXHqezyjZevUqvYuxvF9ODscBjJ05Y+lP+HLHWPz58865/BdOynPnGuq5vSjtg3Rl3L17xV6R7RSh4eGsA3xwwM/PfK+gVgcjgCi5nH7Gv9j15GTn7xJcDclpaXJnXWKBsUOH+opTdAFwIWSPdwICsBn+LLv+Fkc0EG+jsGvX8iyHfS0iXnmlofMsPqrZpow7dszxfOl/mpV0786O0jf0xbJlCMBEmllZWSve4exD9B8+nBn5JOZ9/rxcntDFMD0iAmCMWXGrXHQBYGdlkEx58iQWoCNkZWX15ucjmHDt1i2+S9P2pXMvXhQr3eurZ51qP/v+/eLuESmKD+fMEQ5iM2L79EFXxNKsnJya7UmJUHa+ZUuAfYAorVY+PaG9MfvIkZbz4nzzPmvVytJ4RF8DmIrff9FdkZsrj9ElFhg9PISvhPYI7dVLNoRdEzbYWRyfsIo1waelpXw+21PpefLkr6emZnnvKioSO28z1beOM3WJZ7J8fZ1j+PbPlc+ZQ80Aah4djY9xFXzTptUdtmA+Wg4ebLdZdsweK1YAyALCwurqX3QBmDEVq8PdFdeuoRcAPFg9W+PmXZ1L09BULU6LowEgJqbqStyXXzItTaTrmzZBg48R1bt3dfN/sEHsxxEjAGy3xKv4U4DEIykKiPT0mJuXJ7yJ74AtW2o1eLBotNSPJAAbRxKAjSMJwMaRBGDjiP4UYN6ZKwt0/NVBvWEDXccSuPTsidtYQF0t3/BgCtKwkMpKmsxCKfPAAVObiA3u38+aBRARMWap/Zo4sfix+dt79KBD1I1GJiTQVrhSeze3WnEFYgZ6lJfTRdwTliQlmRZpmnn0Xr68oepuRnQBlMY6nnHQhYRwA9AF4ePGAVgA04MiZVpun8C0AICVAIvy8Gg1Wnv43z1SUu7sBoCsLGvnQ6EkcOujo2kfXFnPPn0elwftRSwAQI5eZFi6tOoAyfr1905NXd2Q+xSiTwHcABxj6lu36t3Rg7OBFT9DJ/iZTPXmJx6x6FD7fMDjYKfhSKN++80xjO8il5eW1nsdaiD6CGAyaXI8Vu7f7/J6wm1D2ZQpwk4WSqW+vvgWqSyLs1igNJvWIaOykk0XNDCkp98Li9yliDM+3dtHngLmWNZetm7ePDg1S6hM++UXrGMRmNemTa24zqI3+LIyysACbNu27aZarW4zqqSkvutdE9EFYKYoLWKhMi4pCS2wEEhKsqpxNwBheK8h8njoujuAxYsRAM0TO41qiMgejehTgIS4SAKwcSQB2DiSAGwcSQA2jiQAG0cSgI0jCcDGkQRg4zzx27bqb+vGOfZ0XLN7Nx1GBwz390cGNrPVlh/alLAS5jev2kHLUjIzqaDyZSSNGGG+n/C4bk/8AMtcHDwcFWPG0BwcZ3lDh4qdp8Rj2A5npre3BzAfGDxYGCrrSd4jRwJIBzZtely3J04BdBArKODyZbHzk/iDyBEPA2O0QVaI+Y+4gVSDP3zgwumjhIACN39/bh8bJYT41uVF7xL1iQdri72MCZu5YFw7ffouRZCSjh4VOywJCQkJCQkJCYlGyP8A/eZcApAQzfUAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjEtMDctMjRUMTg6NTY6NTcrMDg6MDCiMaMiAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIxLTA3LTI0VDE4OjU2OjU3KzA4OjAw02wbngAAAEx0RVh0c3ZnOmJhc2UtdXJpAGZpbGU6Ly8vaG9tZS9hZG1pbi9pY29uLWZvbnQvdG1wL2ljb25fdjh0ZTByYWQxdmQvZ29uZ3NpLTAxLnN2Z1gR1IgAAAAASUVORK5CYII=", "version": "4.9.4", "createdTime": "2023-4-13 11:53:52", - "updatedTime": "2025-8-20 14:31:53", + "updatedTime": "2025-8-25 13:55:06", "dbConns": [], "profile": { "default": { @@ -9125,6 +9125,23 @@ "extProps": {}, "id": "DF246FD3-8E1E-470F-883C-E0AA51D0AF3A" }, + { + "defKey": "time_out_status", + "defName": "超时状态", + "comment": "", + "type": "VARCHAR", + "len": 32, + "scale": "", + "primaryKey": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "'WeiChaoShi'", + "hideInGraph": false, + "refDict": "", + "baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231", + "extProps": {}, + "id": "4B715514-CEA9-411B-8598-C5D27D0EBD34" + }, { "defKey": "creator_id", "defName": "创建人 Id", @@ -9425,7 +9442,7 @@ "primaryKey": false, "notNull": true, "autoIncrement": false, - "defaultValue": "", + "defaultValue": "''", "hideInGraph": false, "refDict": "", "attr1": "", @@ -9565,7 +9582,7 @@ "primaryKey": false, "notNull": true, "autoIncrement": false, - "defaultValue": "", + "defaultValue": "''", "hideInGraph": false, "refDict": "", "attr1": "", @@ -9582,10 +9599,27 @@ "extProps": {}, "uiHint": "" }, + { + "defKey": "manager_id", + "defName": "负责人 Id", + "comment": "sys_user.id", + "type": "BIGINT", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "9B6B9E10-DB11-4409-878B-5868A19CD9B0", + "extProps": {}, + "id": "1D88A443-3429-4A8C-93D4-3BCC6C8827CD" + }, { "defKey": "creator_id", "defName": "创建人 Id", - "comment": " sys_user.id", + "comment": "sys_user.id", "type": "BIGINT", "len": "", "scale": "", @@ -9612,7 +9646,7 @@ { "defKey": "modifier_id", "defName": "修改人 Id", - "comment": " sys_user.id", + "comment": "sys_user.id", "type": "BIGINT", "len": "", "scale": "",