智慧保安后台管理-外网项目备份
Administrator
2021-12-15 d47e5818d63bef779ff8c4cef79382ae63e99fb4
二维码生成修改,保安员证信息查询修改
5 files modified
65 ■■■■■ changed files
src/main/java/org/springblade/modules/qrcode/QrCodeController.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/mapper/UserMapper.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml 20 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java 13 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/vo/UserVO.java 18 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/qrcode/QrCodeController.java
@@ -46,7 +46,6 @@
        String url = "http://223.82.109.183:2080/securityInfo.html";
        if (null!=securityNumber) {
            String encoded = URLEncoder.encode(securityNumber,"UTF-8");
            System.out.println("encoded = " + encoded);
            String content = url + "?securityNumber=" + encoded;
//                "&realName=" + one.getRealName() +
//                "&age=" + one.getAge() +
@@ -85,7 +84,8 @@
//        String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
        String url = "http://223.82.109.183:2080/securityInfo.html";
        if (null!=securityNumber) {
            String content = url + "?securityNumber=" + securityNumber;
            String encoded = URLEncoder.encode(securityNumber,"UTF-8");
            String content = url + "?securityNumber=" + encoded;
            byte[] qrCodeImage = QRCodeUtil.getQRCodeImage(content, 350, 350);
            String encode = new BASE64Encoder().encode(qrCodeImage);
            return "data:image/png;base64,"+encode;
@@ -104,7 +104,8 @@
//        String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
        String url = "http://223.82.109.183:2080/securityInfo.html";
        if (null!=securityNumber) {
            String content = url + "?securityNumber=" + securityNumber;
            String encoded = URLEncoder.encode(securityNumber,"UTF-8");
            String content = url + "?securityNumber=" + encoded;
            byte[] qrCodeImage = QRCodeUtil.getQRCodeImage(content, 350, 350);
            String path = "D:\\QrCode\\";
            FileOutputStream fileOutputStream = new FileOutputStream(path+securityNumber+".png");
src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -227,4 +227,11 @@
     * @return
     */
    List<Map<String, Object>> selectEquipent();
    /**
     * 查詢派遣信息
     * @param id 用戶id
     * @return
     */
    DispatcherVO getUserDispatcherInfo(Long id);
}
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -804,4 +804,24 @@
          AND equipment_code IS NOT NULL
    </select>
    <!--查詢用戶派遣記錄信息-->
    <select id="getUserDispatcherInfo" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
        select
        sdu.name dispatcherCompany,
        dispatcherTime dispatchertime,
        sd.end_time endTime
        from blade_user bu
        left join
        sys_dispatcher sd
        on
        sd.user_ids = bu.id
        left join
        sys_dispatcher_unit sdu
        on
        sdu.id = sd.dispatcher_unit_id
        where 1=1
        and sd.status = 0
        and bu.dispatch = 0
        and bu.id = #{id}
    </select>
</mapper>
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -42,6 +42,7 @@
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.auth.enums.UserEnum;
import org.springblade.modules.dispatcher.entity.Dispatcher;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.experience.entity.Experience;
import org.springblade.modules.experience.service.IExperienceService;
@@ -1390,7 +1391,17 @@
     */
    @Override
    public UserVO getUserInfoBySecurityNumber(String securityNumber) {
        return baseMapper.getUserInfoBySecurityNumber(securityNumber);
        UserVO userVO = baseMapper.getUserInfoBySecurityNumber(securityNumber);
        //查询派遣信息
        if (null!=userVO) {
            DispatcherVO dispatcherVO = baseMapper.getUserDispatcherInfo(userVO.getId());
            if (null != dispatcherVO) {
                userVO.setDispatchUnitName(dispatcherVO.getDispatcherCompany());
                userVO.setDispatchStartTime(new SimpleDateFormat("yyyy-MM-dd").format(dispatcherVO.getDispatchertime()));
                userVO.setDispatchEndTime(new SimpleDateFormat("yyyy-MM-dd").format(dispatcherVO.getEndTime()));
            }
        }
        return userVO;
    }
src/main/java/org/springblade/modules/system/vo/UserVO.java
@@ -134,4 +134,22 @@
    private String candidateNo;
    /**
     * 派遣单位名称
     */
    private String dispatchUnitName;
    /**
     * 派遣开始时间
     */
    private String dispatchStartTime;
    /**
     * 派遣结束时间
     */
    private String dispatchEndTime;
}