Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2022-11-28 290a01c4a1eb457e858ca52d7b1c03a6f23e4488

Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

# Conflicts:
#	ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java
#	ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java

 ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java

@@ -1,5 +1,6 @@
package com.ycl.controller.message;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
@@ -61,6 +62,13 @@
        return CommonResult.success(iMessageColumnService.list());
    }

    @ApiOperation(value = "获取显示的栏目")
    @RequestMapping(value = "/getShowColumn", method = RequestMethod.GET)
    @ResponseBody
    public CommonResult getShowColumn() {
        return CommonResult.success(iMessageColumnService.list(new LambdaQueryWrapper<MessageColumn>().eq(MessageColumn::getIsShow,1)));
    }

    @ApiOperation(value = "获取栏目分页查询")
    @RequestMapping(value = "/list", method = RequestMethod.POST)
    @ResponseBody

 ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java

@@ -52,8 +52,10 @@
    @LogSave(operationType = "门店管理", contain = "查询门店")
    public CommonResult<CommonPage<StoreInfoVO>> list(@RequestParam(value = "keyword", required = false) String keyword,
                                                      @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
                                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
        Page<StoreInfoVO> storeInfoPage = storeInfoService.list(keyword, pageSize, pageNum);
                                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                      @RequestParam(value = "status", required = false) String status
    ) {
        Page<StoreInfoVO> storeInfoPage = storeInfoService.list(keyword, pageSize, pageNum,status);
        return CommonResult.success(CommonPage.restPage(storeInfoPage));
    }


 ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java

@@ -52,4 +52,8 @@

    @ApiModelProperty("摄像头")
    private String relationVideo;

    @ApiModelProperty("店铺状态")
    @TableField("status")
    private String status;
}

 ycl-platform/src/main/java/com/ycl/entity/video/VideoPoint.java

@@ -12,6 +12,7 @@

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;

/**
 * <p>
@@ -24,6 +25,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_video_point")
@NoArgsConstructor
public class VideoPoint implements Serializable {

    private static final long serialVersionUID = 1L;

 ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java

@@ -15,5 +15,5 @@
 */
public interface StoreInfoMapper extends BaseMapper<StoreInfo> {

    Page<StoreInfoVO> selectStorePage(Page<StoreInfo> storeInfoPage, String keyword);
    Page<StoreInfoVO> selectStorePage(Page<StoreInfo> storeInfoPage, String keyword,String status);
}

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

@@ -123,7 +123,7 @@
                                , uploadDisposingResultParam.getWritPic()));
                iImageResourcesService.updateById(imageResources);
            }
            return baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).set(BaseCase::getState, BaseCaseStatus.CHECK));
            return baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, uploadDisposingResultParam.getCaseId()).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
        } else {
            //当事人
            PartyInfo partyInfo = new PartyInfo();

 ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java

@@ -24,7 +24,7 @@
     * @param pageNum  页码
     * @return 分页实体
     */
    Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum);
    Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum,String status);

    /**
     * 读取excel文件动态加载文件

 ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java

@@ -49,11 +49,11 @@


    @Override
    public Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum) {
    public Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum,String status) {
        Page<StoreInfo> storeInfoPage = new Page<>();
        storeInfoPage.setSize(pageSize);
        storeInfoPage.setCurrent(pageNum);
        Page<StoreInfoVO> page = storeInfoMapper.selectStorePage(storeInfoPage, keyword);
        Page<StoreInfoVO> page = storeInfoMapper.selectStorePage(storeInfoPage, keyword,status);
        page.getRecords().forEach(x -> x.setVideoPoint(videoPointMapper.selectById(x.getVideoId())));
        return page;
    }

 ycl-platform/src/main/java/com/ycl/vo/casePool/BaseCaseVO.java

@@ -1,6 +1,9 @@
package com.ycl.vo.casePool;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.time.LocalDateTime;

@Data
public class BaseCaseVO {
@@ -13,4 +16,7 @@
    private String grade;
    private String street;
    private String community;

    @JsonFormat(timezone = "GMT",pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime alarmTime;
}

 ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java

@@ -69,7 +69,7 @@
    @TableField("store_score")
    private Double storeScore;

    @ApiModelProperty("门店积分")
    @ApiModelProperty("视频点位")
    @TableField(" relation_video")
    private String relationVideo;


 ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml

@@ -238,7 +238,8 @@
            t4.pic_data,
            t5.`name` as grade,
            t6.`name` as street,
            t7.`name` as community
            t7.`name` as community,
            t1.alarm_time as alarmTime
        FROM
            ums_base_case t1
                LEFT JOIN ums_violations t2 ON t1.id = t2.id

 ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml

@@ -25,6 +25,9 @@
            <if test="keyword!=null and keyword!=''">
                t1.store_name LIKE  CONCAT('%', #{keyword}, '%')
            </if>
            <if test="status!=null and status!='' and status!='0' ">
                t1.status = #{status}
            </if>
        </where>
        order by t1.id desc
    </select>