张晓波
2023-10-20 e18f48679e23f08f8b346779ec6ae930884bdeb9
苏州配置文件简 化
已修改5个文件
47 ■■■■■ 文件已修改
hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/controller/FaceController.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/service/FaceServer.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/service/impl/FaceServerImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/mapper/PlatUserMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/controller/FaceController.java
@@ -12,6 +12,12 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Base64;
@RestController
@RequestMapping("face")
public class FaceController {
@@ -85,5 +91,26 @@
        return jsonObject;
    }
    @RequestMapping("/showFaceImg")
    public void showFaceImg(String recordId, HttpServletResponse response){
        String oriStr = faceServer.queryOriStrById(recordId);
        byte[] bytes = Base64.getDecoder().decode(oriStr);
        OutputStream outputStream = null;
        try {
            outputStream = response.getOutputStream();
            outputStream.write(bytes);
        } catch (IOException e) {
            throw new RuntimeException(e);
        } finally {
            try {
                if (outputStream!=null) {
                    outputStream.close();
                }
            } catch (IOException e) {
                throw new RuntimeException(e);
            }
        }
    }
}
hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/service/FaceServer.java
@@ -18,4 +18,6 @@
    void queryPer(String perId);
    void removeNotify(String mess);
    String queryOriStrById(String id);
}
hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/face/service/impl/FaceServerImpl.java
@@ -167,6 +167,11 @@
        }
    }
    @Override
    public String queryOriStrById(String id) {
        return userMapper.queryOriStrById(id);
    }
    public static void main(String[] args) {
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("method","delete_person");
hd/pipe/StaffManage/src/main/java/com/thhy/staff/modules/biz/platuser/mapper/PlatUserMapper.java
@@ -113,4 +113,6 @@
    void syncResult(@Param("syncSuccess") int syncSuccess,@Param("userIdArray")List<String> userIdArray);
    void syncFail(@Param("userId") String userId,@Param("syncFailReason")String syncFailReason);
    String queryOriStrById(String id);
}
hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml
@@ -858,16 +858,21 @@
    <select id="queryDoorUser" resultType="com.thhy.staff.modules.biz.platuser.entity.DoorUserVo">
        select fr.create_time,fr.employee_no_string as jobNum,spu.real_name as realName,sg.group_name as groupName,1 as staffStatus
        select fr.id,fr.create_time,fr.employee_no_string as userId,fd.through_type,spu.real_name as realName,spu.job_num as jobNum,sg.group_name as groupName,1 as staffStatus
        from t_face_record fr
                 left join sys_plat_user spu on spu.job_num = fr.employee_no_string
                 left join t_face_device fd on fd.dev_sno = fr.mac_address
                 left join sys_plat_user spu on spu.user_id = fr.employee_no_string
                 left join sys_group_user sgu on spu.user_id = sgu.user_id
                 left join sys_group sg on sg.group_id = sgu.group_id
        where fr.notice_type = 5 and fr.verify = 1 and (fr.mac_address='e0:ca:3c:f0:d9:3a' or fr.mac_address = 'e0:ca:3c:f0:a7:34' or fr.mac_address = 'e0:ca:3c:f0:d9:3b')
        where fr.verify = 1 and fd.through_type = 2
        order by fr.create_time desc
        limit 10
    </select>
    <select id="queryOriStrById" resultType="string">
        select ori_str from t_face_record where id = #{id}
    </select>
    <select id="countInDoorUserToday" resultType="int">
        select count(distinct fr.employee_no_string)
        from t_face_record fr