From bd0214ccd9fc95ab3974e97673daa1d76a47d05e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?=
 <14096380+qwe963852@user.noreply.gitee.com>
Date: Sun, 6 Oct 2024 20:32:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:()=E4=BF=AE=E6=94=B9=E4=B8=BAMybatis-Plus?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysCarFaultController.java     |   2 +-
 .../muyu/server/mapper/SysCarFaultMapper.java |  10 --
 .../server/mapper/TemplateNeedMapper.java     |   5 +-
 .../server/mapper/WarnStrategyMapper.java     |   2 +-
 .../server/service/SysCarFaultService.java    |   2 +-
 .../server/service/TemplateNeedService.java   |   3 +-
 .../impl/SysCarFaultMessageServiceImpl.java   |   5 +-
 .../service/impl/SysCarFaultServiceImpl.java  |   7 +-
 .../service/impl/TemplateNeedServiceImpl.java |  19 ++-
 .../main/resources/mapper/CarTypeMapper.xml   |   9 --
 .../resources/mapper/TemplateNeedMapper.xml   |  10 --
 .../mapper/breakdown/SysCarFaultMapper.xml    | 140 ------------------
 .../mapper/message/DataTypeMapper.xml         |   7 -
 .../message/MessageTemplateTypeMapper.xml     |   7 -
 14 files changed, 30 insertions(+), 198 deletions(-)
 delete mode 100644 cloud-modules/saas/saas-server/src/main/resources/mapper/CarTypeMapper.xml
 delete mode 100644 cloud-modules/saas/saas-server/src/main/resources/mapper/TemplateNeedMapper.xml
 delete mode 100644 cloud-modules/saas/saas-server/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml
 delete mode 100644 cloud-modules/saas/saas-server/src/main/resources/mapper/message/DataTypeMapper.xml
 delete mode 100644 cloud-modules/saas/saas-server/src/main/resources/mapper/message/MessageTemplateTypeMapper.xml

diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultController.java
index 0b06241..5949f2e 100644
--- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultController.java
+++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultController.java
@@ -85,7 +85,7 @@ public class SysCarFaultController extends BaseController
             @Validated @RequestBody SysCarFault sysCarFault)
     {
         //判断故障码是否重复
-        SysCarFault selectFaultByFaultCode = sysCarFaultService.selectFaultByFaultCode(sysCarFault.getFaultCode());
+        List<SysCarFault> selectFaultByFaultCode = sysCarFaultService.selectFaultByFaultCode(sysCarFault.getFaultCode());
         if (selectFaultByFaultCode!=null){
             return error("新增车辆故障 ,故障码已存在");
         }
diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMapper.java
index 2ef819c..a500004 100644
--- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMapper.java
+++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMapper.java
@@ -17,16 +17,6 @@ import java.util.List;
 @Mapper
 public interface SysCarFaultMapper extends BaseMapper<SysCarFault> {
 
-    //根据添加的故障码进行查询
-    @Select("select fault_code from sys_car_fault where fault_code=#{faultCode}")
-    SysCarFault selectFaultByFaultCode(String faultCode);
-
-    /**
-     *  查询故障码信息
-     * @param ids 故障码信息主键
-     * @return 故障码信息
-     */
-    public List<SysCarFault> selectSysCarFaultIds(String[] ids);
 
 
 
diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/TemplateNeedMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/TemplateNeedMapper.java
index a74491f..a1b7c44 100644
--- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/TemplateNeedMapper.java
+++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/TemplateNeedMapper.java
@@ -1,5 +1,6 @@
 package com.muyu.server.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.common.domain.MessageTemplateType;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -14,6 +15,6 @@ import java.util.List;
  * @date 2024-09-29 14:44:57
  */
 @Mapper
-public interface TemplateNeedMapper {
-    List<MessageTemplateType> selectByTemplateId(@Param("templateId")Long templateId);
+public interface TemplateNeedMapper extends BaseMapper<MessageTemplateType> {
+
 }
diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/WarnStrategyMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/WarnStrategyMapper.java
index 156ae7c..9785fe1 100644
--- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/WarnStrategyMapper.java
+++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/WarnStrategyMapper.java
@@ -12,7 +12,7 @@ import java.util.List;
 
 /**
  * 预警策略Mapper接口
- * @author muyu
+ * @author sx
  * @package com.muyu.server.mapper
  * @name WarnStrategyMapper
  * @date 2024-09-20
diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultService.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultService.java
index 37cad97..865812a 100644
--- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultService.java
+++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarFaultService.java
@@ -36,7 +36,7 @@ public interface SysCarFaultService extends IService<SysCarFault> {
      * @return 结果
      */
 
-    SysCarFault selectFaultByFaultCode(String faultCode);
+    List<SysCarFault> selectFaultByFaultCode(String faultCode);
 
 
 
diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/TemplateNeedService.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/TemplateNeedService.java
index 35148fe..afe9550 100644
--- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/TemplateNeedService.java
+++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/TemplateNeedService.java
@@ -1,5 +1,6 @@
 package com.muyu.server.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.common.domain.MessageTemplateType;
 
 import java.util.List;
@@ -12,6 +13,6 @@ import java.util.List;
  * @date 2024-09-29 15:31:55
  */
 
-public interface TemplateNeedService {
+public interface TemplateNeedService extends IService<MessageTemplateType> {
     List<MessageTemplateType> selectByTemplateId(Long templateId);
 }
diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java
index 9915f77..863e906 100644
--- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java
+++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultMessageServiceImpl.java
@@ -50,8 +50,9 @@ public class SysCarFaultMessageServiceImpl extends ServiceImpl<SysCarFaultMessag
     @Override
     public List<SysCarFaultMessage> listStatusOnt( ) {
 
-        List<SysCarFaultMessage> list = baseMapper.listStatusOnt();
-        return list;
+        LambdaQueryWrapper<SysCarFaultMessage> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysCarFaultMessage::getStatus,1);
+        return this.list(wrapper);
     }
 
     /**
diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultServiceImpl.java
index 7c56486..9c8f28e 100644
--- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultServiceImpl.java
+++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarFaultServiceImpl.java
@@ -91,9 +91,12 @@ public class SysCarFaultServiceImpl
      */
 
     @Override
-    public SysCarFault selectFaultByFaultCode(String faultCode) {
-        return mapper.selectFaultByFaultCode(faultCode);
+    public List<SysCarFault> selectFaultByFaultCode(String faultCode) {
+        LambdaQueryWrapper<SysCarFault> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysCarFault::getFaultCode, faultCode);
+        return this.list(wrapper);
     }
 
 
+
 }
diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateNeedServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateNeedServiceImpl.java
index c155338..6a1871e 100644
--- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateNeedServiceImpl.java
+++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateNeedServiceImpl.java
@@ -1,5 +1,7 @@
 package com.muyu.server.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.cache.MessageTemplateTypeCacheService;
 import com.muyu.common.domain.MessageTemplateType;
 import com.muyu.server.mapper.TemplateNeedMapper;
@@ -17,14 +19,21 @@ import java.util.List;
  * @date 2024/9/22 14:36
  */
 @Service
-public class TemplateNeedServiceImpl implements TemplateNeedService {
+public class TemplateNeedServiceImpl extends ServiceImpl<TemplateNeedMapper, MessageTemplateType> implements TemplateNeedService {
+
 
-    @Autowired
-    private TemplateNeedMapper templateNeedMapper;
 
     @Override
     public List<MessageTemplateType> selectByTemplateId(Long templateId) {
-        List<MessageTemplateType> messageTemplateTypes = templateNeedMapper.selectByTemplateId(templateId);
-        return messageTemplateTypes;
+
+        LambdaQueryWrapper<MessageTemplateType> wrapper = new LambdaQueryWrapper<>();
+
+
+        wrapper.eq(MessageTemplateType::getTemplateId, templateId);
+
+        return this.list(wrapper);
     }
+
+
+
 }
diff --git a/cloud-modules/saas/saas-server/src/main/resources/mapper/CarTypeMapper.xml b/cloud-modules/saas/saas-server/src/main/resources/mapper/CarTypeMapper.xml
deleted file mode 100644
index 63274cf..0000000
--- a/cloud-modules/saas/saas-server/src/main/resources/mapper/CarTypeMapper.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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.muyu.server.mapper.CarTypeMapper">
-
-
-
-</mapper>
diff --git a/cloud-modules/saas/saas-server/src/main/resources/mapper/TemplateNeedMapper.xml b/cloud-modules/saas/saas-server/src/main/resources/mapper/TemplateNeedMapper.xml
deleted file mode 100644
index 5ea4090..0000000
--- a/cloud-modules/saas/saas-server/src/main/resources/mapper/TemplateNeedMapper.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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.muyu.server.mapper.TemplateNeedMapper">
-
-    <select id="selectByTemplateId" resultType="com.muyu.common.domain.MessageTemplateType">
-        SELECT * FROM `message_template_type` WHERE template_id=#{templateId}
-    </select>
-</mapper>
diff --git a/cloud-modules/saas/saas-server/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml b/cloud-modules/saas/saas-server/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml
deleted file mode 100644
index 44abe85..0000000
--- a/cloud-modules/saas/saas-server/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?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.muyu.server.mapper.SysCarFaultMapper">
-
-    <resultMap type="com.muyu.common.domain.SysCarFault" id="SysCarFaultResult">
-        <result property="id"    column="id"    />
-        <result property="faultCode"    column="fault_code"    />
-        <result property="faultName"    column="fault_name"    />
-        <result property="typeId"    column="type_id"    />
-        <result property="faultLabel"    column="fault_label"    />
-        <result property="faultBit"    column="fault_bit"    />
-        <result property="faultValue"    column="fault_value"    />
-        <result property="faultRank"    column="fault_rank"    />
-        <result property="faultDesc"    column="fault_desc"    />
-        <result property="faultMinThreshold"    column="fault_min_threshold"    />
-        <result property="faultMaxThreshold"    column="fault_max_threshold"    />
-        <result property="status"    column="status"    />
-        <result property="warnStatus"    column="warn_status"    />
-        <result property="remark"    column="remark"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="carTypeId" column="car_type_id"/>
-    </resultMap>
-
-    <sql id="selectSysCarFaultVo">
-        select id, fault_code, fault_name, type_id, fault_label, fault_bit, fault_value, fault_rank, fault_desc, fault_min_threshold, fault_max_threshold, status, warn_status, remark, create_by, create_time, update_by, update_time,car_type_id from sys_car_fault
-    </sql>
-
-    <select id="selectSysCarFaultList" parameterType="com.muyu.common.domain.SysCarFault" resultMap="SysCarFaultResult">
-        <include refid="selectSysCarFaultVo"/>
-        <where>
-            <if test="faultCode != null  and faultCode != ''"> and fault_code = #{faultCode}</if>
-            <if test="faultBit != null  and faultBit != ''"> and fault_bit = #{faultBit}</if>
-            <if test="faultRank != null "> and fault_rank = #{faultRank}</if>
-        </where>
-    </select>
-
-    <select id="selectSysCarFaultById" parameterType="Long" resultMap="SysCarFaultResult">
-        <include refid="selectSysCarFaultVo"/>
-        where id = #{id}
-    </select>
-    <select id="selectSysCarFaultIds" resultMap="SysCarFaultResult">
-        <include refid="selectSysCarFaultVo"/>
-            where id in
-            <foreach collection="array" item="id" index="index" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-    </select>
-
-    <insert id="insertSysCarFault" parameterType="com.muyu.common.domain.SysCarFault" useGeneratedKeys="true" keyProperty="id">
-        insert into sys_car_fault
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="faultCode != null and faultCode != ''">fault_code,</if>
-            <if test="faultName != null">fault_name,</if>
-            <if test="typeId != null">type_id,</if>
-            <if test="faultLabel != null">fault_label,</if>
-            <if test="faultBit != null">fault_bit,</if>
-            <if test="faultValue != null">fault_value,</if>
-            <if test="faultRank != null">fault_rank,</if>
-            <if test="faultDesc != null">fault_desc,</if>
-            <if test="faultMinThreshold != null">fault_min_threshold,</if>
-            <if test="faultMaxThreshold != null">fault_max_threshold,</if>
-            <if test="status != null">status,</if>
-            <if test="warnStatus != null">warn_status,</if>
-            <if test="remark != null">remark,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="carTypeId !=null">car_type_id</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="faultCode != null and faultCode != ''">#{faultCode},</if>
-            <if test="faultName != null">#{faultName},</if>
-            <if test="typeId != null">#{typeId},</if>
-            <if test="faultLabel != null">#{faultLabel},</if>
-            <if test="faultBit != null">#{faultBit},</if>
-            <if test="faultValue != null">#{faultValue},</if>
-            <if test="faultRank != null">#{faultRank},</if>
-            <if test="faultDesc != null">#{faultDesc},</if>
-            <if test="faultMinThreshold != null">#{faultMinThreshold},</if>
-            <if test="faultMaxThreshold != null">#{faultMaxThreshold},</if>
-            <if test="status != null">#{status},</if>
-            <if test="warnStatus != null">#{warnStatus},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="carTypeId != null">#{catTypeId}</if>
-        </trim>
-    </insert>
-
-    <update id="updateSysCarFault" parameterType="com.muyu.common.domain.SysCarFault">
-        update sys_car_fault
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="faultCode != null and faultCode != ''">fault_code = #{faultCode},</if>
-            <if test="faultName != null">fault_name = #{faultName},</if>
-            <if test="typeId != null">type_id = #{typeId},</if>
-            <if test="faultLabel != null">fault_label = #{faultLabel},</if>
-            <if test="faultBit != null">fault_bit = #{faultBit},</if>
-            <if test="faultValue != null">fault_value = #{faultValue},</if>
-            <if test="faultRank != null">fault_rank = #{faultRank},</if>
-            <if test="faultDesc != null">fault_desc = #{faultDesc},</if>
-            <if test="faultMinThreshold != null">fault_min_threshold = #{faultMinThreshold},</if>
-            <if test="faultMaxThreshold != null">fault_max_threshold = #{faultMaxThreshold},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="warnStatus != null">warn_status = #{warnStatus},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="carTypeId !=null">car_type_id=#{catTypeId}</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteSysCarFaultById" parameterType="Long">
-        delete from sys_car_fault where id = #{id}
-    </delete>
-
-    <delete id="deleteSysCarFaultByIds" parameterType="String">
-        delete from sys_car_fault where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <update id="enableWarningsById" parameterType="Long">
-        update sys_car_fault set warn_status = 0 where id = #{id}
-    </update>
-    <update id="disableWarningsById" parameterType="Long">
-        update sys_car_fault set warn_status = 1 where id = #{id}
-    </update>
-</mapper>
diff --git a/cloud-modules/saas/saas-server/src/main/resources/mapper/message/DataTypeMapper.xml b/cloud-modules/saas/saas-server/src/main/resources/mapper/message/DataTypeMapper.xml
deleted file mode 100644
index 52d673c..0000000
--- a/cloud-modules/saas/saas-server/src/main/resources/mapper/message/DataTypeMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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.muyu.server.mapper.DataTypeMapper">
-
-</mapper>
diff --git a/cloud-modules/saas/saas-server/src/main/resources/mapper/message/MessageTemplateTypeMapper.xml b/cloud-modules/saas/saas-server/src/main/resources/mapper/message/MessageTemplateTypeMapper.xml
deleted file mode 100644
index 9385d6c..0000000
--- a/cloud-modules/saas/saas-server/src/main/resources/mapper/message/MessageTemplateTypeMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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.muyu.server.mapper.MessageTemplateTypeMapper">
-
-</mapper>