diff --git a/pom.xml b/pom.xml index 3c3a3f0..1e3aa54 100644 --- a/pom.xml +++ b/pom.xml @@ -259,6 +259,18 @@ ${kaptcha.version} + + + + + net.sourceforge.tess4j + tess4j + 4.5.4 + + + + + zhyc diff --git a/zhyc-admin/pom.xml b/zhyc-admin/pom.xml index c637a6d..615abd8 100644 --- a/zhyc-admin/pom.xml +++ b/zhyc-admin/pom.xml @@ -23,7 +23,11 @@ spring-boot-devtools true - + + + net.sourceforge.tess4j + tess4j + io.springfox diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DisinfectController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DisinfectController.java index 315196e..090d8bb 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DisinfectController.java +++ b/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 list = disinfectService.selectSheepfoldList(disinfect); + return success(list); + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DisinfectMapper.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DisinfectMapper.java index 885bf2e..7c1e883 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/mapper/DisinfectMapper.java +++ b/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 selectSheepfoldList(Disinfect disinfect); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IDisinfectService.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IDisinfectService.java index d6d20f2..4a8e084 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/IDisinfectService.java +++ b/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 selectSheepfoldList(Disinfect disinfect); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java index 2b178a5..a0be199 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java +++ b/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 selectSheepfoldList(Disinfect disinfect) { + return disinfectMapper.selectSheepfoldList(disinfect); + } } diff --git a/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml index 235f8dc..cfda7da 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml @@ -51,7 +51,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - AND sd.sheepfold_id = #{sheepfoldId} + + + AND sd.sheepfold_id IN + + #{sheepfoldId} + + AND sd.datetime = #{datetime} AND sd.technician = #{technician} AND sd.way = #{way} @@ -77,6 +83,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where sd.id = #{id} + insert into sw_disinfect