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

zhanghua

2022-10-10 6f5fa96f0b63f5db9424507f51760672d1750c83

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

 ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java

@@ -1,6 +1,7 @@
package com.ycl.controller.depart;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.api.BasePageDTO;
import com.ycl.api.BasePageVO;
@@ -19,7 +20,6 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;

/**
@@ -64,14 +64,14 @@
    }

    /**
     * @Description  batch deletion departments
     * @Param [ids]
     * @return com.ycl.api.CommonResult<java.lang.Void>
     * @Description batch deletion departments
     * @Param [ids]
     **/
    @ApiOperation("批处理-删除")
    @PostMapping(value = "/batch_deletion")
    public CommonResult delete(@RequestParam List<Long> ids) {
        if (ids.isEmpty()){
        if (ids.isEmpty()) {
            return CommonResult.failed("bad request parameter");
        }
        return CommonResult.success(departService.removeBatchByIds(ids));
@@ -108,8 +108,24 @@
    @ApiOperation("查询我的部门")
    @GetMapping(value = "/belongDepart")
    public CommonResult<BasePageDTO> belongDepart(BasePageVO params) {
        BasePageDTO basePageDTO= umsAdminDepartService.belongDepart(fetchOperator(request).getOperatorId(), params.getCurrent(), params.getPageSize());
        BasePageDTO basePageDTO = umsAdminDepartService.belongDepart(fetchOperator(request).getOperatorId(), params.getCurrent(), params.getPageSize());
        return CommonResult.success(basePageDTO);
    }
}

    @ApiOperation("查询顶级部门")
    @GetMapping(value = "/query_father")
    public CommonResult search() {
        Integer fatherId = 0;
        return CommonResult.success(departService
                .list(new LambdaQueryWrapper<UmsDepart>()
                        .eq(UmsDepart::getParentId, fatherId)));
    }

    @ApiOperation("查询部门二级")
    @GetMapping(value = "/query_father_children")
    public CommonResult search(@RequestParam Integer fatherId) {
        return CommonResult.success(departService
                .list(new LambdaQueryWrapper<UmsDepart>()
                        .eq(UmsDepart::getParentId, fatherId)));
    }
}

 ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java

@@ -237,4 +237,13 @@
        }
        return CommonResult.failed();
    }


    @ApiOperation("获取部门人员")
    @RequestMapping(value = "/getDepartUser/{departId}", method = RequestMethod.GET)
    @ResponseBody
    public CommonResult<List<UmsAdmin>> getDepartUser(@PathVariable Long departId) {
        return CommonResult.success(adminService.getDepartUser(departId));
    }

}

 ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java

@@ -108,4 +108,7 @@
     * @param status
     */
    boolean updateStatusBatch(List<Long> ids, Integer status);


    List<UmsAdmin> getDepartUser(Long departId);
}

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

@@ -13,12 +13,8 @@
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.user.*;
import com.ycl.exception.Asserts;
import com.ycl.mapper.user.UmsAdminLoginLogMapper;
import com.ycl.mapper.user.UmsAdminMapper;
import com.ycl.mapper.user.UmsResourceMapper;
import com.ycl.mapper.user.UmsRoleMapper;
import com.ycl.mapper.user.*;
import com.ycl.service.depart.UmsDepartService;
import com.ycl.service.user.UmsDepartManageService;
import com.ycl.service.redis.RedisService;
import com.ycl.service.user.UmsAdminCacheService;
import com.ycl.service.user.UmsAdminRoleRelationService;
@@ -53,6 +49,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

/**
 * 后台管理员管理Service实现类
@@ -76,9 +73,9 @@
    @Resource
    private UmsDepartService departService;
    @Resource
    private UmsDepartManageService umsAdminDepartService;
    @Resource
    private RedisService redisService;
    @Resource
    private UmsDepartManageMapper umsDepartManageMapper;

    @Override
    public UmsAdmin getAdminByUsername(String username) {
@@ -369,4 +366,16 @@
        getCacheService().delBatchAdmin(ids);
        return true;
    }

    @Override
    public List<UmsAdmin> getDepartUser(Long departId) {
        QueryWrapper<UmsDepartManage> wrapper = new QueryWrapper<>();
        wrapper.lambda().eq(UmsDepartManage::getDepartId, departId);
        List<UmsDepartManage>  list = umsDepartManageMapper.selectList(wrapper);
        List<Long> userIds  = list.stream().map(UmsDepartManage::getUserId).collect(Collectors.toList());
        QueryWrapper<UmsAdmin> wrapperUser = new QueryWrapper<>();
        wrapperUser.in("id", userIds);
        List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser);
        return adminList;
    }
}

 ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java

@@ -35,7 +35,7 @@

    @ApiOperation(value = "查询执法车")
    @GetMapping("/query_enforce")
    public CommonResult searchEnforceCar(@RequestParam String carNum,
    public CommonResult searchEnforceCar(@RequestParam(required = false) String carNum,
                                         @RequestParam Integer size,
                                         @RequestParam Integer current) {
        Page<CarEnforcecar> carEnforcecarPage = new Page<>();
@@ -48,7 +48,7 @@

    @ApiOperation(value = "查询渣土车")
    @GetMapping("/query_slag")
    public CommonResult searchSlagCar(@RequestParam String carNum,
    public CommonResult searchSlagCar(@RequestParam(required = false) String carNum,
                                      @RequestParam Integer size,
                                      @RequestParam Integer current) {
        Page<CarSlagcar> carSlagcarPage = new Page<>();

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

@@ -29,7 +29,7 @@
 */
@RestController
@RequestMapping("/dispatch_handle")
@Api(tags = "调度处理")
@Api(tags = "调度")
public class DispatchHandleController {



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

New file
@@ -0,0 +1,93 @@
package com.ycl.controller.message;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
import com.ycl.dto.message.MessageColumnParam;
import com.ycl.entity.message.MessageColumn;
import com.ycl.service.message.IMessageColumnService;
import io.swagger.annotations.Api;
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.*;

import java.util.List;

/**
 * <p>
 * 消息栏目管理  前端控制器
 * </p>
 *
 * @author mg
 * @since 2022-10-10
 */
@RestController
@RequestMapping("/message_column")
@Api(tags = "消息管理")
public class MessageColumnController {


    @Autowired
    private IMessageColumnService iMessageColumnService;


    @ApiOperation(value = "新增栏目")
    @RequestMapping(value = "/addColumn", method = RequestMethod.POST)
    @ResponseBody
    public CommonResult addColumn(@Validated @RequestBody MessageColumnParam messageColumnParam) {
        MessageColumn messageColumn = new MessageColumn();
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        //设置创建人
        messageColumnParam.setCreateUser(user.getUserId());
        BeanUtils.copyProperties(messageColumnParam, messageColumn);
        iMessageColumnService.save(messageColumn);
        return CommonResult.success(messageColumn);
    }

    @ApiOperation(value = "获取栏目分页查询")
    @RequestMapping(value = "/list", method = RequestMethod.POST)
    @ResponseBody
    public CommonResult<IPage<MessageColumn>> list(@Validated @RequestBody MessageColumnParam messageColumnParam) {
        return CommonResult.success(iMessageColumnService.list(messageColumnParam));
    }


    @ApiOperation("获取指定用户信息")
    @RequestMapping(value = "/getColumn/{id}", method = RequestMethod.GET)
    @ResponseBody
    public CommonResult<MessageColumn> getItem(@PathVariable Long id) {
        MessageColumn messageColumn = iMessageColumnService.getById(id);
        return CommonResult.success(messageColumn);
    }

    @ApiOperation("修改指定用户信息")
    @RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
    @ResponseBody
    public CommonResult update(@PathVariable Long id, @RequestBody MessageColumnParam messageColumnParam) {
        MessageColumn messageColumn = new MessageColumn();
        messageColumn.setId(id);
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        //设置创建人
        messageColumnParam.setCreateUser(user.getUserId());
        BeanUtils.copyProperties(messageColumnParam, messageColumn);
        boolean success = iMessageColumnService.updateById(messageColumn);
        if (success) {
            return CommonResult.success(null);
        }
        return CommonResult.failed();
    }

    @ApiOperation("批量删除消息栏目")
    @RequestMapping(value = "/delete", method = RequestMethod.POST)
    @ResponseBody
    public CommonResult delete(@RequestParam("ids") List<Long> ids) {
        boolean success = iMessageColumnService.removeBatchByIds(ids);
        if (success) {
            return CommonResult.success(null);
        }
        return CommonResult.failed();
    }
}

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

@@ -1,16 +1,21 @@
package com.ycl.controller.message;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
import com.ycl.service.message.IMessageService;
import io.swagger.annotations.Api;
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.*;

import java.util.List;

/**
 * <p>
@@ -26,7 +31,7 @@
public class MessageController {

    @Autowired
    IMessageService iMessageService;
    private IMessageService iMessageService;

    @ApiOperation(value = "发送消息")
    @RequestMapping(value = "/sendMessage", method = RequestMethod.POST)
@@ -37,4 +42,49 @@
        messageParam.setCreateUser(user.getUserId());
        return CommonResult.success(iMessageService.sendMessage(messageParam));
    }
    @ApiOperation(value = "获取消息分页查询")
    @RequestMapping(value = "/list", method = RequestMethod.POST)
    @ResponseBody
    public CommonResult<IPage<Message>> list(@Validated @RequestBody MessageParam messageParam) {
        return CommonResult.success(iMessageService.list(messageParam));
    }


    @ApiOperation("获取指定用户信息")
    @RequestMapping(value = "/getColumn/{id}", method = RequestMethod.GET)
    @ResponseBody
    public CommonResult<Message> getItem(@PathVariable Long id) {
        Message message = iMessageService.getById(id);
        return CommonResult.success(message);
    }

    @ApiOperation("修改指定消息")
    @RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
    @ResponseBody
    public CommonResult update(@PathVariable Long id, @RequestBody MessageParam messageParam) {
        Message message = new Message();
        message.setId(id);
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        //设置创建人
        message.setCreateUser(user.getUserId());
        BeanUtils.copyProperties(messageParam, message);
        boolean success = iMessageService.updateById(message);
        if (success) {
            return CommonResult.success(null);
        }
        return CommonResult.failed();
    }

    @ApiOperation("批量删除消息")
    @RequestMapping(value = "/delete", method = RequestMethod.POST)
    @ResponseBody
    public CommonResult delete(@RequestParam("ids") List<Long> ids) {
        boolean success = iMessageService.removeBatchByIds(ids);
        if (success) {
            return CommonResult.success(null);
        }
        return CommonResult.failed();
    }


}

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

@@ -84,7 +84,7 @@
    }

    @ApiOperation(value = "修改门店信息")
    @RequestMapping(value = "/update", method = RequestMethod.GET)
    @RequestMapping(value = "/update", method = RequestMethod.PUT)
    @ResponseBody
    public CommonResult update(@RequestBody StoreInfo storeInfo) {
        boolean success = storeInfoService.updateById(storeInfo);

 ycl-platform/src/main/java/com/ycl/dto/message/MessageColumnParam.java

New file
@@ -0,0 +1,49 @@
package com.ycl.dto.message;

import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;

/**
 * <p>
 *  消息栏目  实体类
 * </p>
 *
 * @author mg
 * @since 2022-10-10
 */
@Data
@ApiModel("消息栏目参数体")
public class MessageColumnParam {
    private static final long serialVersionUID = 1L;

    /**
     * 栏目名称
     */
    @ApiModelProperty(value = "栏目名称")
    @NotNull(message = "栏目名称为空")
    private String columnName;

    /**
     * 描述
     */
    @TableField("desc")
    @ApiModelProperty(value = "描述")
    private String desc;

    /**
     * 是否显示
     */
    @TableField("is_show")
    @ApiModelProperty(value = "是否显示")
    private String isShow;

    /**
     * 创建人
     */
    @ApiModelProperty(value = "创建人")
    private Long createUser;
}

 ycl-platform/src/main/java/com/ycl/entity/message/MessageColumn.java

New file
@@ -0,0 +1,100 @@
package com.ycl.entity.message;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;

/**
 * <p>
 *  消息栏目  实体类
 * </p>
 *
 * @author mg
 * @since 2022-10-10
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_message_column")
@ApiModel(value = "消息栏目表")
public class MessageColumn {
    private static final long serialVersionUID = 1L;
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    @ApiModelProperty(value = "主键")
    private Long id;

    /**
     * 栏目名称
     */
    @TableField("column_name")
    @ApiModelProperty(value = "栏目名称")
    @NotBlank(message = "栏目名称为空")
    private String columnName;


    /**
     * 栏目编码
     */
    @TableField("column_number")
    @ApiModelProperty(value = "栏目编码")
    @NotBlank(message = "渠道码为空")
    private String columnNumber;

    /**
     * 公告数
     */
    @TableField("notice_amount")
    @ApiModelProperty(value = "公告数")
    private Integer notice_amount;

    /**
     * 是否显示
     */
    @TableField("is_show")
    @ApiModelProperty(value = "是否显示")
    @NotNull(message = "是否显示为空")
    private String isShow;

    /**
     * 描述
     */
    @TableField("desc")
    @ApiModelProperty(value = "描述")
    private String desc;

    /**
     * 创建人
     */
    @TableField("create_user")
    @ApiModelProperty(value = "创建人")
    private Long createUser;
    /**
     * 创建时间
     */
    @TableField("create_time")
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**
     * 更新人
     */
    @TableField("update_user")
    @ApiModelProperty(value = "创建人")
    private Long updateUser;
    /**
     * 更新时间
     */
    @TableField("update_time")
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
}

 ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java

@@ -8,13 +8,12 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.*;


import java.io.Serializable;
import java.math.BigDecimal;

/**
 * <p>
 * 
 *
 * </p>
 *
 * @author lyq
@@ -44,6 +43,11 @@
    @TableField("store_name")
    private String storeName;


    @ApiModelProperty("门店编码")
    @TableField("store_number")
    private String storeNumber;

    @ApiModelProperty("联系方式")
    @TableField("contact")
    private String contact;
@@ -63,6 +67,4 @@
    @ApiModelProperty("门店积分")
    @TableField("store_score")
    private BigDecimal storeScore;


}

 ycl-platform/src/main/java/com/ycl/mapper/message/MessageColumnMapper.java

New file
@@ -0,0 +1,15 @@
package com.ycl.mapper.message;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.message.MessageColumn;

/**
 * <p>
 * 消息栏目 Mapper 接口
 * </p>
 *
 * @author mg
 * @since 2022-10-10
 */
public interface MessageColumnMapper extends BaseMapper<MessageColumn> {
}

 ycl-platform/src/main/java/com/ycl/service/message/IMessageColumnService.java

New file
@@ -0,0 +1,19 @@
package com.ycl.service.message;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.dto.message.MessageColumnParam;
import com.ycl.entity.message.MessageColumn;

/**
 * <p>
 * 消息栏目服务类
 * </p>
 *
 * @author mg
 * @since 2022-10-10
 */
public interface IMessageColumnService extends IService<MessageColumn> {

    IPage<MessageColumn> list(MessageColumnParam messageColumnParam);
}

 ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
@@ -15,4 +16,5 @@
public interface IMessageService extends IService<Message> {

    Message sendMessage(MessageParam messageParam);
    IPage<Message> list(MessageParam messageParam);
}

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

New file
@@ -0,0 +1,25 @@
package com.ycl.service.message.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.dto.message.MessageColumnParam;
import com.ycl.entity.message.MessageColumn;
import com.ycl.mapper.message.MessageColumnMapper;
import com.ycl.service.message.IMessageColumnService;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 消息栏目 服务实现类
 * </p>
 *
 * @author mg
 * @since 2022-10-10
 */
@Service
public class IMessageColumnServiceImpl extends ServiceImpl<MessageColumnMapper, MessageColumn> implements IMessageColumnService {
    @Override
    public IPage<MessageColumn> list(MessageColumnParam messageColumnParam) {
        return null;
    }
}

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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
@@ -14,7 +15,7 @@

/**
 * <p>
 * 服务实现类
 * 消息 服务实现类
 * </p>
 *
 * @author mg
@@ -47,4 +48,9 @@
        sender.sendMessage(messageParam);
        return message;
    }

    @Override
    public IPage<Message> list(MessageParam messageParam) {
        return null;
    }
}