光栅测试修改

ruoyi-admin/src/main/java/com/ruoyi/thread/ClientHandler.java

@@ -62,23 +62,23 @@ public class ClientHandler {
                 //根据数据判断是否超高，然后变更字段信息
                 while ((inputStream.read(data)) != -1) {
 
-                    log.info("------------光栅检测结果 > " + ByteUtil.byteArray2HexString(data));
+//                    log.info("------------光栅检测结果 > " + ByteUtil.byteArray2HexString(data));
                     SysConfig sysConfig = new SysConfig();
                     switch (ByteUtil.byteArray2HexString(data)) {
                         case "3F00110D0A":
                             //光栅1 超高Y
                             log.info("------------光栅1 超高Y------------>");
                             sysConfig.setConfigId(Long.valueOf("6"));
-                            sysConfig.setConfigValue("N");
+//                            sysConfig.setConfigValue("N");
                             sysConfig.setConfigType("Y");
                             sysConfig.setUpdateTime(new Date());
                             configService.updateConfig(sysConfig);
                             break;
                         case "3F00100D0A":
                             //光栅1 不超高N
-                            log.info("------------光栅1 不超高N------------>");
+//                            log.info("------------光栅1 不超高N------------>");
                             sysConfig.setConfigId(Long.valueOf("6"));
-                            sysConfig.setConfigValue("N");
+//                            sysConfig.setConfigValue("N");
                             sysConfig.setConfigType("N");
                             sysConfig.setUpdateTime(new Date());
                             configService.updateConfig(sysConfig);
@@ -87,16 +87,16 @@ public class ClientHandler {
                             //光栅2 超高Y
                             log.info("------------光栅2 超高Y------------>");
                             sysConfig.setConfigId(Long.valueOf("7"));
-                            sysConfig.setConfigValue("N");
+//                            sysConfig.setConfigValue("N");
                             sysConfig.setConfigType("Y");
                             sysConfig.setUpdateTime(new Date());
                             configService.updateConfig(sysConfig);
                             break;
                         case "3F00200D0A":
                             //光栅2 不超高N
-                            log.info("------------光栅2 不超高N------------>");
+//                            log.info("------------光栅2 不超高N------------>");
                             sysConfig.setConfigId(Long.valueOf("7"));
-                            sysConfig.setConfigValue("N");
+//                            sysConfig.setConfigValue("N");
                             sysConfig.setConfigType("N");
                             sysConfig.setUpdateTime(new Date());
                             configService.updateConfig(sysConfig);
@@ -105,16 +105,16 @@ public class ClientHandler {
                             //光栅3 超高Y
                             log.info("------------光栅3 超高Y------------>");
                             sysConfig.setConfigId(Long.valueOf("8"));
-                            sysConfig.setConfigValue("N");
+//                            sysConfig.setConfigValue("N");
                             sysConfig.setConfigType("Y");
                             sysConfig.setUpdateTime(new Date());
                             configService.updateConfig(sysConfig);
                             break;
                         case "3F00300D0A":
                             //光栅3 不超高N
-                            log.info("------------光栅3 不超高N------------>");
+//                            log.info("------------光栅3 不超高N------------>");
                             sysConfig.setConfigId(Long.valueOf("8"));
-                            sysConfig.setConfigValue("N");
+//                            sysConfig.setConfigValue("N");
                             sysConfig.setConfigType("N");
                             sysConfig.setUpdateTime(new Date());
                             configService.updateConfig(sysConfig);
@@ -123,16 +123,16 @@ public class ClientHandler {
                             //光栅4 超高Y
                             log.info("------------光栅4 超高Y------------>");
                             sysConfig.setConfigId(Long.valueOf("9"));
-                            sysConfig.setConfigValue("N");
+//                            sysConfig.setConfigValue("N");
                             sysConfig.setConfigType("Y");
                             sysConfig.setUpdateTime(new Date());
                             configService.updateConfig(sysConfig);
                             break;
                         case "3F00400D0A":
                             //光栅4 不超高N
-                            log.info("------------光栅4 不超高N------------>");
+//                            log.info("------------光栅4 不超高N------------>");
                             sysConfig.setConfigId(Long.valueOf("9"));
-                            sysConfig.setConfigValue("N");
+//                            sysConfig.setConfigValue("N");
                             sysConfig.setConfigType("N");
                             sysConfig.setUpdateTime(new Date());
                             configService.updateConfig(sysConfig);

ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysConfigMapper">
-    
+
     <resultMap type="SysConfig" id="SysConfigResult">
     	<id     property="configId"      column="config_id"      />
         <result property="configName"    column="config_name"    />
@@ -15,12 +15,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"      column="update_by"      />
         <result property="updateTime"    column="update_time"    />
     </resultMap>
-    
+
     <sql id="selectConfigVo">
-        select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark 
+        select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark
 		from sys_config
     </sql>
-    
+
     <!-- 查询条件 -->
 	<sql id="sqlwhereSearch">
 		<where>
@@ -32,12 +32,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			</if>
 		</where>
 	</sql>
-    
+
     <select id="selectConfig" parameterType="SysConfig" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
         <include refid="sqlwhereSearch"/>
     </select>
-    
+
     <select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
         <where>
@@ -47,6 +47,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="configType != null and configType != ''">
 				AND config_type = #{configType}
 			</if>
+            <if test="configValue != null and configValue != ''">
+				AND config_value = #{configValue}
+			</if>
 			<if test="configKey != null and configKey != ''">
 				AND config_key like concat('%', #{configKey}, '%')
 			</if>
@@ -58,12 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			</if>
 		</where>
     </select>
-    
+
     <select id="checkConfigKeyUnique" parameterType="String" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
         where config_key = #{configKey} limit 1
     </select>
-    
+
     <insert id="insertConfig" parameterType="SysConfig">
         insert into sys_config (
 			<if test="configName != null and configName != '' ">config_name,</if>
@@ -83,9 +86,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			sysdate()
 		)
     </insert>
-	 
+
     <update id="updateConfig" parameterType="SysConfig">
-        update sys_config 
+        update sys_config
         <set>
             <if test="configName != null and configName != ''">config_name = #{configName},</if>
             <if test="configKey != null and configKey != ''">config_key = #{configKey},</if>
@@ -97,16 +100,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </set>
         where config_id = #{configId}
     </update>
-	
+
     <delete id="deleteConfigById" parameterType="Long">
         delete from sys_config where config_id = #{configId}
     </delete>
-    
+
     <delete id="deleteConfigByIds" parameterType="Long">
-        delete from sys_config where config_id in 
+        delete from sys_config where config_id in
         <foreach item="configId" collection="array" open="(" separator="," close=")">
         	#{configId}
         </foreach>
     </delete>
-    
-</mapper>
+
+</mapper>