bug修改

zhanghua

2023-06-12 905296d89c10d770cb613fd93f1ca4aa687754ce

bug修改

 document/ÔÆmas/~$TPS¶ÌÐŽӿÚÎĵµ.docx

Binary files differ

 document/¸±±¾ÀöË®ÊÐËì²ýÏØÖÇ»ÛÖ´·¨Ó¦ÓÃ-×ÊÔ´¿ªÍ¨±í -0228.xlsx

Binary files differ

 document/¼ÝÊ»²ÕÊý¾Ý½Ó¿ÚÎĵµ£¨aiÎïÁªºÍ×ۺϾö²ß£©.docx

Binary files differ

 ycl-common/src/main/java/com/ycl/aspect/LogAspect.java

@@ -35,9 +35,13 @@
        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
        Method method = signature.getMethod();
        LogSave annotation = method.getAnnotation(LogSave.class);
        AdminUserDetails adminUserDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        UmsAdminLoginLog loginLog = new UmsAdminLoginLog();
        loginLog.setAdminId(adminUserDetails.getUserId());
        try {
            AdminUserDetails adminUserDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();

            loginLog.setAdminId(adminUserDetails.getUserId());
        } catch (Exception ex) {
        }
        loginLog.setCreateTime(new Date());
        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
        HttpServletRequest request = attributes.getRequest();
@@ -45,21 +49,18 @@
        String header = request.getHeader("user-agent");
        if (header.contains("Windows NT")) {
            loginLog.setUserAgent("Web端");
        }
        else if(header.contains("Android")) {
        } else if (header.contains("Android")) {
            loginLog.setUserAgent("Android端");
        }
        else if(header.contains("iPhone")) {
        } else if (header.contains("iPhone")) {
            loginLog.setUserAgent("ios端");
        }
        else if(header.contains("iPad")) {
        } else if (header.contains("iPad")) {
            loginLog.setUserAgent("iPad端");
        }else {
        } else {
            loginLog.setUserAgent("Web端");
        }
        if (annotation.operationType().equals("")){
        if (annotation.operationType().equals("")) {
            loginLog.setOperationType("其他操作");
        }else {
        } else {
            loginLog.setOperationType(annotation.operationType());
        }
        loginLog.setContain(annotation.contain());

 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java

@@ -141,7 +141,7 @@
            date = calendar.getTime();
            umsAdmin.setExpirationDate(date);
        } else {
            umsAdmin.setExpirationDate(new Date("2200-01-01"));
            umsAdmin.setExpirationDate(new Date(2090,1,1));
        }
        if (umsAdmin.getId() != null) {
            baseMapper.updateById(umsAdmin);

 ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java

@@ -1,11 +1,14 @@
package com.ycl.controller.caseHandler;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
import com.ycl.controller.BaseController;
import com.ycl.common.constant.BaseCaseStatus;
import com.ycl.common.util.UtilNumber;
@@ -16,10 +19,12 @@
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.caseHandler.BaseCaseDetail;
import com.ycl.entity.caseHandler.DisposeRecord;
import com.ycl.entity.resources.ImageResources;
import com.ycl.service.caseHandler.IBaseCaseService;
import com.ycl.service.caseHandler.IDisposeRecordService;
import com.ycl.service.caseHandler.IIllegalBuildingService;
import com.ycl.service.caseHandler.IViolationsService;
import com.ycl.service.resources.IImageResourcesService;
import com.ycl.utils.EasyExcelUtils;
import com.ycl.vo.casePool.QueryForViolationVO;
import io.swagger.annotations.Api;
@@ -28,6 +33,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -63,6 +69,9 @@

    @Autowired
    UtilNumber utilNumber;

    @Autowired
    IImageResourcesService iImageResourcesService;


    @Autowired
@@ -211,7 +220,7 @@
     **/
    @ApiOperation(value = "添加违规案件")
    @PostMapping("/addition_violation")
    @LogSave(operationType = "事项处置管理", contain = "新增违建案件")
    @LogSave(operationType = "事项处置管理", contain = "新增违规案件")
    public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) {
        Integer violation = 1;
        Integer resource = 2;
@@ -224,6 +233,19 @@
        baseCase.setAlarmTime(LocalDateTime.parse(violationParam.getAlarmTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
        baseCase.setCreateTime(LocalDateTime.now());
        baseCaseService.save(baseCase);
        JSONArray arr = JSON.parseArray(baseCase.getPic());
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();

        for (int i = 0; i < arr.size(); i++) {
            ImageResources imageResources = new ImageResources();
            imageResources.setType("01");
            imageResources.setBelongToId(baseCase.getId());
            imageResources.setUrl(arr.getString(i));
            imageResources.setCreateTime(LocalDateTime.now());
            imageResources.setCreateUser(user.getUserId());
            iImageResourcesService.save(imageResources);
        }

        return CommonResult.success(baseCaseService.saveViolationCase(violationParam, baseCase.getId()));
    }

@@ -234,7 +256,7 @@
     **/
    @ApiOperation(value = "添加违建案件")
    @PostMapping("/addition_illegal_building")
    @LogSave(operationType = "事项处置管理", contain = "新增违规案件")
    @LogSave(operationType = "事项处置管理", contain = "新增违建案件")
    public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) {
        Integer illegalBuilding = 2;
        Integer resource = 2;
@@ -341,7 +363,7 @@
        Integer state = iDisposeRecordService
                .list(new LambdaQueryWrapper<DisposeRecord>()
                        .eq(DisposeRecord::getBaseCaseId, caseId).
                                orderByDesc(DisposeRecord::getCreateTime)).get(firstNum).getState();
                        orderByDesc(DisposeRecord::getCreateTime)).get(firstNum).getState();
        return CommonResult.success(baseCaseService
                .update(new LambdaUpdateWrapper<BaseCase>()
                        .eq(BaseCase::getId, caseId)

 ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java

@@ -1,5 +1,7 @@
package com.ycl.controller.platformApi;

import cn.hutool.json.JSONConverter;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
@@ -49,6 +51,7 @@
    @PostMapping("/AlarmReport")
    @LogSave(operationType = "报警管理", contain = "视频报警推送")
    public CommonResult alarmReport(@RequestBody @Validated AlarmParam alarmParam) {
//        System.out.println("保存报警数据：" + JSONObject.toJSONString(alarmParam));
        videoAlarmReportService.save(alarmParam);
        return new CommonResult(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage());
    }

 ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java

@@ -122,4 +122,12 @@
     */
    @ApiModelProperty(value = "身份证号码")
    private String informantIdCard;


    @ApiModelProperty(value = "图片")
    private String pic;


    @ApiModelProperty(value = "视频")
    private String media;
}

 ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java

@@ -216,6 +216,12 @@
    @ApiModelProperty(value = "调度信息")
    private DispatchInfo dispatchInfo;

    @TableField("pic")
    @ApiModelProperty(value = "图片")
    private String pic;

    @TableField("media")
    @ApiModelProperty(value = "视频")
    private String media;

}

 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java

@@ -8,6 +8,7 @@
import com.ycl.entity.caseHandler.QuestionCategory;
import com.ycl.entity.caseHandler.Violations;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.entity.resources.ImageResources;
import com.ycl.entity.video.VideoAlarmReport;
import com.ycl.entity.video.VideoPoint;
import com.ycl.enums.common.DictTypeEnum;
@@ -16,6 +17,7 @@
import com.ycl.service.caseHandler.IBaseCaseService;
import com.ycl.service.caseHandler.IViolationsService;
import com.ycl.service.dict.IDataDictionaryService;
import com.ycl.service.resources.IImageResourcesService;
import com.ycl.service.video.impl.IVideoPointService;
import com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +41,7 @@
    private IVideoPointService videoPointService;
    private IBaseCaseService baseCaseService;
    private IDataDictionaryService dataDictionaryService;
    private IImageResourcesService imageResourcesService;

    @Resource
    BaseCaseMapper baseCaseMapper;
@@ -59,6 +62,11 @@
    @Autowired
    public void setDataDictionaryService(IDataDictionaryService dataDictionaryService) {
        this.dataDictionaryService = dataDictionaryService;
    }

    @Autowired
    public void setImageResourcesService(IImageResourcesService imageResourcesService) {
        this.imageResourcesService = imageResourcesService;
    }

    @Override
@@ -96,6 +104,17 @@
                }

                baseMapper.insert(violations);

                try {
                    ImageResources imageResources = new ImageResources();
                    imageResources.setType("01");
                    imageResources.setBelongToId(baseCase.getId());
                    imageResources.setUrl(videoAlarmReport.getPicData());
                    imageResources.setCreateTime(LocalDateTime.now());
                    imageResourcesService.save(imageResources);
                } catch (Exception ex) {

                }
            }
        }
    }

 ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java

@@ -23,6 +23,7 @@
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.mail.javamail.JavaMailSenderImpl;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Service;
@@ -32,6 +33,7 @@

import javax.annotation.Resource;
import javax.mail.internet.MimeMessage;
import javax.xml.ws.Response;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -103,7 +105,7 @@
                sendMessage.setTargetTo(receive);
                sendMessage.setSendTime(new Date());
                sendMessage.setPhoneNumber(umsAdminMapper.selectById(receive).getMobile());
                if (ChannelCode.INNER.equals(message.getChannelCode())){
                if (ChannelCode.INNER.equals(message.getChannelCode())) {
                    sendMessage.setIsView(0);
                }
                this.save(sendMessage);
@@ -207,8 +209,8 @@
        ObjectMapper objectMapper = new ObjectMapper();

        HttpEntity<String> stringHttpEntity = new HttpEntity<>(Base64Utils.encodeToString(objectMapper.writeValueAsBytes(mac)), httpHeaders);

        SendRes sendRes = objectMapper.readValue(restTemplate.postForEntity(url, stringHttpEntity, String.class).getBody(), SendRes.class);
        ResponseEntity<String> response = restTemplate.postForEntity(url + "/sms/submit", sendReq, String.class);
        SendRes sendRes = objectMapper.readValue(response.getBody(), SendRes.class);
        if (sendRes.getRspcod().equals("success")) {
            return 2;
        } else {

 ycl-platform/src/main/resources/application-dev.yml

@@ -61,10 +61,10 @@
  password: qizcitupatzoeeij

SMS:
  ecName: ycl
  apId: 1
  sign: sign
  url: http://localhost:8082/sccg/text/sms_res
  ecName: æµ™æ±Ÿç§»åŠ¨ä¿¡æ¯ç³»ç»Ÿé›†æˆæœ‰é™å…¬å¸ï¼ˆé‚昌）
  apId: sccg
  sign: wg2AOpofE
  url: https://mas.10086.cn

videoPoint:
  url: http://183.245.159.161:8281

 ycl-platform/src/main/resources/application-prod.yml

@@ -60,10 +60,10 @@
  password: qizcitupatzoeeij

SMS:
  ecName: ycl
  apId: 1
  sign: sign
  url: http://localhost:8082/sccg/text/sms_res
  ecName: æµ™æ±Ÿç§»åŠ¨ä¿¡æ¯ç³»ç»Ÿé›†æˆæœ‰é™å…¬å¸ï¼ˆé‚昌）
  apId: sccg
  sign: wg2AOpofE
  url: https://mas.10086.cn

videoPoint:
  url: http://172.28.194.180:7901