BJ_FS / urbanops

Commit 57dda2d9ef444e62140b5469254565822d2702fe

Authored by 戈灵虎
1 parent 95712275

迁移

Inline Side-by-side
Showing 21 changed files with 215 additions and 20 deletions
urbanops-module-ai/src/main/java/com/zteits/urbanops/module/ai/framework/ai/config/AiAutoConfiguration.java
  View file @57dda2d
... ... @@ -16,7 +16,6 @@ import com.zteits.urbanops.module.ai.framework.ai.core.model.xinghuo.XingHuoChat
16 16 import com.zteits.urbanops.module.ai.framework.ai.core.webserch.AiWebSearchClient;
17 17 import com.zteits.urbanops.module.ai.framework.ai.core.webserch.bocha.AiBoChaWebSearchClient;
18 18 import com.zteits.urbanops.module.ai.tool.method.PersonService;
19   -import lombok.extern.slf4j.Slf4j;
20 19 import org.springframework.ai.deepseek.DeepSeekChatModel;
21 20 import org.springframework.ai.deepseek.DeepSeekChatOptions;
22 21 import org.springframework.ai.deepseek.api.DeepSeekApi;
... ...
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/api/EventController.java
  View file @57dda2d
... ... @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
23 23 * Date: 2025年6月15 11:56
24 24 */
25 25 @RestController
26   -@RequestMapping("/gloabl/work-orders")
  26 +@RequestMapping({"/gloabl/work-orders","/work-orders"})
27 27 @RequiredArgsConstructor
28 28 public class EventController {
29 29  
... ...
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/api/ProblemsApiController.java
  View file @57dda2d
... ... @@ -30,7 +30,7 @@ import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCo
30 30 * Date: 2025年6月15 11:56
31 31 */
32 32 @RestController
33   -@RequestMapping("/gloabl/problems")
  33 +@RequestMapping({"/gloabl/problems","/problems"})
34 34 @RequiredArgsConstructor
35 35 public class ProblemsApiController {
36 36  
... ...
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/flowpathidea/FlowpathIdeaController.java
  View file @57dda2d
... ... @@ -32,7 +32,7 @@ import java.util.List;
32 32  
33 33 @Tag(name = "管理后台 - 流程审核意见")
34 34 @RestController
35   -@RequestMapping("/gloabl/flowpath-idea")
  35 +@RequestMapping({"/gloabl/flowpath-idea","/flowpath-idea"})
36 36 @Validated
37 37 public class FlowpathIdeaController {
38 38  
... ...
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/problems/ProblemsController.java
  View file @57dda2d
... ... @@ -39,7 +39,7 @@ import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
39 39  
40 40 @Tag(name = "管理后台 - 事件表--问题单")
41 41 @RestController
42   -@RequestMapping("/gloabl/problems")
  42 +@RequestMapping({"/gloabl/problems","/problems"})
43 43 @Validated
44 44 public class ProblemsController {
45 45  
... ...
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/roadinfo/RoadInfoController.java
  View file @57dda2d
... ... @@ -35,7 +35,7 @@ import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
35 35  
36 36 @Tag(name = "管理后台 - 道路信息对应关系")
37 37 @RestController
38   -@RequestMapping("/gloabl/road-info")
  38 +@RequestMapping({"/gloabl/road-info","/road-info"})
39 39 @Validated
40 40 public class RoadInfoController {
41 41  
... ...
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/workorders/WorkOrdersController.java
  View file @57dda2d
... ... @@ -44,7 +44,7 @@ import static com.zteits.urbanops.module.gloabl.enums.ErrorCodeConstants.*;
44 44  
45 45 @Tag(name = "管理后台 - 工单")
46 46 @RestController
47   -@RequestMapping("/gloabl/work-orders")
  47 +@RequestMapping({"/gloabl/work-orders","/work-orders"})
48 48 @Validated
49 49 public class WorkOrdersController {
50 50  
... ...
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/workorderscommitdetail/WorkOrdersCommitDetailController.java
  View file @57dda2d
... ... @@ -35,7 +35,7 @@ import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
35 35  
36 36 @Tag(name = "管理后台 - 任务处理结果")
37 37 @RestController
38   -@RequestMapping("/gloabl/work-orders-commit-detail")
  38 +@RequestMapping({"/gloabl/work-orders-commit-detail","/work-orders-commit-detail"})
39 39 @Validated
40 40 public class WorkOrdersCommitDetailController {
41 41  
... ...
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/app/wechat/WeixinController.java
  View file @57dda2d
... ... @@ -36,7 +36,7 @@ import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
36 36 */
37 37 @Tag(name = "微信小程序")
38 38 @RestController
39   -@RequestMapping("/gloabl/weixinPublicPay")
  39 +@RequestMapping({"/gloabl/weixinPublicPay","/weixinPublicPay"})
40 40 public class WeixinController{
41 41  
42 42 private static final Logger logger = LoggerFactory.getLogger(WeixinController.class);
... ...
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/flowpathidea/FlowpathIdeaDO.java
  View file @57dda2d
... ... @@ -12,8 +12,8 @@ import java.time.LocalDateTime;
12 12 *
13 13 * @author 芋道源码
14 14 */
15   -@TableName("td_flowpath_idea")
16   -@KeySequence("td_flowpath_idea_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  15 +@TableName("global_flowpath_idea")
  16 +@KeySequence("global_flowpath_idea_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
17 17 @Data
18 18 @ToString(callSuper = true)
19 19 @Builder
... ...
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/problems/ProblemsDO.java
  View file @57dda2d
... ... @@ -15,8 +15,8 @@ import java.time.LocalDateTime;
15 15 *
16 16 * @author 芋道源码
17 17 */
18   -@TableName(value = "td_problems", autoResultMap = true)
19   -@KeySequence("td_problems_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  18 +@TableName(value = "global_problems", autoResultMap = true)
  19 +@KeySequence("global_problems_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
20 20 @Data
21 21 @ToString(callSuper = true)
22 22 @Builder
... ...
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/roadinfo/RoadInfoDO.java
  View file @57dda2d
... ... @@ -11,8 +11,8 @@ import lombok.*;
11 11 *
12 12 * @author 芋道源码
13 13 */
14   -@TableName("master_road_info")
15   -@KeySequence("master_road_info_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  14 +@TableName("global_master_road_info")
  15 +@KeySequence("global_master_road_info_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
16 16 @Data
17 17 @ToString(callSuper = true)
18 18 @Builder
... ...
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorders/WorkOrdersDO.java
  View file @57dda2d
... ... @@ -13,8 +13,8 @@ import java.time.LocalDateTime;
13 13 *
14 14 * @author 芋道源码
15 15 */
16   -@TableName("td_work_orders")
17   -@KeySequence("td_work_orders_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  16 +@TableName("global_work_orders")
  17 +@KeySequence("global_work_orders_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
18 18 @Data
19 19 @ToString(callSuper = true)
20 20 @Builder
... ...
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorderscommitdetail/WorkOrdersCommitDetailDO.java
  View file @57dda2d
... ... @@ -17,8 +17,8 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE
17 17 *
18 18 * @author 芋道源码
19 19 */
20   -@TableName(value = "td_work_orders_commit_detail",autoResultMap = true)
21   -@KeySequence("td_work_orders_commit_detail_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  20 +@TableName(value = "global_work_orders_commit_detail",autoResultMap = true)
  21 +@KeySequence("global_work_orders_commit_detail_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
22 22 @Data
23 23 @ToString(callSuper = true)
24 24 @Builder
... ...
urbanops-module-gloabl/src/main/resources/mapper/flowpathidea/FlowpathIdeaMapper.xml 0 → 100644
  View file @57dda2d
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.zteits.urbanops.module.gloabl.dal.mapper.flowpathidea.FlowpathIdeaMapper">
  4 + <select id="selectByWorkNo" parameterType="java.lang.String"
  5 + resultType="com.zteits.urbanops.module.gloabl.dal.dataobject.flowpathidea.FlowpathIdeaDO">
  6 + SELECT * FROM global_flowpath_idea
  7 + WHERE work_no = #{workNo}
  8 + ORDER BY flowpath_idea_id DESC
  9 + </select>
  10 +</mapper>
0 11 \ No newline at end of file
... ...
urbanops-module-gloabl/src/main/resources/mapper/problems/ProblemsMapper.xml 0 → 100644
  View file @57dda2d
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.zteits.urbanops.module.gloabl.dal.mapper.problems.ProblemsMapper">
  4 + <resultMap id="BaseResultMap" type="com.zteits.urbanops.module.gloabl.dal.dataobject.problems.ProblemsDO">
  5 + <result column="problem_no" jdbcType="VARCHAR" property="problemNo"/>
  6 + <result column="problem_name" jdbcType="VARCHAR" property="problemName"/>
  7 + <result column="problem_source_id" jdbcType="VARCHAR" property="problemSourceId"/>
  8 + <result column="user_confrim_remark" jdbcType="VARCHAR" property="userConfrimRemark"/>
  9 + <result column="user_confrim_time" jdbcType="TIMESTAMP" property="userConfrimTime"/>
  10 + <result column="user_confrim_imgs" jdbcType="VARCHAR" property="userConfrimImgs" typeHandler="com.zteits.urbanops.module.gloabl.dal.StringArrayTypeHandler"/>
  11 + <result column="user_confrim_lat" jdbcType="DECIMAL" property="userConfrimLat"/>
  12 + <result column="user_confrim_lon" jdbcType="DECIMAL" property="userConfrimLon"/>
  13 + <result column="user_confrim_addr" jdbcType="VARCHAR" property="userConfrimAddr"/>
  14 + <result column="problem_status" jdbcType="VARCHAR" property="problemStatus"/>
  15 + <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
  16 + <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
  17 + <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
  18 + <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
  19 + </resultMap>
  20 + <select id="selectProblemsByCondition"
  21 + parameterType="com.zteits.urbanops.module.gloabl.dal.dataobject.problems.ProblemsDO"
  22 + resultMap="BaseResultMap">
  23 + select * from global_problems
  24 + <where>
  25 + <if test="problemNo != null and problemNo != ''">
  26 + and problem_no = #{problemNo}
  27 + </if>
  28 + </where>
  29 + </select>
  30 + <select id="countProblems"
  31 + parameterType="com.zteits.urbanops.module.gloabl.controller.admin.problems.vo.ProblemsReqVO"
  32 + resultType="java.util.Map">
  33 + SELECT
  34 + COUNT(1) AS totalCount,
  35 + IFNULL(SUM(CASE WHEN problem_status = 1 THEN 1 ELSE 0 end), 0) AS pendingCount,
  36 + IFNULL(SUM(CASE WHEN problem_status = 2 THEN 1 ELSE 0 end), 0) AS processingCount,
  37 + IFNULL(SUM(CASE WHEN problem_status = 4 THEN 1 ELSE 0 end), 0) AS completedCount,
  38 + IFNULL(SUM(CASE WHEN problem_status = 5 THEN 1 ELSE 0 end), 0) AS cancelledCount,
  39 + IFNULL(SUM(CASE WHEN problem_status = 3 THEN 1 ELSE 0 end), 0) AS pendingReviewCount
  40 + FROM global_problems
  41 + <where>
  42 + <if test="createBy != null and createBy != ''">
  43 + and create_by = #{createBy}
  44 + </if>
  45 + <if test="startTime != null">
  46 + AND create_time >= #{startTime}
  47 + </if>
  48 + <if test="endTime != null">
  49 + AND create_time &lt;= #{endTime}
  50 + </if>
  51 + </where>
  52 + </select>
  53 +</mapper>
0 54 \ No newline at end of file
... ...
urbanops-module-gloabl/src/main/resources/mapper/roadinfo/RoadInfoMapper.xml 0 → 100644
  View file @57dda2d
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.zteits.urbanops.module.gloabl.dal.mapper.roadinfo.RoadInfoMapper">
  4 + <resultMap id="BaseResultMap" type="com.zteits.urbanops.module.gloabl.dal.dataobject.roadinfo.RoadInfoDO">
  5 + <result column="m_code" jdbcType="VARCHAR" property="mCode"/>
  6 + <result column="sz_id" jdbcType="VARCHAR" property="szId"/>
  7 + <result column="yl_id" jdbcType="VARCHAR" property="ylId"/>
  8 + <result column="wy_id" jdbcType="VARCHAR" property="wyId"/>
  9 + <result column="road_name" jdbcType="VARCHAR" property="roadName"/>
  10 + <result column="street_code" jdbcType="VARCHAR" property="streetCode"/>
  11 + <result column="street_name" jdbcType="VARCHAR" property="streetName"/>
  12 + </resultMap>
  13 + <select id="selectRoadInfoByCondition"
  14 + parameterType="com.zteits.urbanops.module.gloabl.controller.admin.roadinfo.vo.RoadInfoReqVO"
  15 + resultMap="BaseResultMap">
  16 + select * from global_master_road_info
  17 + <where>
  18 + <if test="streetCode != null and streetCode != ''">
  19 + and street_code = #{streetCode}
  20 + </if>
  21 + <if test="mCode != null and mCode != ''">
  22 + and m_code = #{mCode}
  23 + </if>
  24 + <if test="roadName != null and roadName != ''">
  25 + and road_name like CONCAT('%', #{roadName}, '%')
  26 + </if>
  27 + <if test="streetName != null and streetName != ''">
  28 + and street_name like CONCAT('%', #{streetName}, '%')
  29 + </if>
  30 + </where>
  31 + </select>
  32 +</mapper>
0 33 \ No newline at end of file
... ...
urbanops-module-gloabl/src/main/resources/mapper/workorders/WorkOrdersMapper.xml 0 → 100644
  View file @57dda2d
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.zteits.urbanops.module.gloabl.dal.mapper.workorders.WorkOrdersMapper">
  4 + <select id="selectWorksByCondition"
  5 + parameterType="com.zteits.urbanops.module.gloabl.dal.dataobject.workorders.WorkOrdersDO"
  6 + resultType="com.zteits.urbanops.module.gloabl.dal.dataobject.workorders.WorkOrdersDO">
  7 + select * from global_work_orders
  8 + <where>
  9 + <if test="problemNo != null and problemNo != ''">
  10 + and problem_no = #{problemNo}
  11 + </if>
  12 + <if test="companyNo != null and companyNo != ''">
  13 + and company_no = #{companyNo}
  14 + </if>
  15 + <if test="workNo != null and workNo != ''">
  16 + and work_no = #{workNo}
  17 + </if>
  18 + </where>
  19 + </select>
  20 + <select id="selectCompanyByNo"
  21 + parameterType="java.lang.String"
  22 + resultType="java.util.Map">
  23 + SELECT company_no ,company_name
  24 + FROM global_work_orders
  25 + <where>
  26 + <if test="problemNo != null and problemNo != ''">
  27 + and problem_no = #{problemNo}
  28 + </if>
  29 + </where>
  30 + group by company_no ,company_name
  31 + </select>
  32 + <select id="countWorkOrder"
  33 + parameterType="com.zteits.urbanops.module.gloabl.controller.admin.workorders.vo.WorkOrdersReqVO"
  34 + resultType="java.util.Map">
  35 + select v.date_value,t.company_no,count(company_no) num
  36 + from view_statics_times v
  37 + left join global_work_orders t
  38 + on v.date_value= DATE_FORMAT(t.create_time, '%Y-%m-%d')
  39 + <if test="companyNo != null and companyNo != ''">
  40 + AND company_no = #{companyNo}
  41 + </if>
  42 + <if test="createBy != null and createBy != ''">
  43 + AND create_by = #{createBy}
  44 + </if>
  45 + <where>
  46 + <if test="startTime != null">
  47 + AND date_value >= #{startTime}
  48 + </if>
  49 + <if test="endTime != null">
  50 + AND date_value &lt;= #{endTime}
  51 + </if>
  52 + </where>
  53 + group by v.date_value,t.company_no
  54 + order by date_value asc
  55 + </select>
  56 + <select id="countWorkOrderGroup"
  57 + parameterType="com.zteits.urbanops.module.gloabl.controller.admin.workorders.vo.WorkOrdersReqVO"
  58 + resultType="java.util.Map">
  59 + SELECT
  60 + d.label AS name,
  61 + COUNT(t.id) AS value
  62 + FROM
  63 + system_dict_data d
  64 + LEFT JOIN global_work_orders t
  65 + ON d.label = t.company_no
  66 + <if test="startTime != null">
  67 + AND DATE_FORMAT(t.create_time, '%Y-%m-%d') >= #{startTime}
  68 + </if>
  69 + <if test="endTime != null">
  70 + AND DATE_FORMAT(t.create_time, '%Y-%m-%d') &lt;= #{endTime}
  71 + </if>
  72 + <if test="createBy != null and createBy != ''">
  73 + AND create_by = #{createBy}
  74 + </if>
  75 + <if test="userConfrimStatus != null ">
  76 + AND user_confrim_status = #{userConfrimStatus}
  77 + </if>
  78 + <where>
  79 + dict_type ='company_type' and d.status ='0'
  80 + </where>
  81 + GROUP BY
  82 + label
  83 + </select>
  84 +</mapper>
0 85 \ No newline at end of file
... ...
urbanops-module-gloabl/src/main/resources/mapper/workorderscommitdetail/WorkOrdersCommitDetailMapper.xml 0 → 100644
  View file @57dda2d
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.zteits.urbanops.module.gloabl.dal.mapper.workorderscommitdetail.WorkOrdersCommitDetailMapper">
  4 + <select id="selectDetailByCondition"
  5 + parameterType="String"
  6 + resultType="com.zteits.urbanops.module.gloabl.controller.admin.workorderscommitdetail.vo.WorkOrdersCommitDetailRespVO">
  7 + SELECT d.*
  8 + FROM global_work_orders_commit_detail d
  9 + JOIN global_work_orders w ON d.work_no = w.work_no
  10 + WHERE w.problem_no = #{problemNo}
  11 + </select>
  12 +</mapper>
0 13 \ No newline at end of file
... ...
urbanops-server/src/main/resources/application.yaml
  View file @57dda2d
... ... @@ -67,6 +67,7 @@ flowable:
67 67 mybatis-plus:
68 68 configuration:
69 69 map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。
  70 + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
70 71 global-config:
71 72 db-config:
72 73 id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。
... ... @@ -306,7 +307,7 @@ urbanops:
306 307 delete-batch-enable: true # 是否生成批量删除接口
307 308 unit-test-enable: false # 是否生成单元测试
308 309 tenant: # 多租户相关配置项
309   - enable: true
  310 + enable: false
310 311 ignore-urls:
311 312 - /jmreport/* # 积木报表，无法携带租户编号
312 313 ignore-visit-urls:
... ...
urbanops-server/src/main/resources/logback-spring.xml
  View file @57dda2d
... ... @@ -53,4 +53,8 @@
53 53 <!-- <appender-ref ref="SKYWALKING"/> -->
54 54 </root>
55 55  
  56 + <logger name="org.mybatis" level="DEBUG"/>
  57 + <logger name="com.baomidou.mybatisplus" level="DEBUG"/>
  58 + <logger name="com.zteits.urbanops.module.gloabl.dal.mapper" level="DEBUG"/>
  59 +
56 60 </configuration>
... ...