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 c41e20e..6d44b07 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 @@ -1,6 +1,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 lombok.Getter; import lombok.Setter; @@ -8,6 +9,7 @@ import lombok.ToString; import lombok.experimental.Accessors; import java.time.LocalDateTime; +import java.util.List; /** * 处置记录 @@ -16,7 +18,7 @@ import java.time.LocalDateTime; @Setter @ToString @Accessors(chain = true) -@TableName("dispose_record") +@TableName(value = "dispose_record", autoResultMap = true) public class DisposeRecordEntity { /** @@ -87,6 +89,11 @@ public class DisposeRecordEntity { private String inBodyPhoto; private String outFrontPhoto; private String outBodyPhoto; + /** + * 现场照片 + */ + @TableField(typeHandler = JsonTypeHandler.class) + private List tspPhotos; /** * 创建人 Id; sys_user.id diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/pojo/DisposeRecordReportParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/pojo/DisposeRecordReportParam.java index a946d6f..9d0c827 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/pojo/DisposeRecordReportParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/dispose/pojo/DisposeRecordReportParam.java @@ -65,4 +65,6 @@ public class DisposeRecordReportParam { * 联系电话 */ private String contactPhone; + + private List tspPhotos; } 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 1ed512b..61d22af 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 @@ -186,6 +186,7 @@ public class DisposeRecordService extends ServiceImpl> list(@RequestParam(required = false) Long pid) { - return R.success(sysMenuService.list(pid)); + public R> list(@RequestParam(required = false) Long pid, MenuSearchParam menuSearchParam) { + return R.success(sysMenuService.list(pid, menuSearchParam)); } /** diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/service/SysMenuService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/service/SysMenuService.java index f04c99d..49d5c04 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/service/SysMenuService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/menu/service/SysMenuService.java @@ -165,16 +165,19 @@ public class SysMenuService extends ServiceImpl im } - public List list(Long pid) { + public List list(Long pid, MenuSearchParam menuSearchParam) { + String title = menuSearchParam.getTitle(); + String routeName = menuSearchParam.getRouteName(); return this.list(Wrappers.lambdaQuery() .eq(pid != null, SysMenuEntity::getPid, pid) - .orderByAsc(Arrays.asList(SysMenuEntity::getSort, SysMenuEntity::getId))) + .like(StrUtil.isNotBlank(title), SysMenuEntity::getTitle, title) + .like(StrUtil.isNotBlank(routeName), SysMenuEntity::getRouteName, routeName) + .orderByAsc(Arrays.asList(SysMenuEntity::getTier, SysMenuEntity::getSort))) .stream() .map(it -> BeanUtil.copyProperties(it, MenuDetailResult.class)) .collect(Collectors.toList()); } - public List listUserMenu(Long userId) { List sysMenuEntities = baseMapper.selectMenuByUserId(userId); return sysMenuEntities.stream() diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/controller/TspPhotoController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/controller/TspPhotoController.java new file mode 100644 index 0000000..868488f --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/controller/TspPhotoController.java @@ -0,0 +1,100 @@ +package com.njzscloud.supervisory.tsp.controller; + +import com.njzscloud.common.core.utils.R; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.supervisory.tsp.pojo.TspPhotoEntity; +import com.njzscloud.supervisory.tsp.pojo.TspPhotoSaveParam; +import com.njzscloud.supervisory.tsp.pojo.TspPhotoSearchParam; +import com.njzscloud.supervisory.tsp.service.TspPhotoService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 临时收纳点图片 + */ +@Slf4j +@RestController +@RequestMapping("/tsp_photo") +@RequiredArgsConstructor +public class TspPhotoController { + + private final TspPhotoService tspPhotoService; + + /** + * 新增 + * + * @param tspPhotoEntity 数据 + */ + @PostMapping("/add") + public R add(@RequestBody TspPhotoEntity tspPhotoEntity) { + tspPhotoService.add(tspPhotoEntity); + return R.success(); + } + + /** + * 新增 + * + * @param tspPhotoSaveParam 数据 + */ + @PostMapping("/save") + public R save(@RequestBody TspPhotoSaveParam tspPhotoSaveParam) { + tspPhotoService.save(tspPhotoSaveParam); + return R.success(); + } + + + /** + * 修改 + * + * @param tspPhotoEntity 数据 + */ + @PostMapping("/modify") + public R modify(@RequestBody TspPhotoEntity tspPhotoEntity) { + tspPhotoService.modify(tspPhotoEntity); + return R.success(); + } + + /** + * 删除 + * + * @param ids Ids + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + tspPhotoService.del(ids); + return R.success(); + } + + /** + * 详情 + * + * @param id Id + * @return TspPhotoEntity 结果 + */ + @GetMapping("/detail") + public R detail(@RequestParam Long id) { + return R.success(tspPhotoService.detail(id)); + } + + @GetMapping("/list_photo") + public R listPhoto(TspPhotoSearchParam tspPhotoSearchParam) { + return R.success(tspPhotoService.listPhoto(tspPhotoSearchParam)); + } + + /** + * 分页查询 + * + * @param tspPhotoEntity 筛选条件 + * @param pageParam 分页参数 + * @return PageResult<TspPhotoEntity> 分页结果 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, TspPhotoEntity tspPhotoEntity) { + return R.success(tspPhotoService.paging(pageParam, tspPhotoEntity)); + } + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/mapper/TempStoragePointMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/mapper/TempStoragePointMapper.java index 2b2b255..7cfc1e5 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/mapper/TempStoragePointMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/mapper/TempStoragePointMapper.java @@ -1,9 +1,13 @@ package com.njzscloud.supervisory.tsp.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njzscloud.supervisory.tsp.pojo.TempStoragePointEntity; import com.njzscloud.supervisory.tsp.pojo.TempStoragePointStatisticsResult; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 临时收纳点 @@ -12,4 +16,6 @@ import org.apache.ibatis.annotations.Mapper; public interface TempStoragePointMapper extends BaseMapper { TempStoragePointStatisticsResult statistics(); + + IPage paging(Page page, @Param("ew") Wrapper ew); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/mapper/TspPhotoMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/mapper/TspPhotoMapper.java new file mode 100644 index 0000000..40fd810 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/mapper/TspPhotoMapper.java @@ -0,0 +1,13 @@ +package com.njzscloud.supervisory.tsp.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.supervisory.tsp.pojo.TspPhotoEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 临时收纳点图片 + */ +@Mapper +public interface TspPhotoMapper extends BaseMapper { + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/pojo/TspPhotoEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/pojo/TspPhotoEntity.java new file mode 100644 index 0000000..bb193bb --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/pojo/TspPhotoEntity.java @@ -0,0 +1,76 @@ +package com.njzscloud.supervisory.tsp.pojo; + +import com.baomidou.mybatisplus.annotation.*; +import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +/** + * 临时收纳点图片 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName(value = "tsp_photo", autoResultMap = true) +public class TspPhotoEntity { + + /** + * Id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 临时收纳点 Id + */ + private Long tspId; + + /** + * 上传时间 + */ + private LocalDate uploadDate; + + /** + * 图片地址 + */ + @TableField(typeHandler = JsonTypeHandler.class) + private List photos; + + /** + * 创建人 Id; sys_user.id + */ + @TableField(fill = FieldFill.INSERT) + private Long creatorId; + + /** + * 修改人 Id; sys_user.id + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long modifierId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime modifyTime; + + /** + * 是否删除; 0-->未删除、1-->已删除 + */ + @TableLogic + private Boolean deleted; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/pojo/TspPhotoSaveParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/pojo/TspPhotoSaveParam.java new file mode 100644 index 0000000..62daa04 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/pojo/TspPhotoSaveParam.java @@ -0,0 +1,32 @@ +package com.njzscloud.supervisory.tsp.pojo; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDate; +import java.util.List; + +/** + * 临时收纳点图片 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class TspPhotoSaveParam { + + /** + * 临时收纳点 Id + */ + private Long tspId; + + private LocalDate uploadDate; + + /** + * 图片地址 + */ + private List photos; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/pojo/TspPhotoSearchParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/pojo/TspPhotoSearchParam.java new file mode 100644 index 0000000..22b2bff --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/pojo/TspPhotoSearchParam.java @@ -0,0 +1,26 @@ +package com.njzscloud.supervisory.tsp.pojo; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDate; + +/** + * 临时收纳点图片 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class TspPhotoSearchParam { + + /** + * 临时收纳点 Id + */ + private Long tspId; + + private LocalDate uploadDate; + +} 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 fc5d6a8..9ac637e 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 @@ -71,9 +71,10 @@ public class TempStoragePointService extends ServiceImpl paging(PageParam pageParam, TempStoragePointEntity tempStoragePointEntity) { String pointName = tempStoragePointEntity.getPointName(); PointStatus status = tempStoragePointEntity.getStatus(); - return PageResult.of(this.page(pageParam.toPage(), Wrappers.lambdaQuery() - .like(StrUtil.isNotBlank(pointName), TempStoragePointEntity::getPointName, pointName) - .eq(status != null, TempStoragePointEntity::getStatus, status)) + return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query() + .like(StrUtil.isNotBlank(pointName), "point_name", pointName) + .eq(status != null, "status", status) + .eq("deleted", 0)) ); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/service/TspPhotoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/service/TspPhotoService.java new file mode 100644 index 0000000..b3c6e9f --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/tsp/service/TspPhotoService.java @@ -0,0 +1,96 @@ +package com.njzscloud.supervisory.tsp.service; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +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.supervisory.tsp.mapper.TspPhotoMapper; +import com.njzscloud.supervisory.tsp.pojo.TspPhotoEntity; +import com.njzscloud.supervisory.tsp.pojo.TspPhotoSaveParam; +import com.njzscloud.supervisory.tsp.pojo.TspPhotoSearchParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDate; +import java.util.List; + +/** + * 临时收纳点图片 + */ +@Slf4j +@Service +public class TspPhotoService extends ServiceImpl implements IService { + + /** + * 新增 + * + * @param tspPhotoEntity 数据 + */ + public void add(TspPhotoEntity tspPhotoEntity) { + this.save(tspPhotoEntity); + } + + /** + * 修改 + * + * @param tspPhotoEntity 数据 + */ + public void modify(TspPhotoEntity tspPhotoEntity) { + this.updateById(tspPhotoEntity); + } + + /** + * 删除 + * + * @param ids Ids + */ + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + /** + * 详情 + * + * @param id Id + * @return TspPhotoEntity 结果 + */ + public TspPhotoEntity detail(Long id) { + return this.getById(id); + } + + /** + * 分页查询 + * + * @param tspPhotoEntity 筛选条件 + * @param pageParam 分页参数 + * @return PageResult<TspPhotoEntity> 分页结果 + */ + public PageResult paging(PageParam pageParam, TspPhotoEntity tspPhotoEntity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(tspPhotoEntity))); + } + + @Transactional(rollbackFor = Exception.class) + public void save(TspPhotoSaveParam tspPhotoSaveParam) { + LocalDate uploadDate = tspPhotoSaveParam.getUploadDate(); + TspPhotoEntity oldData = getOne(Wrappers.query() + .eq("tsp_id", tspPhotoSaveParam.getTspId()) + .eq("upload_date", uploadDate) + ); + if (oldData != null) { + this.removeById(oldData.getId()); + } + TspPhotoEntity tspPhotoEntity = BeanUtil.copyProperties(tspPhotoSaveParam, TspPhotoEntity.class); + this.save(tspPhotoEntity); + } + + public TspPhotoEntity listPhoto(TspPhotoSearchParam tspPhotoSearchParam) { + return getOne(Wrappers.query() + .eq("tsp_id", tspPhotoSearchParam.getTspId()) + .eq("upload_date", tspPhotoSearchParam.getUploadDate()) + ); + } +} diff --git a/njzscloud-svr/src/main/resources/mapper/TempStoragePointMapper.xml b/njzscloud-svr/src/main/resources/mapper/TempStoragePointMapper.xml index a39f4cd..3424d56 100644 --- a/njzscloud-svr/src/main/resources/mapper/TempStoragePointMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/TempStoragePointMapper.xml @@ -3,7 +3,7 @@ - + SELECT MAX(IF(s = 1, c, 0)) total_count, + MAX(IF(s = 2, c, 0)) online_count, + MAX(IF(s = 3, c, 0)) offline_count + FROM (SELECT COUNT(*) c, 1 s + FROM temp_storage_point + UNION ALL + SELECT COUNT(*) c, 2 s + FROM temp_storage_point a + LEFT JOIN tsp_photo b ON b.tsp_id = a.id AND b.upload_date = CURRENT_DATE() AND b.deleted = 0 + WHERE b.id IS NOT NULL + UNION ALL + SELECT COUNT(*) c, 3 s + FROM temp_storage_point a + LEFT JOIN tsp_photo b ON b.tsp_id = a.id AND b.upload_date = CURRENT_DATE() AND b.deleted = 0 + WHERE b.id IS NULL) t + + diff --git a/z-doc/zsy-recycling-supervision.pdma.json b/z-doc/zsy-recycling-supervision.pdma.json index 6e13bc1..13f0b22 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-7-31 16:05:41", + "updatedTime": "2025-8-20 14:31:53", "dbConns": [], "profile": { "default": { @@ -8995,6 +8995,23 @@ "extProps": {}, "uiHint": "" }, + { + "defKey": "data_sn", + "defName": "业务订单号", + "comment": "", + "type": "VARCHAR", + "len": 128, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231", + "extProps": {}, + "id": "1DB6F958-D3D5-49C0-B7C6-4F2CF5369E09" + }, { "defKey": "out_time", "defName": "出场时间", @@ -9023,6 +9040,91 @@ "extProps": {}, "uiHint": "" }, + { + "defKey": "in_front_photo", + "defName": "入场车头照", + "comment": "", + "type": "VARCHAR", + "len": 512, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231", + "extProps": {}, + "id": "2F13F5C8-6CCE-4CCE-9C7A-9C361E4D1C23" + }, + { + "defKey": "in_body_photo", + "defName": "入场车身照", + "comment": "", + "type": "VARCHAR", + "len": 512, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231", + "extProps": {}, + "id": "CFDBE9D7-41CE-4307-8A3F-64A78983F349" + }, + { + "defKey": "out_front_photo", + "defName": "出场车头照", + "comment": "", + "type": "VARCHAR", + "len": 512, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231", + "extProps": {}, + "id": "5A54950F-0869-4878-A2E0-33FEBCC00D56" + }, + { + "defKey": "out_body_photo", + "defName": "出场车身照", + "comment": "", + "type": "VARCHAR", + "len": 512, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231", + "extProps": {}, + "id": "BCB6BECF-14C7-4C5B-A359-BAA5A72B7C97" + }, + { + "defKey": "tsp_photos", + "defName": "现场照片", + "comment": "", + "type": "TEXT", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "B1BC2E92-6A75-44C0-A254-76E066047F53", + "extProps": {}, + "id": "DF246FD3-8E1E-470F-883C-E0AA51D0AF3A" + }, { "defKey": "creator_id", "defName": "创建人 Id", @@ -9705,6 +9807,312 @@ ], "correlations": [], "notes": {} + }, + { + "id": "50663E45-2BBA-4955-A8D7-FC620CDFC07F", + "env": { + "base": { + "nameSpace": "", + "codeRoot": "" + } + }, + "defKey": "tsp_photo", + "defName": "临时收纳点图片", + "comment": "", + "properties": {}, + "sysProps": { + "nameTemplate": "{defKey}[{defName}]" + }, + "notes": {}, + "headers": [ + { + "refKey": "hideInGraph", + "hideInGraph": true + }, + { + "refKey": "defKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "type", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "len", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "scale", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "defaultValue", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "defName", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "comment", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "notNull", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "primaryKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "autoIncrement", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "refDict", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "domain", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "isStandard", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "uiHint", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "extProps", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr1", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr2", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr3", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr4", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr5", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr6", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr7", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr8", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr9", + "freeze": false, + "hideInGraph": true + } + ], + "fields": [ + { + "defKey": "id", + "defName": "Id", + "comment": "", + "type": "BIGINT", + "len": "", + "scale": "", + "primaryKey": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "57FDEEBC-11B3-4C7E-95C0-449D1B9FCC3C", + "baseType": "9B6B9E10-DB11-4409-878B-5868A19CD9B0" + }, + { + "defKey": "tsp_id", + "defName": "临时收纳点 Id", + "comment": "", + "type": "BIGINT", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "9B6B9E10-DB11-4409-878B-5868A19CD9B0", + "extProps": {}, + "id": "357905DD-7A61-45F8-89FC-379EF382FD3E" + }, + { + "defKey": "upload_date", + "defName": "上传时间", + "comment": "", + "type": "DATE", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "3A052098-D276-468A-926A-26DA156E479A", + "extProps": {}, + "id": "10876FFD-BBFE-435A-B41B-EDE11E5EB2E9" + }, + { + "defKey": "photos", + "defName": "图片地址", + "comment": "", + "type": "TEXT", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "baseType": "B1BC2E92-6A75-44C0-A254-76E066047F53", + "extProps": {}, + "id": "F10846FA-834A-4E9D-9FAC-659A92FE46DC" + }, + { + "defKey": "creator_id", + "defName": "创建人 Id", + "comment": "sys_user.id", + "type": "BIGINT", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "D823D6E9-67FD-4425-BB74-3094AF88880F", + "baseType": "9B6B9E10-DB11-4409-878B-5868A19CD9B0" + }, + { + "defKey": "modifier_id", + "defName": "修改人 Id", + "comment": "sys_user.id", + "type": "BIGINT", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "320477E1-9AB0-46C9-A417-5D96DB5FA8E8", + "baseType": "9B6B9E10-DB11-4409-878B-5868A19CD9B0" + }, + { + "defKey": "create_time", + "defName": "创建时间", + "comment": "", + "type": "DATETIME", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "2AA7AD75-B105-4A6E-88FF-66AA54C42FF8", + "baseType": "A098BA98-4957-43EE-9F06-1CDC26D370E0" + }, + { + "defKey": "modify_time", + "defName": "修改时间", + "comment": "", + "type": "DATETIME", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "5CFAD226-08A5-4AC3-B1B0-53CB78FACB77", + "baseType": "A098BA98-4957-43EE-9F06-1CDC26D370E0" + }, + { + "defKey": "deleted", + "defName": "是否删除", + "comment": "0-->未删除、1-->已删除", + "type": "TINYINT", + "len": 1, + "scale": "", + "primaryKey": false, + "notNull": true, + "autoIncrement": false, + "defaultValue": "0", + "hideInGraph": true, + "refDict": "", + "extProps": {}, + "id": "9E735BEB-640A-45CF-BF82-1853A8F6C41B", + "baseType": "9C056E28-859C-4498-9E07-63480343AFEB" + } + ], + "correlations": [], + "indexes": [], + "type": "P" } ], "views": [],