From 57dda2d9ef444e62140b5469254565822d2702fe Mon Sep 17 00:00:00 2001 From: 戈灵虎 <50576256@qq.com> Date: Sun, 16 Nov 2025 18:12:16 +0800 Subject: [PATCH] 迁移 --- urbanops-module-ai/src/main/java/com/zteits/urbanops/module/ai/framework/ai/config/AiAutoConfiguration.java | 1 - urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/api/EventController.java | 2 +- urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/api/ProblemsApiController.java | 2 +- urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/flowpathidea/FlowpathIdeaController.java | 2 +- urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/problems/ProblemsController.java | 2 +- urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/roadinfo/RoadInfoController.java | 2 +- urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/workorders/WorkOrdersController.java | 2 +- urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/workorderscommitdetail/WorkOrdersCommitDetailController.java | 2 +- urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/app/wechat/WeixinController.java | 2 +- urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/flowpathidea/FlowpathIdeaDO.java | 4 ++-- urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/problems/ProblemsDO.java | 4 ++-- urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/roadinfo/RoadInfoDO.java | 4 ++-- urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorders/WorkOrdersDO.java | 4 ++-- urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorderscommitdetail/WorkOrdersCommitDetailDO.java | 4 ++-- urbanops-module-gloabl/src/main/resources/mapper/flowpathidea/FlowpathIdeaMapper.xml | 10 ++++++++++ urbanops-module-gloabl/src/main/resources/mapper/problems/ProblemsMapper.xml | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-gloabl/src/main/resources/mapper/roadinfo/RoadInfoMapper.xml | 32 ++++++++++++++++++++++++++++++++ urbanops-module-gloabl/src/main/resources/mapper/workorders/WorkOrdersMapper.xml | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-gloabl/src/main/resources/mapper/workorderscommitdetail/WorkOrdersCommitDetailMapper.xml | 12 ++++++++++++ urbanops-server/src/main/resources/application.yaml | 3 ++- urbanops-server/src/main/resources/logback-spring.xml | 4 ++++ 21 files changed, 215 insertions(+), 20 deletions(-) create mode 100644 urbanops-module-gloabl/src/main/resources/mapper/flowpathidea/FlowpathIdeaMapper.xml create mode 100644 urbanops-module-gloabl/src/main/resources/mapper/problems/ProblemsMapper.xml create mode 100644 urbanops-module-gloabl/src/main/resources/mapper/roadinfo/RoadInfoMapper.xml create mode 100644 urbanops-module-gloabl/src/main/resources/mapper/workorders/WorkOrdersMapper.xml create mode 100644 urbanops-module-gloabl/src/main/resources/mapper/workorderscommitdetail/WorkOrdersCommitDetailMapper.xml diff --git a/urbanops-module-ai/src/main/java/com/zteits/urbanops/module/ai/framework/ai/config/AiAutoConfiguration.java b/urbanops-module-ai/src/main/java/com/zteits/urbanops/module/ai/framework/ai/config/AiAutoConfiguration.java index 5b2bf45..49b490b 100644 --- a/urbanops-module-ai/src/main/java/com/zteits/urbanops/module/ai/framework/ai/config/AiAutoConfiguration.java +++ b/urbanops-module-ai/src/main/java/com/zteits/urbanops/module/ai/framework/ai/config/AiAutoConfiguration.java @@ -16,7 +16,6 @@ import com.zteits.urbanops.module.ai.framework.ai.core.model.xinghuo.XingHuoChat import com.zteits.urbanops.module.ai.framework.ai.core.webserch.AiWebSearchClient; import com.zteits.urbanops.module.ai.framework.ai.core.webserch.bocha.AiBoChaWebSearchClient; import com.zteits.urbanops.module.ai.tool.method.PersonService; -import lombok.extern.slf4j.Slf4j; import org.springframework.ai.deepseek.DeepSeekChatModel; import org.springframework.ai.deepseek.DeepSeekChatOptions; import org.springframework.ai.deepseek.api.DeepSeekApi; diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/api/EventController.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/api/EventController.java index c166ac8..c77edda 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/api/EventController.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/api/EventController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController; * Date: 2025年6月15 11:56 */ @RestController -@RequestMapping("/gloabl/work-orders") +@RequestMapping({"/gloabl/work-orders","/work-orders"}) @RequiredArgsConstructor public class EventController { diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/api/ProblemsApiController.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/api/ProblemsApiController.java index 3487307..ed2870c 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/api/ProblemsApiController.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/api/ProblemsApiController.java @@ -30,7 +30,7 @@ import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCo * Date: 2025年6月15 11:56 */ @RestController -@RequestMapping("/gloabl/problems") +@RequestMapping({"/gloabl/problems","/problems"}) @RequiredArgsConstructor public class ProblemsApiController { diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/flowpathidea/FlowpathIdeaController.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/flowpathidea/FlowpathIdeaController.java index da7ad31..aa339f8 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/flowpathidea/FlowpathIdeaController.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/flowpathidea/FlowpathIdeaController.java @@ -32,7 +32,7 @@ import java.util.List; @Tag(name = "管理后台 - 流程审核意见") @RestController -@RequestMapping("/gloabl/flowpath-idea") +@RequestMapping({"/gloabl/flowpath-idea","/flowpath-idea"}) @Validated public class FlowpathIdeaController { diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/problems/ProblemsController.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/problems/ProblemsController.java index 563d4e0..87f8c2b 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/problems/ProblemsController.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/problems/ProblemsController.java @@ -39,7 +39,7 @@ import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 事件表--问题单") @RestController -@RequestMapping("/gloabl/problems") +@RequestMapping({"/gloabl/problems","/problems"}) @Validated public class ProblemsController { diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/roadinfo/RoadInfoController.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/roadinfo/RoadInfoController.java index 641b389..7c5010e 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/roadinfo/RoadInfoController.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/roadinfo/RoadInfoController.java @@ -35,7 +35,7 @@ import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 道路信息对应关系") @RestController -@RequestMapping("/gloabl/road-info") +@RequestMapping({"/gloabl/road-info","/road-info"}) @Validated public class RoadInfoController { diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/workorders/WorkOrdersController.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/workorders/WorkOrdersController.java index 5c21ff6..73ce7fc 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/workorders/WorkOrdersController.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/workorders/WorkOrdersController.java @@ -44,7 +44,7 @@ import static com.zteits.urbanops.module.gloabl.enums.ErrorCodeConstants.*; @Tag(name = "管理后台 - 工单") @RestController -@RequestMapping("/gloabl/work-orders") +@RequestMapping({"/gloabl/work-orders","/work-orders"}) @Validated public class WorkOrdersController { diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/workorderscommitdetail/WorkOrdersCommitDetailController.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/workorderscommitdetail/WorkOrdersCommitDetailController.java index 7c81bb0..db8404c 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/workorderscommitdetail/WorkOrdersCommitDetailController.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/workorderscommitdetail/WorkOrdersCommitDetailController.java @@ -35,7 +35,7 @@ import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 任务处理结果") @RestController -@RequestMapping("/gloabl/work-orders-commit-detail") +@RequestMapping({"/gloabl/work-orders-commit-detail","/work-orders-commit-detail"}) @Validated public class WorkOrdersCommitDetailController { diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/app/wechat/WeixinController.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/app/wechat/WeixinController.java index f44cb88..d4fccef 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/app/wechat/WeixinController.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/app/wechat/WeixinController.java @@ -36,7 +36,7 @@ import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; */ @Tag(name = "微信小程序") @RestController -@RequestMapping("/gloabl/weixinPublicPay") +@RequestMapping({"/gloabl/weixinPublicPay","/weixinPublicPay"}) public class WeixinController{ private static final Logger logger = LoggerFactory.getLogger(WeixinController.class); diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/flowpathidea/FlowpathIdeaDO.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/flowpathidea/FlowpathIdeaDO.java index 3903a6d..bf86e2e 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/flowpathidea/FlowpathIdeaDO.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/flowpathidea/FlowpathIdeaDO.java @@ -12,8 +12,8 @@ import java.time.LocalDateTime; * * @author 芋道源码 */ -@TableName("td_flowpath_idea") -@KeySequence("td_flowpath_idea_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName("global_flowpath_idea") +@KeySequence("global_flowpath_idea_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @ToString(callSuper = true) @Builder diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/problems/ProblemsDO.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/problems/ProblemsDO.java index 09c6029..727279b 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/problems/ProblemsDO.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/problems/ProblemsDO.java @@ -15,8 +15,8 @@ import java.time.LocalDateTime; * * @author 芋道源码 */ -@TableName(value = "td_problems", autoResultMap = true) -@KeySequence("td_problems_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName(value = "global_problems", autoResultMap = true) +@KeySequence("global_problems_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @ToString(callSuper = true) @Builder diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/roadinfo/RoadInfoDO.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/roadinfo/RoadInfoDO.java index 1115a88..f951587 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/roadinfo/RoadInfoDO.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/roadinfo/RoadInfoDO.java @@ -11,8 +11,8 @@ import lombok.*; * * @author 芋道源码 */ -@TableName("master_road_info") -@KeySequence("master_road_info_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName("global_master_road_info") +@KeySequence("global_master_road_info_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @ToString(callSuper = true) @Builder diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorders/WorkOrdersDO.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorders/WorkOrdersDO.java index 883fb6e..ead1d0b 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorders/WorkOrdersDO.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorders/WorkOrdersDO.java @@ -13,8 +13,8 @@ import java.time.LocalDateTime; * * @author 芋道源码 */ -@TableName("td_work_orders") -@KeySequence("td_work_orders_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName("global_work_orders") +@KeySequence("global_work_orders_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @ToString(callSuper = true) @Builder diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorderscommitdetail/WorkOrdersCommitDetailDO.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorderscommitdetail/WorkOrdersCommitDetailDO.java index 9522a6f..20a5e98 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorderscommitdetail/WorkOrdersCommitDetailDO.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorderscommitdetail/WorkOrdersCommitDetailDO.java @@ -17,8 +17,8 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE * * @author 芋道源码 */ -@TableName(value = "td_work_orders_commit_detail",autoResultMap = true) -@KeySequence("td_work_orders_commit_detail_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName(value = "global_work_orders_commit_detail",autoResultMap = true) +@KeySequence("global_work_orders_commit_detail_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @ToString(callSuper = true) @Builder diff --git a/urbanops-module-gloabl/src/main/resources/mapper/flowpathidea/FlowpathIdeaMapper.xml b/urbanops-module-gloabl/src/main/resources/mapper/flowpathidea/FlowpathIdeaMapper.xml new file mode 100644 index 0000000..20ab238 --- /dev/null +++ b/urbanops-module-gloabl/src/main/resources/mapper/flowpathidea/FlowpathIdeaMapper.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/urbanops-module-gloabl/src/main/resources/mapper/problems/ProblemsMapper.xml b/urbanops-module-gloabl/src/main/resources/mapper/problems/ProblemsMapper.xml new file mode 100644 index 0000000..f1099e4 --- /dev/null +++ b/urbanops-module-gloabl/src/main/resources/mapper/problems/ProblemsMapper.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/urbanops-module-gloabl/src/main/resources/mapper/roadinfo/RoadInfoMapper.xml b/urbanops-module-gloabl/src/main/resources/mapper/roadinfo/RoadInfoMapper.xml new file mode 100644 index 0000000..65418ee --- /dev/null +++ b/urbanops-module-gloabl/src/main/resources/mapper/roadinfo/RoadInfoMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/urbanops-module-gloabl/src/main/resources/mapper/workorders/WorkOrdersMapper.xml b/urbanops-module-gloabl/src/main/resources/mapper/workorders/WorkOrdersMapper.xml new file mode 100644 index 0000000..31c1e34 --- /dev/null +++ b/urbanops-module-gloabl/src/main/resources/mapper/workorders/WorkOrdersMapper.xml @@ -0,0 +1,84 @@ + + + + + + + + \ No newline at end of file diff --git a/urbanops-module-gloabl/src/main/resources/mapper/workorderscommitdetail/WorkOrdersCommitDetailMapper.xml b/urbanops-module-gloabl/src/main/resources/mapper/workorderscommitdetail/WorkOrdersCommitDetailMapper.xml new file mode 100644 index 0000000..b964703 --- /dev/null +++ b/urbanops-module-gloabl/src/main/resources/mapper/workorderscommitdetail/WorkOrdersCommitDetailMapper.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/urbanops-server/src/main/resources/application.yaml b/urbanops-server/src/main/resources/application.yaml index de6134c..538e055 100644 --- a/urbanops-server/src/main/resources/application.yaml +++ b/urbanops-server/src/main/resources/application.yaml @@ -67,6 +67,7 @@ flowable: mybatis-plus: configuration: map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。 + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl global-config: db-config: id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。 @@ -306,7 +307,7 @@ urbanops: delete-batch-enable: true # 是否生成批量删除接口 unit-test-enable: false # 是否生成单元测试 tenant: # 多租户相关配置项 - enable: true + enable: false ignore-urls: - /jmreport/* # 积木报表，无法携带租户编号 ignore-visit-urls: diff --git a/urbanops-server/src/main/resources/logback-spring.xml b/urbanops-server/src/main/resources/logback-spring.xml index 15b28cf..8cb6ea8 100644 --- a/urbanops-server/src/main/resources/logback-spring.xml +++ b/urbanops-server/src/main/resources/logback-spring.xml @@ -53,4 +53,8 @@ + + + + -- libgit2 0.21.4