20240426_sun

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/domain/LnstYj.java

@@ -69,5 +69,11 @@ public class LnstYj extends BaseEntity
 
     private String createAreaCode;
 
+//    private String kz1;
+//
+//    private String kz2;
+//
+//    private String kz3;
+
     private String state;
 }

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/mapper/LnstYjMapper.java

@@ -1,15 +1,17 @@
 package com.ruoyi.lnst.mapper;
 
-import java.util.List;
-import com.ruoyi.lnst.domain.LnstYj;
 import com.ruoyi.common.datascope.utils.BaseMapperPlus;
+import com.ruoyi.lnst.domain.LnstYj;
+
+import java.util.Map;
 
 /**
  * 老年食堂硬件信息Mapper接口
- * 
+ *
  * @author sun
  * @date 2024-04-25
  */
 public interface LnstYjMapper extends BaseMapperPlus<LnstYj> {
 
+    public Map<String, Object> check(LnstYj yj);
 }

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/ILnstYjService.java

@@ -3,6 +3,7 @@ package com.ruoyi.lnst.service;
 import com.ruoyi.lnst.domain.LnstYj;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 老年食堂硬件信息Service接口
@@ -28,7 +29,7 @@ public interface ILnstYjService
      */
     public List<LnstYj> selectLnstYjList(LnstYj lnstYj);
 
-    public String checkLnstYj(LnstYj lnstYj);
+    public Map<String, Object> checkLnstYj(LnstYj lnstYj);
 
     /**
      * 新增老年食堂硬件信息

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/LnstYjServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 老年食堂硬件信息Service业务层处理
@@ -50,18 +51,18 @@ public class LnstYjServiceImpl implements ILnstYjService
     }
 
     @Override
-    public String checkLnstYj(LnstYj lnstYj) {
+    public Map<String, Object> checkLnstYj(LnstYj lnstYj) {
         if (StringUtils.isEmpty(lnstYj.getYjCode())) {
             throw new ServiceException("硬件非法！");
         }
-        LnstYj yj = lnstYjMapper.selectOne(new LambdaQueryWrapper<LnstYj>().eq(LnstYj::getYjCode, lnstYj.getYjCode()));
+        Map<String, Object> yj = lnstYjMapper.check(lnstYj);
         if (ObjectUtils.isEmpty(yj)) {
             throw new ServiceException("硬件非法！");
         }
-        if (!StringUtils.equals(yj.getState(), "0")) {
+        if (!StringUtils.equals(String.valueOf(yj.get("state")), "0")) {
             throw new ServiceException("您的硬件已被禁用！");
         }
-        return "硬件登录成功";
+        return yj;
     }
 
     /**

ruoyi-modules/mz-lnst/src/main/resources/mapper/lnst/LnstYjMapper.xml

@@ -3,11 +3,14 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.lnst.mapper.LnstYjMapper">
-    
+
     <resultMap type="LnstYj" id="LnstYjResult">
         <result property="id"    column="id"    />
         <result property="yjCode"    column="yj_code"    />
         <result property="mchnt"    column="mchnt"    />
+<!--        <result property="kz1"    column="kz1"    />-->
+<!--        <result property="kz2"    column="kz2"    />-->
+<!--        <result property="kz3"    column="kz3"    />-->
         <result property="createTimeStr"    column="create_time_str"    />
         <result property="createUserId"    column="create_user_id"    />
         <result property="createBy"    column="create_by"    />
@@ -26,4 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="state"    column="state"    />
     </resultMap>
 
-</mapper>
+    <select id="check" parameterType="LnstYj" resultType="java.util.HashMap">
+        select * from lnst_yj
+        <where>
+            <if test="yjCode != null  and yjCode != ''"> and yj_code = #{yjCode}</if>
+            <if test="mchnt != null  and mchnt != ''"> and mchnt = #{mchnt}</if>
+        </where>
+    </select>
+</mapper>