Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-12-12 b3059e1a596b4fb05a708f3c3ac0ff3bc369d06b

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/common/PublicController.java

@@ -131,7 +131,7 @@
                    String fileName = folder+fName;
                    boolean r = ftp.uploadInputstream(is,fileName);
                    if(r){
                        if(Constants.equalsInteger(isFace,Constants.ZERO)){
                         if(Objects.nonNull(isFace) && Constants.equalsInteger(isFace,Constants.ZERO)){
                             //验证人脸评分
                            //人脸评分
                            FacePictureCheckRequest param = new FacePictureCheckRequest();

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java

@@ -191,7 +191,7 @@
                    String fileName = folder+"/"+fName;
                    boolean r = ftp.uploadInputstream(is,fileName);
                    if(r){
                        if(Constants.equalsInteger(isFace,Constants.ZERO)){
                         if(Objects.nonNull(isFace) && Constants.equalsInteger(isFace,Constants.ZERO)){
                            //验证人脸评分
                            //人脸评分
                            FacePictureCheckRequest param = new FacePictureCheckRequest();

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java

@@ -72,22 +72,6 @@
        return ApiResponse.success("查询成功",wxAuthorizeVO);
    }


    @LoginNoRequired
    @ApiOperation(value = "testSendNotice", notes = "testSendNotice")
    @GetMapping("/testSendNotice")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "openid", value = "openid", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "token", value = "token", required = true),
    })
    public ApiResponse wxAuthorize(@RequestParam String openid,String token) {
        WxPlatNotice wxPlatNotice = new WxPlatNotice();
        List<String> idList = Arrays.asList(openid.split(","));
        wxPlatNotice.testSendNotice(idList,token);
        return ApiResponse.success("查询成功");
    }


    @ApiOperation(value = "查询被访问人信息", notes = "查询被访问人信息")
    @PostMapping("/getVisitedMember")
    public ApiResponse<List<MemberVO>> getVisitedMember(@Valid @RequestBody CheckVisitedDTO checkVisitedDTO) {
@@ -124,6 +108,11 @@
    public ApiResponse<PageData<Visits>> visitPage (@RequestBody PageWrap<Visits> pageWrap) {
        if(Objects.isNull(pageWrap.getModel()) || StringUtils.isBlank(pageWrap.getModel().getOpenid())){
            pageWrap.getModel().setMemberId(0);
        }else{
            if(Objects.nonNull(pageWrap.getModel()) && Objects.nonNull(pageWrap.getModel().getStatus()) ){
                pageWrap.getModel().setBusinessStatus(pageWrap.getModel().getStatus());
                pageWrap.getModel().setStatus(null);
            }
        }
        return ApiResponse.success(visitsService.findPage(pageWrap));
    }

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java

@@ -132,7 +132,7 @@
//                    boolean r = ftp.uploadInputstream(compressImg(is),fileName);
                    boolean r = ftp.uploadInputstream(is,fileName);
                    if(r){
                        if(Constants.equalsInteger(isFace,Constants.ZERO)){
                         if(Objects.nonNull(isFace) && Constants.equalsInteger(isFace,Constants.ZERO)){
                            //验证人脸评分
                            //人脸评分
                            FacePictureCheckRequest param = new FacePictureCheckRequest();
@@ -267,7 +267,7 @@
                    ALiYunUtil obs = new ALiYunUtil(endpoint,access_id, access_key);
                    if (obs.uploadOnlineObject(file.getInputStream(),bucketName, key,null)) {
                        // 移动成功,返回文件名
                        if(Constants.equalsInteger(isFace,Constants.ZERO)){
                         if(Objects.nonNull(isFace) && Constants.equalsInteger(isFace,Constants.ZERO)){
                            //验证人脸评分
                            //人脸评分
                            FacePictureCheckRequest param = new FacePictureCheckRequest();

 server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java

@@ -95,7 +95,7 @@
                }
                Constants.WxUrlParams wxUrlParams =  Constants.WxUrlParams.VISIT_REPORT_RECORD_USER;
                if(!Constants.equalsInteger(visits.getType(),Constants.TWO)){
                    if(objCode.equals(WxPlatConstants.visitContent.visitUpload)){
                    if(!objCode.equals(WxPlatConstants.visitContent.visitWaitAudit)){
                        wxUrlParams = Constants.WxUrlParams.VISIT_RECORD_VISIT;
                    }else{
                        wxUrlParams = Constants.WxUrlParams.VISIT_RECORD_USER;
@@ -411,7 +411,7 @@
                    }else if(Constants.equalsInteger(platformBooks.getStatus(),Constants.TWO)){
                        const9.put("value","申请已审核通过");
                    }else{
                        const9.put("value","申请未通过");
                        const9.put("value","申请已审核驳回");
                    }
                }
                //车牌号
@@ -610,17 +610,17 @@
                Map<String, Object> const6 = new HashMap<String,Object>();
                const6.put("value",wxNoticeConfig.getTitile());
                //车牌号
                Map<String, Object> character_string1 = new HashMap<String,Object>();
                character_string1.put("value",platformJob.getCarCodeFront());
                Map<String, Object> car_number3 = new HashMap<String,Object>();
                car_number3.put("value",platformJob.getCarCodeFront());
                //月台号
                Map<String, Object> thing3 = new HashMap<String,Object>();
                thing3.put("value", platformJob.getPlatformName());
                Map<String, Object> character_string7 = new HashMap<String,Object>();
                character_string7.put("value", "A001");
                //时间
                Map<String, Object> time4 = new HashMap<String,Object>();
                time4.put("value", DateUtil.getFomartDate(new Date(),"yyyy年MM月dd日 HH:mm:ss") );
                dataMap.put("const6",const6);
                dataMap.put("character_string1",character_string1);
                dataMap.put("thing3",thing3);
                dataMap.put("car_number3",car_number3);
                dataMap.put("character_string7",character_string7);
                dataMap.put("time4",time4);
                for (String openId:openIds) {
                    paramMap.clear();
@@ -629,6 +629,7 @@
                    paramMap.put("touser", openId);
                    paramMap.put("data", dataMap);
                    String response = HttpsUtil.postJson(postUrL, JSONObject.toJSONString(paramMap));
                    log.warn("·==++--·推送微信模板信息内容：{}", JSONObject.toJSONString(paramMap));
                    if(StringUtils.isBlank(response)){
                        log.warn("·==++--·推送微信模板信息：{}·--++==·", "失败");
                    }else{

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/PlatformGasImport.java

@@ -17,18 +17,17 @@
@ApiModel("油耗信息导入")
public class PlatformGasImport {

    @ExcelColumn(name="序号",value = "sn",index = 1)
    private String sn;

    @ExcelColumn(name="车牌号",value = "carCode",index = 1)
    private String carCode;

    @ExcelColumn(name="时间（年月）",value = "timeInfo",index = 2,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date timeInfo;
    @ExcelColumn(name="使用月份",value = "timeInfo",index = 2)
    private String timeInfo;

    @ExcelColumn(name="数量",value = "num",index = 3)
    @ExcelColumn(name="油耗(升)",value = "num",index = 3)
    private String num;

    @ExcelColumn(name="说明",value = "content",index = 3)
    private String content;



}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWaterGas.java

@@ -37,7 +37,7 @@
    private Integer editor;

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="最近操作时间",index = 5,dateFormat="yyyy-MM-dd HH:mm")
    @ExcelColumn(name="最近操作时间",index = 5, width = 18,dateFormat="yyyy-MM-dd HH:mm")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
@@ -47,26 +47,26 @@
    private String remark;

    @ApiModelProperty(value = "时间（年月）")
    @ExcelColumn(name="使用月份",index = 2,dateFormat="yyyy-MM")
    @ExcelColumn(name="使用月份",index = 2, width = 12,dateFormat="yyyy-MM")
    private Date timeInfo;

    @ApiModelProperty(value = "排序码", example = "1")
    private Integer sortnum;

    @ApiModelProperty(value = "类型 0用水 1用气 2用油 3", example = "1")
    @ExcelColumn(name="类型",valueMapping = "0=用水;1=用气;2=用油;3=烟箱;",index = 0)
    @ExcelColumn(name="类型",valueMapping = "0=用水;1=用气;2=用油;3=烟箱;", width = 10,index = 0)
    private Integer type;

    @ApiModelProperty(value = "数量 (用电顿，用电度； 油耗L）", example = "1")
    @ExcelColumn(name="数量",index = 3)
    @ExcelColumn(name="数量",index = 3, width = 10)
    private BigDecimal num;

    @ApiModelProperty(value = "说明")
    @ExcelColumn(name="说明",index = 4)
    @ExcelColumn(name="说明",index = 4, width = 20)
    private String content;

    @ApiModelProperty(value = "车牌号")
    @ExcelColumn(name="车牌号",index = 1)
    @ExcelColumn(name="车牌号",index = 1, width = 10)
    private String carCode;

    @ApiModelProperty(value = "开始时间")

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java

@@ -506,6 +506,7 @@
        //处理待办信息
        noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
                .set(Notices::getStatus,Constants.ONE)
                .set(Notices::getInfo,"已取消")
                .eq(Notices::getType,Constants.TWO)
                .eq(Notices::getObjId,carUseBook.getId())
        );

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java

@@ -889,9 +889,18 @@
                .eq(SystemUser::getMobile,platformJob.getDrivierPhone())
                .last(" limit 1 "));
        if (Objects.nonNull(driver) && StringUtils.isNotBlank(driver.getOpenid())) {
            PlatformJob p = platformJobJoinMapper.selectJoinOne(PlatformJob.class,
                    new MPJLambdaWrapper<PlatformJob>()
                            .selectAll(PlatformJob.class)
                            .selectAs(Platform::getCode,PlatformJob::getPlatformName)
                            .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
                            .eq(PlatformJob::getId,platformJob.getId())
                            .last(" limit 1")
            );

            WxPlatNotice wxPlatNotice = new WxPlatNotice();
            wxPlatNotice.sendPlatformJobTemplateNotice(systemDictDataBiz,
                    wxNoticeConfigMapper, platformJob,
                    wxNoticeConfigMapper, p,
                    objCode,
                    systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                    Arrays.asList(driver.getOpenid().split(","))

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWaterGasServiceImpl.java

@@ -349,7 +349,7 @@
            ExcelImporter ie = null;
            List<PlatformGasImport> dataList =null;
            try {
                ie = new ExcelImporter(file,0,0);
                ie = new ExcelImporter(file,1,0);
                dataList = ie.getDataList(PlatformGasImport.class,null);
            }  catch (Exception e) {
                e.printStackTrace();
@@ -374,15 +374,14 @@
                }
                if( platformWaterGasMapper.selectCount(new QueryWrapper<PlatformWaterGas>().lambda()
                        .eq(PlatformWaterGas::getIsdeleted, Constants.ZERO)
                        .apply("to_days(time_info) = to_days('"+ DateUtil.getPlusTime2(model.getTimeInfo()) +"')")
                        .apply("to_days(time_info) = to_days('"+ model.getTimeInfo()+"-01" +"')")
                        .eq(PlatformWaterGas::getType,Constants.TWO)
                        .eq(PlatformWaterGas::getCarCode,model.getCarCode()))>0){
                    throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该["+DateUtil.getPlusTime2(model.getTimeInfo())+"]数据已存在，请勿重新录入，可以尝试搜索后进行数据修改！");
                    throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该["+model.getTimeInfo()+"]数据已存在，请勿重新录入，可以尝试搜索后进行数据修改！");
                }

                platformWaterGas.setTimeInfo(model.getTimeInfo());
                platformWaterGas.setTimeInfo(DateUtil.StringToDate(model.getTimeInfo()+"-01","yyyy-MM-dd"));
                platformWaterGas.setCarCode(model.getCarCode());
                platformWaterGas.setContent(model.getContent());
                platformWaterGas.setIsdeleted(Constants.ZERO);
                platformWaterGas.setType(Constants.TWO);
                platformWaterGas.setCreator(loginUserInfo.getId());

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java

@@ -1260,6 +1260,23 @@
        queryWrapper.isNull(Visits::getParentId);
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getMemberId()),Visits::getMemberId,pageWrap.getModel().getMemberId());
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getReceptMemberId()),Visits::getReceptMemberId,pageWrap.getModel().getReceptMemberId());

        if(Objects.nonNull(pageWrap.getModel().getBusinessStatus())){
            if(Constants.equalsInteger(pageWrap.getModel().getBusinessStatus(),Constants.TWO)){
                queryWrapper.in(Visits::getStatus,
                        Constants.VisitStatus.xfSuccess,
                        Constants.VisitStatus.xfFail,
                        Constants.VisitStatus.signin,
                        Constants.VisitStatus.signout,
                        Constants.VisitStatus.invalid,
                        Constants.VisitStatus.pass
                        );
            }else{
                queryWrapper.eq(Visits::getStatus,pageWrap.getModel().getBusinessStatus());
            }

        }

        queryWrapper.orderByDesc(Visits::getCreateDate);
        IPage<Visits> result = visitsJoinMapper.selectJoinPage(page, Visits.class,queryWrapper);