功能优化

rk

7 天以前 42a8adae751bf130c17d0a361638ca10a39de81e

功能优化

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/TelecomApiController.java

@@ -47,6 +47,9 @@
    @Autowired
    private JkSketchService jkSketchService;

    @Autowired
    private InoutRecordService inoutRecordService;


    @LoginNoRequired
    @PreventRepeat
@@ -92,4 +95,12 @@
    }


    @LoginNoRequired
    @PreventRepeat
    @ApiOperation("电信-今日入园数据")
    @PostMapping("/getInParkData")
    public ApiResponse<TelecomInParkDataVO> getInParkData () {
        return ApiResponse.success(inoutRecordService.getInParkDataForTelecom());
    }

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/TelecomInParkDataVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
package com.doumee.dao.business.vo;

import com.doumee.dao.business.model.JkCustomerNavigation;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * äº¤æŽ§-线路信息表
 * @author æ±Ÿè¹„蹄
 * @date 2025/09/28 09:01
 */
@Data
@ApiModel("入园统计 - ç”µä¿¡å¤§å±")
public class TelecomInParkDataVO {

    @ApiModelProperty(value = "入园人数统计", example = "1")
    private Integer inUserNum;

    @ApiModelProperty(value = "入园车辆统计", example = "1")
    private Integer inCarNum;

}

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

@@ -4,6 +4,7 @@
import com.doumee.dao.business.model.InoutRecord;
import com.doumee.dao.business.vo.GeneralDataVO;
import com.doumee.dao.business.vo.InParkUserDataVO;
import com.doumee.dao.business.vo.TelecomInParkDataVO;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;

@@ -107,4 +108,6 @@
    List<List<String>> getReportList(InParkDataDTO inParkDataDTO);

    void excel(InParkDataDTO inParkDataDTO, HttpServletResponse response);

    TelecomInParkDataVO getInParkDataForTelecom();
}

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

@@ -14,6 +14,7 @@
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.vo.GeneralDataVO;
import com.doumee.dao.business.vo.InParkUserDataVO;
import com.doumee.dao.business.vo.TelecomInParkDataVO;
import com.doumee.service.business.InoutRecordService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -547,4 +548,34 @@
            throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
        }
    }



    @Override
    public TelecomInParkDataVO getInParkDataForTelecom(){
        TelecomInParkDataVO telecomInParkDataVO = new TelecomInParkDataVO();
        telecomInParkDataVO.setInCarNum(
                inoutRecordMapper.selectCount(new MPJLambdaWrapper<InoutRecord>()
                .selectAll(InoutRecord.class)
                .eq(InoutRecord::getIsdeleted,Constants.ZERO)
                .eq(InoutRecord::getInOrOut,Constants.ZERO)
                .isNotNull(InoutRecord::getCarCode)
                .apply(" ( DATE_FORMAT(CREATE_DATE, '%Y%m%d') = DATE_FORMAT(now(), '%Y%m%d') ) ")
                .groupBy(InoutRecord::getCarCode)
        ).intValue());

        telecomInParkDataVO.setInUserNum(
                inoutRecordMapper.selectCount(new MPJLambdaWrapper<InoutRecord>()
                .selectAll(InoutRecord.class)
                .eq(InoutRecord::getIsdeleted,Constants.ZERO)
                .eq(InoutRecord::getInOrOut,Constants.ZERO)
                .isNotNull(InoutRecord::getMemberPhone)
                .apply(" ( DATE_FORMAT(CREATE_DATE, '%Y%m%d') = DATE_FORMAT(now(), '%Y%m%d') ) ")
                 .groupBy(InoutRecord::getMemberPhone)
        ).intValue());
        return telecomInParkDataVO;
    }



}

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

@@ -771,20 +771,20 @@
        map.put("is_start_trigger","true");
        map.put("data",this.getJdyChildData(warningEvent,ddUserId));

        OkHttpClient client = new OkHttpClient().newBuilder()
                .build();
        MediaType mediaType = MediaType.parse("application/json");
        RequestBody body = RequestBody.create(mediaType, JSONObject.toJSONString(map));//"{\"data\":{\"notice_time\":{\"value\":\"2025-12-23 04:56:29\"},\"title\":{\"value\":\"跨越生产线\"},\"user\":{\"value\":\"1568490244651036\"},\"content\":{\"value\":\"跨越生产线-芜湖物流中心北围墙过道东\"},\"notice_type\":{\"value\":\"跨越生产线\"}},\"is_start_trigger\":\"true\",\"app_id\":\"6909d0fbdb93b068192dc4a9\",\"entry_id\":\"694a19ecf57e071788efc20b\",\"is_start_workflow\":\"false\"}");
        log.error("简道云发送通知请求信息" + JSONObject.toJSONString(map));
        Request request = new Request.Builder()
                .url("https://api.jiandaoyun.com/api/v5/app/entry/data/create")
                .method("POST", body)
                .addHeader("Authorization", "Bearer "+jdyApiKey)
                .addHeader("Content-Type", "application/json")
                .build();
        Response response = client.newCall(request).execute();

        log.error("简道云发送通知返回信息" + JSONObject.toJSONString(response));
//        OkHttpClient client = new OkHttpClient().newBuilder()
//                .build();
//        MediaType mediaType = MediaType.parse("application/json");
//        RequestBody body = RequestBody.create(mediaType, JSONObject.toJSONString(map));//"{\"data\":{\"notice_time\":{\"value\":\"2025-12-23 04:56:29\"},\"title\":{\"value\":\"跨越生产线\"},\"user\":{\"value\":\"1568490244651036\"},\"content\":{\"value\":\"跨越生产线-芜湖物流中心北围墙过道东\"},\"notice_type\":{\"value\":\"跨越生产线\"}},\"is_start_trigger\":\"true\",\"app_id\":\"6909d0fbdb93b068192dc4a9\",\"entry_id\":\"694a19ecf57e071788efc20b\",\"is_start_workflow\":\"false\"}");
//        log.error("简道云发送通知请求信息" + JSONObject.toJSONString(map));
//        Request request = new Request.Builder()
//                .url("https://api.jiandaoyun.com/api/v5/app/entry/data/create")
//                .method("POST", body)
//                .addHeader("Authorization", "Bearer "+jdyApiKey)
//                .addHeader("Content-Type", "application/json")
//                .build();
//        Response response = client.newCall(request).execute();
//
//        log.error("简道云发送通知返回信息" + JSONObject.toJSONString(response));

    }


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

@@ -2106,10 +2106,6 @@
    }






    @Override
    public StagingDataVO stagingHead(StagingDataVO stagingHeadVO){
        //人员信息