消毒以及依赖更新

pom.xml

@@ -259,6 +259,18 @@
                 <version>${kaptcha.version}</version>
             </dependency>
 
+            <!-- ... existing code ... -->
+
+            <!-- Tess4J OCR 工具 -->
+            <dependency>
+                <groupId>net.sourceforge.tess4j</groupId>
+                <artifactId>tess4j</artifactId>
+                <version>4.5.4</version>
+            </dependency>
+
+            <!-- 定时任务-->
+            <!-- ... existing code ... -->
+
             <!-- 定时任务-->
             <dependency>
                 <groupId>zhyc</groupId>

zhyc-admin/pom.xml

@@ -23,7 +23,11 @@
             <artifactId>spring-boot-devtools</artifactId>
             <optional>true</optional> <!-- 表示依赖不会传递 -->
         </dependency>
-
+        <!-- Tess4J OCR 识别 -->
+        <dependency>
+            <groupId>net.sourceforge.tess4j</groupId>
+            <artifactId>tess4j</artifactId>
+        </dependency>
         <!-- swagger3-->
         <dependency>
             <groupId>io.springfox</groupId>

zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DisinfectController.java

@@ -1,6 +1,8 @@
 package com.zhyc.module.biosafety.controller;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
 
 import com.zhyc.module.biosafety.service.IDisinfectService;
@@ -104,4 +106,13 @@ public class DisinfectController extends BaseController
     {
         return toAjax(disinfectService.deleteDisinfectByIds(ids));
     }
+
+    @PreAuthorize("@ss.hasPermi('biosafety:disinfect:list')")
+    @GetMapping("/searchSheepfold")
+    public AjaxResult getSheepfoldList(String sheepfold){
+        Disinfect disinfect = new Disinfect();
+        disinfect.setSheepfoldName(sheepfold);
+        List<Object[]> list =  disinfectService.selectSheepfoldList(disinfect);
+        return success(list);
+    }
 }

zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DisinfectMapper.java

@@ -1,5 +1,6 @@
 package com.zhyc.module.biosafety.mapper;
 
+import java.util.HashMap;
 import java.util.List;
 import com.zhyc.module.biosafety.domain.Disinfect;
 import org.apache.ibatis.annotations.Mapper;
@@ -60,4 +61,6 @@ public interface DisinfectMapper
      * @return 结果
      */
     public int deleteDisinfectByIds(Long[] ids);
+
+    List<Object[]> selectSheepfoldList(Disinfect disinfect);
 }

zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IDisinfectService.java

@@ -1,6 +1,7 @@
 package com.zhyc.module.biosafety.service;
 
 import java.util.List;
+
 import com.zhyc.module.biosafety.domain.Disinfect;
 
 /**
@@ -58,4 +59,6 @@ public interface IDisinfectService
      * @return 结果
      */
     public int deleteDisinfectById(Long id);
+
+    List<Object[]> selectSheepfoldList(Disinfect disinfect);
 }

zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java

@@ -149,4 +149,10 @@ public class DisinfectServiceImpl implements IDisinfectService
     {
         return disinfectMapper.deleteDisinfectById(id);
     }
+
+    @DataScope(deptAlias = "s", userAlias = "s")
+    @Override
+    public List<Object[]> selectSheepfoldList(Disinfect disinfect) {
+        return disinfectMapper.selectSheepfoldList(disinfect);
+    }
 }

zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml

@@ -51,7 +51,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{id}
                 </foreach>
             </if>
-            <if test="sheepfoldId != null">            AND sd.sheepfold_id = #{sheepfoldId}</if>
+            <!-- 根据羊舍 id 数组查询 -->
+          <if test="sheepfoldIds != null and sheepfoldIds.length > 0">
+                          AND sd.sheepfold_id IN
+                         <foreach collection="sheepfoldIds" item="sheepfoldId" open="(" separator="," close=")">
+                          #{sheepfoldId}
+                  </foreach>
+            </if>
             <if test="datetime != null">               AND sd.datetime     = #{datetime}</if>
             <if test="technician != null and technician != ''"> AND sd.technician = #{technician}</if>
             <if test="way != null and way != ''">      AND sd.way          = #{way}</if>
@@ -77,6 +83,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDisinfectVo"/>
         where sd.id = #{id}
     </select>
+       <select id="selectSheepfoldList" resultType="java.util.Map">
+           SELECT DISTINCT ds.id AS sheepfoldId, ds.sheepfold_name
+               FROM sw_disinfect s
+             LEFT JOIN da_sheepfold ds ON s.sheepfold_id = ds.id
+            <where>
+            <if test="sheepfoldName != null and sheepfoldName != ''">
+              ds.sheepfold_name like CONCAT('%', #{sheepfoldName}, '%')
+             </if>
+            ${params.dataScope}
+     </where>
+  </select>
 
     <insert id="insertDisinfect" parameterType="Disinfect" useGeneratedKeys="true" keyProperty="id">
         insert into sw_disinfect