迁移

戈灵虎
1 parent 95712275
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
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/api/EventController.java
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/api/ProblemsApiController.java
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/flowpathidea/FlowpathIdeaController.java
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/problems/ProblemsController.java
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/roadinfo/RoadInfoController.java
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/workorders/WorkOrdersController.java
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/admin/workorderscommitdetail/WorkOrdersCommitDetailController.java
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/controller/app/wechat/WeixinController.java
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/flowpathidea/FlowpathIdeaDO.java
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/problems/ProblemsDO.java
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/roadinfo/RoadInfoDO.java
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorders/WorkOrdersDO.java
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorderscommitdetail/WorkOrdersCommitDetailDO.java
urbanops-module-gloabl/src/main/resources/mapper/flowpathidea/FlowpathIdeaMapper.xml
urbanops-module-gloabl/src/main/resources/mapper/problems/ProblemsMapper.xml
urbanops-module-gloabl/src/main/resources/mapper/roadinfo/RoadInfoMapper.xml
urbanops-module-gloabl/src/main/resources/mapper/workorders/WorkOrdersMapper.xml
urbanops-module-gloabl/src/main/resources/mapper/workorderscommitdetail/WorkOrdersCommitDetailMapper.xml
urbanops-server/src/main/resources/application.yaml
@@ -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;
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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);
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zteits.urbanops.module.gloabl.dal.mapper.flowpathidea.FlowpathIdeaMapper">
+    <select id="selectByWorkNo" parameterType="java.lang.String"
+            resultType="com.zteits.urbanops.module.gloabl.dal.dataobject.flowpathidea.FlowpathIdeaDO">
+        SELECT * FROM global_flowpath_idea
+        WHERE work_no = #{workNo}
+        ORDER BY flowpath_idea_id DESC
+    </select>
+</mapper>
 \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zteits.urbanops.module.gloabl.dal.mapper.problems.ProblemsMapper">
+    <resultMap id="BaseResultMap" type="com.zteits.urbanops.module.gloabl.dal.dataobject.problems.ProblemsDO">
+        <result column="problem_no" jdbcType="VARCHAR" property="problemNo"/>
+        <result column="problem_name" jdbcType="VARCHAR" property="problemName"/>
+        <result column="problem_source_id" jdbcType="VARCHAR" property="problemSourceId"/>
+        <result column="user_confrim_remark" jdbcType="VARCHAR" property="userConfrimRemark"/>
+        <result column="user_confrim_time" jdbcType="TIMESTAMP" property="userConfrimTime"/>
+        <result column="user_confrim_imgs" jdbcType="VARCHAR" property="userConfrimImgs" typeHandler="com.zteits.urbanops.module.gloabl.dal.StringArrayTypeHandler"/>
+        <result column="user_confrim_lat" jdbcType="DECIMAL" property="userConfrimLat"/>
+        <result column="user_confrim_lon" jdbcType="DECIMAL" property="userConfrimLon"/>
+        <result column="user_confrim_addr" jdbcType="VARCHAR" property="userConfrimAddr"/>
+        <result column="problem_status" jdbcType="VARCHAR" property="problemStatus"/>
+        <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+    </resultMap>
+    <select id="selectProblemsByCondition"
+            parameterType="com.zteits.urbanops.module.gloabl.dal.dataobject.problems.ProblemsDO"
+            resultMap="BaseResultMap">
+        select * from global_problems
+        <where>
+            <if test="problemNo != null  and problemNo != ''">
+                and problem_no = #{problemNo}
+            </if>
+        </where>
+    </select>
+    <select id="countProblems"
+            parameterType="com.zteits.urbanops.module.gloabl.controller.admin.problems.vo.ProblemsReqVO"
+            resultType="java.util.Map">
+        SELECT
+        COUNT(1) AS totalCount,
+        IFNULL(SUM(CASE WHEN problem_status = 1 THEN 1 ELSE 0 end), 0) AS pendingCount,
+        IFNULL(SUM(CASE WHEN problem_status = 2 THEN 1 ELSE 0 end), 0) AS processingCount,
+        IFNULL(SUM(CASE WHEN problem_status = 4 THEN 1 ELSE 0 end), 0) AS completedCount,
+        IFNULL(SUM(CASE WHEN problem_status = 5 THEN 1 ELSE 0 end), 0) AS cancelledCount,
+        IFNULL(SUM(CASE WHEN problem_status = 3 THEN 1 ELSE 0 end), 0) AS pendingReviewCount
+        FROM global_problems
+        <where>
+            <if test="createBy != null and createBy != ''">
+                and create_by = #{createBy}
+            </if>
+            <if test="startTime != null">
+                AND create_time >= #{startTime}
+            </if>
+            <if test="endTime != null">
+                AND create_time &lt;= #{endTime}
+            </if>
+        </where>
+    </select>
+</mapper>
 \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zteits.urbanops.module.gloabl.dal.mapper.roadinfo.RoadInfoMapper">
+    <resultMap id="BaseResultMap" type="com.zteits.urbanops.module.gloabl.dal.dataobject.roadinfo.RoadInfoDO">
+        <result column="m_code" jdbcType="VARCHAR" property="mCode"/>
+        <result column="sz_id" jdbcType="VARCHAR" property="szId"/>
+        <result column="yl_id" jdbcType="VARCHAR" property="ylId"/>
+        <result column="wy_id" jdbcType="VARCHAR" property="wyId"/>
+        <result column="road_name" jdbcType="VARCHAR" property="roadName"/>
+        <result column="street_code" jdbcType="VARCHAR" property="streetCode"/>
+        <result column="street_name" jdbcType="VARCHAR" property="streetName"/>
+    </resultMap>
+    <select id="selectRoadInfoByCondition"
+            parameterType="com.zteits.urbanops.module.gloabl.controller.admin.roadinfo.vo.RoadInfoReqVO"
+            resultMap="BaseResultMap">
+        select * from global_master_road_info
+        <where>
+            <if test="streetCode != null  and streetCode != ''">
+                and street_code = #{streetCode}
+            </if>
+            <if test="mCode != null  and mCode != ''">
+                and m_code = #{mCode}
+            </if>
+            <if test="roadName != null  and roadName != ''">
+                and road_name like CONCAT('%', #{roadName}, '%')
+            </if>
+            <if test="streetName != null  and streetName != ''">
+                and street_name like CONCAT('%', #{streetName}, '%')
+            </if>
+        </where>
+    </select>
+</mapper>
 \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zteits.urbanops.module.gloabl.dal.mapper.workorders.WorkOrdersMapper">
+    <select id="selectWorksByCondition"
+            parameterType="com.zteits.urbanops.module.gloabl.dal.dataobject.workorders.WorkOrdersDO"
+            resultType="com.zteits.urbanops.module.gloabl.dal.dataobject.workorders.WorkOrdersDO">
+        select * from global_work_orders
+        <where>
+            <if test="problemNo != null  and problemNo != ''">
+                and problem_no = #{problemNo}
+            </if>
+            <if test="companyNo != null  and companyNo != ''">
+                and company_no = #{companyNo}
+            </if>
+            <if test="workNo != null  and workNo != ''">
+                and work_no = #{workNo}
+            </if>
+        </where>
+    </select>
+    <select id="selectCompanyByNo"
+            parameterType="java.lang.String"
+            resultType="java.util.Map">
+        SELECT company_no ,company_name
+        FROM global_work_orders
+        <where>
+            <if test="problemNo != null and problemNo != ''">
+                and problem_no = #{problemNo}
+            </if>
+        </where>
+        group by company_no ,company_name
+    </select>
+    <select id="countWorkOrder"
+            parameterType="com.zteits.urbanops.module.gloabl.controller.admin.workorders.vo.WorkOrdersReqVO"
+            resultType="java.util.Map">
+        select v.date_value,t.company_no,count(company_no) num
+        from view_statics_times v
+        left join global_work_orders t
+        on v.date_value= DATE_FORMAT(t.create_time, '%Y-%m-%d')
+        <if test="companyNo != null and companyNo != ''">
+            AND company_no = #{companyNo}
+        </if>
+        <if test="createBy != null and createBy != ''">
+            AND create_by = #{createBy}
+        </if>
+        <where>
+            <if test="startTime != null">
+                AND date_value >= #{startTime}
+            </if>
+            <if test="endTime != null">
+                AND date_value &lt;= #{endTime}
+            </if>
+        </where>
+        group by  v.date_value,t.company_no
+        order by date_value asc
+    </select>
+    <select id="countWorkOrderGroup"
+            parameterType="com.zteits.urbanops.module.gloabl.controller.admin.workorders.vo.WorkOrdersReqVO"
+            resultType="java.util.Map">
+        SELECT
+        d.label AS name,
+        COUNT(t.id) AS value
+        FROM
+        system_dict_data d
+        LEFT JOIN global_work_orders t
+        ON d.label = t.company_no
+        <if test="startTime != null">
+            AND DATE_FORMAT(t.create_time, '%Y-%m-%d') >= #{startTime}
+        </if>
+        <if test="endTime != null">
+            AND DATE_FORMAT(t.create_time, '%Y-%m-%d') &lt;= #{endTime}
+        </if>
+        <if test="createBy != null and createBy != ''">
+            AND create_by = #{createBy}
+        </if>
+        <if test="userConfrimStatus != null ">
+            AND user_confrim_status = #{userConfrimStatus}
+        </if>
+        <where>
+              dict_type ='company_type' and d.status ='0'
+        </where>
+        GROUP BY
+        label
+    </select>
+</mapper>
 \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zteits.urbanops.module.gloabl.dal.mapper.workorderscommitdetail.WorkOrdersCommitDetailMapper">
+    <select id="selectDetailByCondition"
+            parameterType="String"
+            resultType="com.zteits.urbanops.module.gloabl.controller.admin.workorderscommitdetail.vo.WorkOrdersCommitDetailRespVO">
+        SELECT d.*
+        FROM global_work_orders_commit_detail d
+                 JOIN global_work_orders w ON d.work_no = w.work_no
+        WHERE w.problem_no = #{problemNo}
+    </select>
+</mapper>
 \ No newline at end of file
@@ -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:
@@ -53,4 +53,8 @@
         <!-- <appender-ref ref="SKYWALKING"/> -->
     </root>
+    <logger name="org.mybatis" level="DEBUG"/>
+    <logger name="com.baomidou.mybatisplus" level="DEBUG"/>
+    <logger name="com.zteits.urbanops.module.gloabl.dal.mapper" level="DEBUG"/>
+
 </configuration>