Merge remote-tracking branch 'origin/master'

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/controller/LnstYlhtController.java

@@ -0,0 +1,93 @@
+package com.ruoyi.lnst.controller;
+
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.lnst.domain.LnstYlht;
+import com.ruoyi.lnst.service.ILnstYlhtService;
+import com.ruoyi.system.validate.group.AddGroup;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 老年食堂银联活体Controller
+ *
+ * @author sun
+ * @date 2024-03-21
+ */
+@RestController
+@RequestMapping("/ylht")
+public class LnstYlhtController extends BaseController
+{
+    @Autowired
+    private ILnstYlhtService lnstYlhtService;
+
+    /**
+     * 查询老年食堂银联活体列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(LnstYlht lnstYlht)
+    {
+        startPage();
+        List<LnstYlht> list = lnstYlhtService.selectLnstYlhtList(lnstYlht);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出老年食堂银联活体列表
+     */
+    @Log(title = "老年食堂银联活体", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, LnstYlht lnstYlht)
+    {
+        List<LnstYlht> list = lnstYlhtService.selectLnstYlhtList(lnstYlht);
+        ExcelUtil<LnstYlht> util = new ExcelUtil<LnstYlht>(LnstYlht.class);
+        util.exportExcel(response, list, "老年食堂银联活体数据");
+    }
+
+    /**
+     * 获取老年食堂银联活体详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(lnstYlhtService.selectLnstYlhtById(id));
+    }
+
+    /**
+     * 新增老年食堂银联活体
+     */
+    @Log(title = "老年食堂银联活体", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated({AddGroup.class}) @RequestBody LnstYlht lnstYlht)
+    {
+        return toAjax(lnstYlhtService.insertLnstYlht(lnstYlht),lnstYlht.getId());
+    }
+
+    /**
+     * 修改老年食堂银联活体
+     */
+    @Log(title = "老年食堂银联活体", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody LnstYlht lnstYlht)
+    {
+        return toAjax(lnstYlhtService.updateLnstYlht(lnstYlht));
+    }
+
+    /**
+     * 删除老年食堂银联活体
+     */
+    @Log(title = "老年食堂银联活体", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(lnstYlhtService.deleteLnstYlhtByIds(ids));
+    }
+}

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

@@ -0,0 +1,83 @@
+package com.ruoyi.lnst.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.Size;
+
+/**
+ * 老年食堂银联活体对象 lnst_ylht
+ *
+ * @author sun
+ * @date 2024-03-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@TableName("lnst_ylht")
+@ApiModel("老年食堂银联活体")
+public class LnstYlht extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @Excel(name = "主键")
+    @TableId(value = "id",type = IdType.ASSIGN_UUID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    /** 银联code */
+    @Excel(name = "银联code")
+    @ApiModelProperty(value = "银联code")
+    @Size(max = 32, message = "{银联code}")
+    private String ylcode;
+
+    /** 银联主键 */
+    @Excel(name = "银联主键")
+    @ApiModelProperty(value = "银联主键")
+    @Size(max = 32, message = "{银联主键}")
+    private String ylid;
+
+    /** 活体图片 */
+    @Excel(name = "活体图片")
+    @ApiModelProperty(value = "活体图片")
+    private String tx;
+
+    /** 对比分数 */
+    @Excel(name = "对比分数")
+    @ApiModelProperty(value = "对比分数")
+    @Size(max = 12, message = "{对比分数}")
+    private String dbfs;
+
+    /** 扩展字段1 */
+    @Excel(name = "扩展字段1")
+    @ApiModelProperty(value = "扩展字段1")
+    @Size(max = 200, message = "{扩展字段1}")
+    private String kz1;
+
+    /** 扩展字段2 */
+    @Excel(name = "扩展字段2")
+    @ApiModelProperty(value = "扩展字段2")
+    @Size(max = 200, message = "{扩展字段2}")
+    private String kz2;
+
+    /** 扩展字段3 */
+    @Excel(name = "扩展字段3")
+    @ApiModelProperty(value = "扩展字段3")
+    @Size(max = 200, message = "{扩展字段3}")
+    private String kz3;
+
+    /** 数据状态 */
+    @Excel(name = "数据状态")
+    @ApiModelProperty(value = "数据状态")
+    @Size(max = 2, message = "{数据状态}")
+    private String status;
+}

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

@@ -91,4 +91,30 @@ public class ZwywJclrShxx extends BaseEntity
 
     /** 数据流转状态（CH051） */
     private String lzzt;
+
+    private String lat;
+    private String lng;
+    private String sbdwbm;
+    private String sbdwmc;
+    private String jssj;
+    private String djsj;
+    private String ssqh;
+    private String sbip;
+    private String dzjwd;
+    private String istk;
+    private String isdb;
+    private String iszc;
+    private String tkzm;
+    private String dbzm;
+    private String zczm;
+    private String sfzqfjg;
+    private String sfzyxqxs;
+    private String sfzyxqxz;
+    private String sfzzpb;
+    private String jzdz;
+    private String jhrxm;
+    private String jhrlxdh;
+    private String ylcode;
+    private String ylid;
+    private String djbh;
 }

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

@@ -0,0 +1,15 @@
+package com.ruoyi.lnst.mapper;
+
+import java.util.List;
+import com.ruoyi.lnst.domain.LnstYlht;
+import com.ruoyi.common.datascope.utils.BaseMapperPlus;
+
+/**
+ * 老年食堂银联活体Mapper接口
+ * 
+ * @author sun
+ * @date 2024-03-21
+ */
+public interface LnstYlhtMapper extends BaseMapperPlus<LnstYlht> {
+
+}

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

@@ -0,0 +1,54 @@
+package com.ruoyi.lnst.service;
+
+import java.util.List;
+import com.ruoyi.lnst.domain.LnstYlht;
+
+/**
+ * 老年食堂银联活体Service接口
+ * 
+ * @author sun
+ * @date 2024-03-21
+ */
+public interface ILnstYlhtService 
+{
+    /**
+     * 查询老年食堂银联活体
+     * 
+     * @param id 老年食堂银联活体主键
+     * @return 老年食堂银联活体
+     */
+    public LnstYlht selectLnstYlhtById(String id);
+
+    /**
+     * 查询老年食堂银联活体列表
+     * 
+     * @param lnstYlht 老年食堂银联活体
+     * @return 老年食堂银联活体集合
+     */
+    public List<LnstYlht> selectLnstYlhtList(LnstYlht lnstYlht);
+
+    /**
+     * 新增老年食堂银联活体
+     * 
+     * @param lnstYlht 老年食堂银联活体
+     * @return 结果
+     */
+    public int insertLnstYlht(LnstYlht lnstYlht);
+
+    /**
+     * 修改老年食堂银联活体
+     * 
+     * @param lnstYlht 老年食堂银联活体
+     * @return 结果
+     */
+    public int updateLnstYlht(LnstYlht lnstYlht);
+
+    /**
+     * 批量删除老年食堂银联活体
+     * 
+     * @param ids 需要删除的老年食堂银联活体主键集合
+     * @return 结果
+     */
+    public int deleteLnstYlhtByIds(String[] ids);
+
+}

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

@@ -0,0 +1,84 @@
+package com.ruoyi.lnst.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Arrays;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.lnst.mapper.LnstYlhtMapper;
+import com.ruoyi.lnst.domain.LnstYlht;
+import com.ruoyi.lnst.service.ILnstYlhtService;
+
+/**
+ * 老年食堂银联活体Service业务层处理
+ * 
+ * @author sun
+ * @date 2024-03-21
+ */
+@Service
+public class LnstYlhtServiceImpl implements ILnstYlhtService 
+{
+    @Autowired
+    private LnstYlhtMapper lnstYlhtMapper;
+
+    /**
+     * 查询老年食堂银联活体
+     * 
+     * @param id 老年食堂银联活体主键
+     * @return 老年食堂银联活体
+     */
+    @Override
+    public LnstYlht selectLnstYlhtById(String id)
+    {
+        return lnstYlhtMapper.selectById(id);
+    }
+
+    /**
+     * 查询老年食堂银联活体列表
+     * 
+     * @param lnstYlht 老年食堂银联活体
+     * @return 老年食堂银联活体
+     */
+    @Override
+    public List<LnstYlht> selectLnstYlhtList(LnstYlht lnstYlht)
+    {
+        return lnstYlhtMapper.selectList(new LambdaQueryWrapper<>(lnstYlht));
+    }
+
+    /**
+     * 新增老年食堂银联活体
+     * 
+     * @param lnstYlht 老年食堂银联活体
+     * @return 结果
+     */
+    @Override
+    public int insertLnstYlht(LnstYlht lnstYlht)
+    {
+        return lnstYlhtMapper.insert(lnstYlht);
+    }
+
+    /**
+     * 修改老年食堂银联活体
+     * 
+     * @param lnstYlht 老年食堂银联活体
+     * @return 结果
+     */
+    @Override
+    public int updateLnstYlht(LnstYlht lnstYlht)
+    {
+        return lnstYlhtMapper.updateById(lnstYlht);
+    }
+
+    /**
+     * 批量删除老年食堂银联活体
+     * 
+     * @param ids 需要删除的老年食堂银联活体主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLnstYlhtByIds(String[] ids)
+    {
+        return lnstYlhtMapper.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

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

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.lnst.domain.ZwywJclrShxx;
 import com.ruoyi.lnst.mapper.ZwywJclrShxxMapper;
 import com.ruoyi.lnst.service.IZwywJclrShxxService;
+import com.ruoyi.system.utils.SubCodeUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,13 +49,35 @@ public class ZwywJclrShxxServiceImpl implements IZwywJclrShxxService
     public List<ZwywJclrShxx> selectZwywJclrShxxList(ZwywJclrShxx zwywJclrShxx)
     {
         String lrZjhm = zwywJclrShxx.getLrZjhm();
+        String sqyy = zwywJclrShxx.getSqyy();
+        String lrHjdz = zwywJclrShxx.getLrHjdz();
         if (StringUtils.isNotEmpty(lrZjhm)) {
             zwywJclrShxx.setLrZjhm(null);
         }
+        if (StringUtils.isNotEmpty(sqyy)) {
+            zwywJclrShxx.setSqyy(null);
+        }
+        if (StringUtils.isNotEmpty(lrHjdz)) {
+            zwywJclrShxx.setLrHjdz(null);
+        }
         LambdaQueryWrapper<ZwywJclrShxx> lqw = new LambdaQueryWrapper<>(zwywJclrShxx);
         if (StringUtils.isNotEmpty(lrZjhm)) {
             lqw.and(wq -> wq.eq(ZwywJclrShxx::getLrZjhm, lrZjhm).or().eq(ZwywJclrShxx::getLrCydh, lrZjhm));
         }
+        if (StringUtils.isNotEmpty(sqyy)) {
+            lqw.like(ZwywJclrShxx::getSqyy, sqyy);
+        }
+        if (StringUtils.isNotEmpty(lrHjdz)) {
+            lqw.likeRight(ZwywJclrShxx::getLrHjdz, SubCodeUtil.getSubCode(lrHjdz).get("code"));
+        }
+        if (ObjectUtils.isNotEmpty(zwywJclrShxx.getParams())) {
+            if (zwywJclrShxx.getParams().containsKey("sqsjStart")) {
+                lqw.gt(ZwywJclrShxx::getSqsj, zwywJclrShxx.getParams().get("sqsjStart").toString() + "000000");
+            }
+            if (zwywJclrShxx.getParams().containsKey("sqsjEnd")) {
+                lqw.lt(ZwywJclrShxx::getSqsj, zwywJclrShxx.getParams().get("sqsjEnd").toString() + "235959");
+            }
+        }
         return zwywJclrShxxMapper.selectList(lqw);
     }
 

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

@@ -330,26 +330,26 @@ public class ZwywLrJbxxServiceImpl implements IZwywLrJbxxService {
             throw new ServiceException("照片不符合规则");
         }
         // 当前group中检索相似人脸
-        Map<String, String> searchMap = new LinkedHashMap<>();
-        searchMap.put("image", htStr);
-        searchMap.put("image_type", "BASE64");
-        searchMap.put("group_id_list", SecurityUtils.getAreaCode().substring(0, 6));
-        searchMap.put("match_threshold", ResourceUtil.getConfigByName("baidu.similarity"));
-        JSONObject searchRes = httpsRequest("https://aip.baidubce.com/rest/2.0/face/v3/search" +
-                "?access_token=" + token, "POST", JSONObject.toJSONString(searchMap));
-        if (ObjectUtils.isNotEmpty(searchRes) && StringUtils.equals(searchRes.getString("error_msg"), "SUCCESS")) {
-            // 存在相似人脸信息
-            if (searchRes.getJSONObject("result").getJSONArray("user_list").size() > 0) {
-                JSONArray xslr = searchRes.getJSONObject("result").getJSONArray("user_list");
-                res.put("lzzt", "2");
-                res.put("xslrZjhm", xslr.toJSONString());
-                res.put("msg", "存在相似人脸信息");
-                return res;
-            }
-        }
+//        Map<String, String> searchMap = new LinkedHashMap<>();
+//        searchMap.put("image", htStr);
+//        searchMap.put("image_type", "BASE64");
+//        searchMap.put("group_id_list", SecurityUtils.getAreaCode().substring(0, 6));
+//        searchMap.put("match_threshold", ResourceUtil.getConfigByName("baidu.similarity"));
+//        JSONObject searchRes = httpsRequest("https://aip.baidubce.com/rest/2.0/face/v3/search" +
+//                "?access_token=" + token, "POST", JSONObject.toJSONString(searchMap));
+//        if (ObjectUtils.isNotEmpty(searchRes) && StringUtils.equals(searchRes.getString("error_msg"), "SUCCESS")) {
+//            // 存在相似人脸信息
+//            if (searchRes.getJSONObject("result").getJSONArray("user_list").size() > 0) {
+//                JSONArray xslr = searchRes.getJSONObject("result").getJSONArray("user_list");
+//                res.put("lzzt", "2");
+//                res.put("xslrZjhm", xslr.toJSONString());
+//                res.put("msg", "存在相似人脸信息");
+//                return res;
+//            }
+//        }
         res.put("lzzt", "3");
-//        res.put("lrTxdb", matchRes.getString("result"));
-        res.put("lrTxdb", "89");
+        res.put("lrTxdb", matchRes.getString("result"));
+//        res.put("lrTxdb", "89");
         res.put("msg", "通过人脸验证");
         return res;
     }
@@ -492,8 +492,10 @@ public class ZwywLrJbxxServiceImpl implements IZwywLrJbxxService {
     @Override
     public int updateZwywLrJbxx(InLnstLrxx zwywLrJbxx)
     {
+        LnstDeptExamine examine = lnstDeptExamineMapper.selectList(new LambdaQueryWrapper<LnstDeptExamine>()
+                .eq(LnstDeptExamine::getCode, zwywLrJbxx.getLrHjdz())).stream().findFirst().orElse(null);
         if (StringUtils.equals(zwywLrJbxx.getLzzt(), "1") || StringUtils.equals(zwywLrJbxx.getLzzt(), "2")
-                || StringUtils.equals(zwywLrJbxx.getLzzt(), "5") || StringUtils.equals(zwywLrJbxx.getLzzt(), "7")) {
+                || StringUtils.equals(zwywLrJbxx.getLzzt(), "5") || ObjectUtils.isNotEmpty(examine)) {
             ZwywJclrShxx shxx = new ZwywJclrShxx();
             BeanUtil.copyProperties(zwywLrJbxx, shxx, new CopyOptions().ignoreNullValue());
             if (StringUtils.equals(zwywLrJbxx.getLzzt(), "1")) {
@@ -503,10 +505,13 @@ public class ZwywLrJbxxServiceImpl implements IZwywLrJbxxService {
             } else if (StringUtils.equals(zwywLrJbxx.getLzzt(), "5")) {
                 shxx.setSqyy("特殊材料待审");
             } else {
+                zwywLrJbxx.setLzzt("7");
                 shxx.setSqyy("老人待审核");
             }
             shxx.setId(IdUtils.simpleUUID());
             shxx.setLrId(zwywLrJbxx.getId());
+            shxx.setSqsj(DateUtils.dateTimeNow());
+            shxx.setLzzt(zwywLrJbxx.getLzzt());
             zwywJclrShxxMapper.insert(shxx);
         }
         zwywLrJbxx.setLrHjdz(null);

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

@@ -0,0 +1,35 @@
+<?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.ruoyi.lnst.mapper.LnstYlhtMapper">
+    
+    <resultMap type="LnstYlht" id="LnstYlhtResult">
+        <result property="id"    column="id"    />
+        <result property="ylcode"    column="ylcode"    />
+        <result property="ylid"    column="ylid"    />
+        <result property="tx"    column="tx"    />
+        <result property="dbfs"    column="dbfs"    />
+        <result property="kz1"    column="kz1"    />
+        <result property="kz2"    column="kz2"    />
+        <result property="kz3"    column="kz3"    />
+        <result property="status"    column="status"    />
+        <result property="createTimeStr"    column="create_time_str"    />
+        <result property="createUserId"    column="create_user_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createUserType"    column="create_user_type"    />
+        <result property="createUnit"    column="create_unit"    />
+        <result property="createTounit"    column="create_tounit"    />
+        <result property="createBmjsc"    column="create_bmjsc"    />
+        <result property="createQhjsc"    column="create_qhjsc"    />
+        <result property="createUnitName"    column="create_unit_name"    />
+        <result property="createAreaCode"    column="create_area_code"    />
+        <result property="updateTimeStr"    column="update_time_str"    />
+        <result property="updateUserId"    column="update_user_id"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateUnit"    column="update_unit"    />
+        <result property="updateUnitName"    column="update_unit_name"    />
+        <result property="state"    column="state"    />
+    </resultMap>
+
+</mapper>

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

@@ -42,6 +42,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateUnit"    column="update_unit"    />
         <result property="updateUnitName"    column="update_unit_name"    />
         <result property="state"    column="state"    />
+        <result property="lat"    column="lat"    />
+        <result property="lng"    column="lng"    />
+        <result property="sbdwbm"    column="sbdwbm"    />
+        <result property="sbdwmc"    column="sbdwmc"    />
+        <result property="jssj"    column="jssj"    />
+        <result property="djsj"    column="djsj"    />
+        <result property="ssqh"    column="ssqh"    />
+        <result property="sbip"    column="sbip"    />
+        <result property="dzjwd"    column="dzjwd"    />
+        <result property="istk"    column="istk"    />
+        <result property="isdb"    column="isdb"    />
+        <result property="iszc"    column="iszc"    />
+        <result property="tkzm"    column="tkzm"    />
+        <result property="dbzm"    column="dbzm"    />
+        <result property="zczm"    column="zczm"    />
+        <result property="sfzqfjg"    column="sfzqfjg"    />
+        <result property="sfzyxqxs"    column="sfzyxqxs"    />
+        <result property="sfzyxqxz"    column="sfzyxqxz"    />
+        <result property="sfzzpb"    column="sfzzpb"    />
+        <result property="jzdz"    column="jzdz"    />
+        <result property="jhrxm"    column="jhrxm"    />
+        <result property="jhrlxdh"    column="jhrlxdh"    />
+        <result property="ylcode"    column="ylcode"    />
+        <result property="ylid"    column="ylid"    />
+        <result property="djbh"    column="djbh"    />
     </resultMap>
 
 </mapper>