智慧保安后台管理-外网-验收版本
Administrator
2021-12-02 ec1cb265b0d2d98172fd7a58512218959eae8359
保安员,单位检查,工作汇报修改
8 files modified
38 ■■■■ changed files
src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.java 3 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/qrcode/QrCodeController.java 5 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/seinspect/controller/SeinspectController.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/seinspect/entity/Seinspect.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.java 3 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java 9 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.coinspect.entity.Coinspect;
import org.springblade.modules.coinspect.vo.CoinspectVO;
@@ -38,6 +39,6 @@
     * @param coinspect
     * @return
     */
    List<CoinspectVO> selectCoinspectPage(IPage page, CoinspectVO coinspect);
    List<CoinspectVO> selectCoinspectPage(IPage page, @Param("coinspect") CoinspectVO coinspect);
}
src/main/java/org/springblade/modules/coinspect/mapper/CoinspectMapper.xml
@@ -17,6 +17,10 @@
    <select id="selectCoinspectPage" resultMap="coinspectResultMap">
        select * from sys_coinspect
        where 1=1
        <if test="coinspect.sname!=null and coinspect.sname != ''">
            and sName like concat('%', #{coinspect.sname},'%')
        </if>
    </select>
</mapper>
src/main/java/org/springblade/modules/qrcode/QrCodeController.java
@@ -81,7 +81,10 @@
//        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;
src/main/java/org/springblade/modules/seinspect/controller/SeinspectController.java
@@ -105,7 +105,7 @@
        }
        //数据同步
        String s1 =
            "insert into sys_seinspect(id,realName,carid,sName,inspectman,deptName,reviewTime,insid,examination_type,url,jid,deptid,jurisdiction) " +
            "insert into sys_seinspect(id,realName,carid,sName,inspectman,deptName,reviewTime,insid,examination_type,url,jid,deptid,jurisdiction,handler_result) " +
                "values(" + "'" + seinspect.getId() + "'" + "," +
                "'" + seinspect.getRealname() + "'" + "," +
                "'" + seinspect.getCarid() + "'" + "," +
@@ -118,7 +118,8 @@
                "'" + seinspect.getUrl() + "'" + "," +
                "'" + seinspect.getJid() + "'" + "," +
                "'" + seinspect.getDeptid() + "'" + "," +
                "'" +seinspect.getJurisdiction() + "'" + ")";
                "'" + seinspect.getJurisdiction() + "'" + "," +
                "'" +seinspect.getHandlerResult() + "'" + ")";
        FtpUtil.sqlFileUpload(s1);
        return R.success("成功");
    }
src/main/java/org/springblade/modules/seinspect/entity/Seinspect.java
@@ -93,5 +93,10 @@
    private String deptid;
    private String jurisdiction;
    /**
     * 处理结果
     */
    @TableField("handler_result")
    private String handlerResult;
}
src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.seinspect.entity.Seinspect;
import org.springblade.modules.seinspect.vo.SeinspectVO;
@@ -38,6 +39,6 @@
     * @param seinspect
     * @return
     */
    List<SeinspectVO> selectSeinspectPage(IPage page, SeinspectVO seinspect);
    List<SeinspectVO> selectSeinspectPage(IPage page,@Param("seinspect") SeinspectVO seinspect);
}
src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml
@@ -23,6 +23,10 @@
    <select id="selectSeinspectPage" resultMap="seinspectResultMap">
        select * from sys_seinspect
        where 1=1
        <if test="seinspect.realname!=null and seinspect.realname != ''">
            and realName like concat('%', #{seinspect.realname},'%')
        </if>
    </select>
</mapper>
src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java
@@ -226,10 +226,15 @@
//            user.setCardid(idCardNo);
//            User userDetail = userService.getOne(Condition.getQueryWrapper(user));
            User userDetail = userService.getById(userId);
            replyRealNameInfo = replyRealNameInfo.append(userDetail.getRealName()).append(",");
            if (null!=userDetail) {
                replyRealNameInfo = replyRealNameInfo.append(userDetail.getRealName()).append(",");
            }
        }
        //截取
        return replyRealNameInfo.substring(0, replyRealNameInfo.length() - 1);
        if (replyRealNameInfo.length()>0) {
            return replyRealNameInfo.substring(0, replyRealNameInfo.length() - 1);
        }
        return replyRealNameInfo.toString();
    }
}