代码初始化

k94314517

2024-10-30 8b662dd468bf17b5fef278874f5de36f229795f1

代码初始化

 server/system_service/src/main/resources/mappers/SystemUserMapper.xml

@@ -75,7 +75,7 @@
      <if test="dto.companyType != null ">
        AND  sd.`type` = #{dto.companyType}
      </if>
      <if test="dto.querySpecial != null and dto.querySpecial = 1 ">
      <if test="dto.querySpecial != null and dto.querySpecial == 1 ">
            AND find_in_set(#{dto.companySpecialId},REPLACE(sd.company_path,"/",","))
      </if>
    </where>

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java

@@ -1,5 +1,6 @@
package com.doumee.cloud.board;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.excel.ExcelColumn;
@@ -17,6 +18,7 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -41,7 +43,7 @@
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/platformJobRun")
public class PlatformJobRunController extends BaseController {

    @ApiModelProperty
    @Autowired
    private PlatformJobJoinMapper platformJobJoinMapper;

    @LoginNoRequired
@@ -63,7 +65,8 @@
        data.setTodayOutRata(new BigDecimal(random.nextInt(100)));
        data.setMonthOutRata(data.getTodayOutRata().multiply(new BigDecimal(30)));


        data.setStockMax(new BigDecimal(random.nextInt(1000)));
        data.setStockTotal(new BigDecimal(data.getStockMax().intValue()));
        return ApiResponse.success(data);
    }

@@ -85,7 +88,8 @@
        }
        for (String str:dayList) {
            TransportMeasureVO data = new TransportMeasureVO();
            data.setPlanTimes(str);
            data.setPlanDate(str);
            data.setPlanTimes(random.nextInt(200));
            data.setPlanTaskNum(new BigDecimal(random.nextInt(1000)));
            data.setFinishTaskNum(new BigDecimal(data.getPlanTaskNum().intValue()));
            list.add(data);

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java

@@ -101,4 +101,25 @@
    }


    @LoginNoRequired
    @ApiOperation("访客分析")
    @GetMapping("/getVisitData")
    public ApiResponse<VisitDataVO> getVisitData() {
        VisitDataVO visitDataVO = new VisitDataVO();
        Random random = new Random();
        visitDataVO.setRegisterVisitNum(random.nextInt(20));
        visitDataVO.setRegisterVisitRata(BigDecimal.valueOf(random.nextInt(20)));
        visitDataVO.setLevelNum(random.nextInt(20));
        visitDataVO.setLevelRata(BigDecimal.valueOf(random.nextInt(20)));
        visitDataVO.setWaitVisitNum(random.nextInt(20));
        visitDataVO.setWaitVisitRata(BigDecimal.valueOf(random.nextInt(20)));
        visitDataVO.setRetentionNum(random.nextInt(20));
        visitDataVO.setRetentionRata(BigDecimal.valueOf(random.nextInt(20)));
        return ApiResponse.success(visitDataVO);
    }





}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java

@@ -754,10 +754,25 @@
        }
    }

    /**
     * èŽ·å–菜单
     * @param body
     * @return
     */
    public static String getHkMenu(Map<String,String> body) {
        return startDoGetStringArtemis(HKConstants.InterfacePath.getMenus,body);
    }


    /**
     * å‘送短信验证码
     * @param body
     * @return
     */
    public static String sendSms(String body) {
        return startDoPostStringArtemis(HKConstants.InterfacePath.sendSms,body);
    }

    /**
     * èŽ·å–月台组件配置的LED设备清单
     * @param body

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java

@@ -1467,21 +1467,6 @@
        return  null;
    }

    public static BaseResponse sendSmsByHk(Map<String,Object> param,String url){
        log.info("【海康发送短信】================开始===="+JSONObject.toJSONString(param));
        try {
            TypeReference typeReference =
                    new TypeReference<BaseResponse>(){};
            String res = HttpsUtil.postJson(url, JSONObject.toJSONString(param));
            BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"海康发送短信");
            return  result;
        }catch (Exception e){
            log.error("【海康发送短信】================失败====：\n"+ e.getMessage());
            e.printStackTrace();
        }
       return null;
    }



@@ -1502,6 +1487,23 @@
    }


    public static BaseResponse sendSms(Map<String,Object> param){
        log.info("【发送短信信息】================开始===="+ JSONObject.toJSONString(param));
        try {
            String res = HKTools.sendSms(JSONObject.toJSONString(param));
            TypeReference typeReference =
                    new TypeReference<BaseResponse>(){};
            BaseResponse   result = JSONObject.parseObject(res, typeReference.getType());
            logResult(result,"发送短信信息");
            return  result;
        }catch (Exception e){
            log.error("【发送短信信息】================失败====：\n"+ e.getMessage());
            e.printStackTrace();
        }
        return null;
    }


    private static void logResult(BaseResponse res,String name) {
        if(StringUtils.equals(res.getCode(),HKConstants.RESPONSE_SUCCEE)){
            log.info("【"+name+"】================成功====\n"+res);

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/PlatformJobRunBoardVO.java

@@ -46,6 +46,14 @@
    @ApiModelProperty(value = "本月入库效率")
    private BigDecimal monthInRata;

    @ApiModelProperty(value = "库存最大值")
    private BigDecimal stockMax;

    @ApiModelProperty(value = "当前库存")
    private BigDecimal stockTotal;



    @ApiModelProperty(value = "运输任务分析 - 7日" , hidden = true)
    private List<TransportMeasureVO> transportMeasureWeekList;


 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/TransportMeasureVO.java

@@ -21,6 +21,9 @@
    private BigDecimal finishTaskNum;

    @ApiModelProperty(value = "计划任务数")
    private String planTimes;
    private Integer planTimes;

    @ApiModelProperty(value = "日期")
    private String planDate;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/VisitDataVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
package com.doumee.dao.web.response.platformReport;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * è®¿å®¢åˆ†æž
 *
 * @Author : Rk
 * @create 2024/10/25 10:59
 */
@Data
public class VisitDataVO {

    @ApiModelProperty(value = "待访问数量")
    private Integer waitVisitNum;

    @ApiModelProperty(value = "待访问占比")
    private BigDecimal waitVisitRata;

    @ApiModelProperty(value = "已登记数量")
    private Integer registerVisitNum;

    @ApiModelProperty(value = "已登记占比")
    private BigDecimal registerVisitRata;

    @ApiModelProperty(value = "已离开数量")
    private Integer levelNum;

    @ApiModelProperty(value = "已离开占比")
    private BigDecimal levelRata;

    @ApiModelProperty(value = "滞留数量")
    private Integer retentionNum;

    @ApiModelProperty(value = "滞留占比")
    private BigDecimal retentionRata;


}

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

@@ -973,6 +973,8 @@
                    .eq(VisitPark::getObjType,Constants.ONE)
                    .eq(VisitPark::getHkStatus,Constants.ONE)
                    .isNotNull(VisitPark::getHkId)
                    .apply("  END_TIME > now() ")
                    .orderByDesc(VisitPark::getCreateDate)
            );
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(visitParkList)){
                for (VisitPark visitPark:visitParkList) {
@@ -1209,9 +1211,16 @@
        if(Objects.isNull(platformJob)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }

        if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起,业务状态已流转！");
        }

        Platform platform = platformJoinMapper.selectById(jobOperateDTO.getPlatformId());
        if(Objects.isNull(platform)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到月台信息");
        }

        PlatformJob oldPlatformJob = new PlatformJob();
        BeanUtils.copyProperties(platformJob,oldPlatformJob);

@@ -1226,7 +1235,10 @@
                emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
                SmsConstants.platformJobContent.platformJobOverNum,null,null
        );

        platformJob.setPlatformName(platform.getName());
        this.broadcastAndLEed(platformJob, StringUtils.isBlank(platform.getLedContent())?Constants.PlatformLedContent.IDEL_CONTNET.getName():platform.getLedContent(),
                null
        );

        return platformJob;
    }

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

@@ -99,14 +99,10 @@

    public  void sendSmsByHk(String phone,String content){
        try {
            String url = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HTTPS).getCode() +
                    systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HOST).getCode() +
                    HKConstants.ARTEMIS_PATH +
                    HKConstants.InterfacePath.sendSms[0];
            Map<String,Object> map = new HashMap<>();
            map.put("phoneNo",phone.split(","));
            map.put("content",content);
            BaseResponse result = HKService.sendSmsByHk(map,url);
            BaseResponse result = HKService.sendSms(map);
            if(result !=null){
                if(!StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
                    throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),result.getMsg());