mg
2022-10-13 d5e62ae5585f5d479921439e9f1af462a783f740
优化案件池流程。
10个文件已修改
6个文件已添加
3 文件已重命名
443 ■■■■■ 已修改文件
ycl-common/src/main/java/com/ycl/api/BasePageVO.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/task/TaskController.java 91 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/entity/task/Task.java 137 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/mapper/caseHandler/DispatchInfoMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/mapper/caseHandler/PartyInfoMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/mapper/task/TaskMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnSetServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/task/ITaskService.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/task/impl/TaskServiceImpl.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/resources/mapper/caseHandler/DispatchInfoMapper.xml 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/resources/mapper/caseHandler/PartyInfoMapper.xml 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/com/ycl/api/BasePageVO.java
@@ -1,5 +1,6 @@
package com.ycl.api;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,12 +15,13 @@
    @ApiModelProperty(value = "当前页",example = "1")
    @Min(value = 1, message = "最小页数1")
    @TableField(value = "current",exist = false)
    private int current = 1;
    @ApiModelProperty(value = "条数",example = "1")
    @Min(value = 1, message = "最小条数1")
    @Max(value = 100, message = "最大条数100")
    @TableField(value = "page_size",exist = false)
    private int pageSize = 20;
}
ycl-platform/src/main/java/com/ycl/controller/task/TaskController.java
New file
@@ -0,0 +1,91 @@
package com.ycl.controller.task;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
import com.ycl.common.util.UtilNumber;
import com.ycl.entity.task.Task;
import com.ycl.service.task.ITaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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.Date;
import java.util.List;
/**
 * <p>
 *  任务管理  前端控制器
 * </p>
 *
 * @author mg
 * @since 2022-10-13
 */
@RestController
@RequestMapping("/task")
@Api(tags = "任务管理")
public class TaskController {
    @Autowired
    private ITaskService iTaskService;
    @ApiOperation(value = "新增任务")
    @RequestMapping(value = "/addTask", method = RequestMethod.POST)
    @ResponseBody
    public CommonResult addColumn(@Validated @RequestBody Task task) {
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        //设置创建人
        task.setNumber(UtilNumber.getNumber("RW",0));
        task.setCreateUser(user.getUserId());
        task.setCreateTime(new Date());
        task.setUpdateUser(user.getUserId());
        task.setUpdateTime(new Date());
        iTaskService.save(task);
        return CommonResult.success(task);
    }
    @ApiOperation(value = "获取任务分页查询")
    @RequestMapping(value = "/list", method = RequestMethod.POST)
    @ResponseBody
    public CommonResult<IPage<Task>> list(@Validated @RequestBody Task task) {
        return CommonResult.success(iTaskService.list(task));
    }
    @ApiOperation("获取指定任务")
    @RequestMapping(value = "/getTask/{id}", method = RequestMethod.GET)
    @ResponseBody
    public CommonResult<Task> getTask(@PathVariable Long id) {
        Task task = iTaskService.getById(id);
        return CommonResult.success(task);
    }
    @ApiOperation("修改指定任务")
    @RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
    @ResponseBody
    public CommonResult update(@PathVariable Long id, @RequestBody Task task) {
        task.setId(id);
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        //设置创建人
        task.setCreateUser(user.getUserId());
        boolean success = iTaskService.updateById(task);
        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 = iTaskService.removeBatchByIds(ids);
        if (success) {
            return CommonResult.success(null);
        }
        return CommonResult.failed();
    }
}
ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
@@ -204,6 +204,13 @@
    @ApiModelProperty(value = "违建事件")
    private IllegalBuilding illegalBuilding;
    /**
     *  调度信息
     */
    @TableField(value = "dispatchInfo",exist = false)
    @ApiModelProperty(value = "调度信息")
    private DispatchInfo dispatchInfo;
}
ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
@@ -34,13 +34,12 @@
    @TableId(value = "id", type = IdType.AUTO)
    @ApiModelProperty(value = "id")
    private Integer id;
    /**
     * 处置流程记录Id
     * 案件id(同ums_base_case表id)
     */
    @TableField("dispose_record_id")
    @ApiModelProperty(value = "处置流程记录Id")
    private Integer disposeRecordId;
    @TableField("base_case_id")
    @ApiModelProperty(value = "案件id(同ums_base_case表id)")
    private Long baseCaseId;
    /**
     * 执法人员
     */
@@ -58,7 +57,7 @@
     */
    @TableField("enforcement_car")
    @ApiModelProperty(value = "执法车")
    private Integer enforcementCar;
    private Long enforcementCar;
    /**
     * 执法队伍
     */
@@ -102,4 +101,17 @@
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**
     * 派遣人姓名
     */
    @ApiModelProperty(value = "派遣人姓名")
    @TableField(value = "create_user_text",exist = false)
    private String createUserText;
    /**
     * 执法车-车牌号
     */
    @TableField(value = "enforcement_car_text",exist = false)
    @ApiModelProperty(value = "法车-车牌号")
    private String enforcementCarText;
}
ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java
@@ -110,5 +110,12 @@
    @ApiModelProperty(value = "创建时间")
    private LocalDateTime createTime;
    /**
     *  当事人信息
     */
    @TableField(value = "partyInfo",exist = false)
    @ApiModelProperty(value = "当事人信息")
    private PartyInfo partyInfo;
}
ycl-platform/src/main/java/com/ycl/entity/caseHandler/PartyInfo.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -105,6 +106,23 @@
     */
    @TableField("create_time")
    private LocalDateTime createTime;
    /**
     * 证件类型文本
     */
    @TableField(value = "certificate_type_text",exist = false)
    @ApiModelProperty(value = "证件类型文本")
    private String certificateTypeText;
    /**
     * 文化程度文本
     */
    @TableField(value = "education_degree_text",exist = false)
    @ApiModelProperty(value = "文化程度文本")
    private String educationDegreeText;
    /**
     * 民族文本
     */
    @ApiModelProperty(value = "民族文本")
    @TableField(value = "nation_text",exist = false)
    private String nationText;
}
ycl-platform/src/main/java/com/ycl/entity/task/Task.java
New file
@@ -0,0 +1,137 @@
package com.ycl.entity.task;
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 com.ycl.api.BasePageVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
/**
 * <p>
 *   任务实体类
 * </p>
 *
 * @author mg
 * @since 2022-10-13
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_task")
@ApiModel(value = "任务表")
public class Task extends BasePageVO implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    @ApiModelProperty(value = "主键")
    private Long id;
    /**
     * 标题
     */
    @TableField("title")
    @ApiModelProperty(value = "标题")
    @NotBlank(message = "标题为空")
    private String title;
    /**
     *  任务编码
     */
    @TableField("number")
    @ApiModelProperty(value = "任务编码")
    private String number;
    /**
     * 类型
     */
    @TableField("type")
    @ApiModelProperty(value = "类型")
    private Integer type;
    /**
     * 级别
     */
    @TableField("level")
    @ApiModelProperty(value = "级别")
    private Integer level;
    /**
     * 街道
     */
    @TableField("street_id")
    @ApiModelProperty(value = "街道")
    private Integer streetId;
    /**
     * 社区
     */
    @TableField("community_id")
    @ApiModelProperty(value = "社区")
    private Integer communityId;
    /**
     * 开始时间
     */
    @TableField("start_time")
    @ApiModelProperty(value = "开始时间")
    private Date startTime;
    /**
     * 结束时间
     */
    @TableField("end_time")
    @ApiModelProperty(value = "结束时间")
    private Date endTime;
    /**
     *  任务描述
     */
    @TableField("description")
    @ApiModelProperty(value = "任务描述")
    private String description;
    /**
     * 状态0-未发布1-已发布
     */
    @TableField("status")
    @ApiModelProperty(value = "状态0-未发布1-已发布")
    private Integer status;
    /**
     * 创建人
     */
    @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/mapper/caseHandler/DispatchInfoMapper.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.caseHandler.DispatchInfo;
import java.util.Map;
/**
 * <p>
 *  调度信息 Mapper 接口
@@ -12,4 +14,5 @@
 * @since 2022-09-28
 */
public interface DispatchInfoMapper extends BaseMapper<DispatchInfo> {
    DispatchInfo selectCondMap(Map map);
}
ycl-platform/src/main/java/com/ycl/mapper/caseHandler/PartyInfoMapper.java
@@ -1,7 +1,9 @@
package com.ycl.mapper.caseHandler;
import com.ycl.entity.caseHandler.PartyInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.caseHandler.PartyInfo;
import java.util.Map;
/**
 * <p>
@@ -12,5 +14,5 @@
 * @since 2022-09-24
 */
public interface PartyInfoMapper extends BaseMapper<PartyInfo> {
    PartyInfo selectCondMap(Map map);
}
ycl-platform/src/main/java/com/ycl/mapper/task/TaskMapper.java
New file
@@ -0,0 +1,16 @@
package com.ycl.mapper.task;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.task.Task;
/**
 * <p>
 *  任务管理表 Mapper 接口
 * </p>
 *
 * @author mg
 * @since 2022-10-13
 */
public interface TaskMapper extends BaseMapper<Task> {
}
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -96,6 +96,10 @@
    WorkflowConfigMapper workflowConfigMapper;
    @Resource
    ImageResourcesMapper imageResourcesMapper;
    @Resource
    DispatchInfoMapper dispatchInfoMapper;
    @Resource
    PartyInfoMapper partyInfoMapper;
    @Override
@@ -251,6 +255,11 @@
            IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId());
            baseCase.setIllegalBuilding(illegalBuilding);
        }
        //获取调度信息
        Map mapD = new HashMap();
        mapD.put("baseCaseId",baseCase.getId());
        DispatchInfo dispatchInfo = dispatchInfoMapper.selectCondMap(mapD);
        baseCase.setDispatchInfo(dispatchInfo);
        bcd.setBaseCase(baseCase);
        //案件相关信息
        //2.查询办理经过信息
@@ -318,6 +327,12 @@
        QueryWrapper<Investigation> wrapperI = new QueryWrapper<>();
        wrapperI.lambda().eq(Investigation::getBaseCaseId, baseCase.getId());
        Investigation investigation = investigationMapper.selectOne(wrapperI);
        //获取当事人信息
        Map mapP = new HashMap();
        mapP.put("id", investigation.getPartyId());
        PartyInfo partyInfo = partyInfoMapper.selectCondMap(mapP);
        //填充当事人
        investigation.setPartyInfo(partyInfo);
        currentSitVo.setInvestigation(investigation);
        //设置告知违法
        QueryWrapper<Writ> wrapperW = new QueryWrapper<>();
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java
File was renamed from ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageColumnServiceImpl.java
@@ -19,7 +19,7 @@
 * @since 2022-10-10
 */
@Service
public class IMessageColumnServiceImpl extends ServiceImpl<MessageColumnMapper, MessageColumn> implements IMessageColumnService {
public class MessageColumnServiceImpl extends ServiceImpl<MessageColumnMapper, MessageColumn> implements IMessageColumnService {
    @Override
    public IPage<MessageColumn> list(MessageColumnParam messageColumnParam) {
        Page<MessageColumn> page = new Page<>(messageColumnParam.getCurrent(), messageColumnParam.getPageSize());
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnSetServiceImpl.java
File was renamed from ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageColumnSetServiceImpl.java
@@ -15,6 +15,6 @@
 * @since 2022-10-10
 */
@Service
public class IMessageColumnSetServiceImpl extends ServiceImpl<MessageColumnSetMapper, MessageColumnSet> implements IMessageColumnSetService {
public class MessageColumnSetServiceImpl extends ServiceImpl<MessageColumnSetMapper, MessageColumnSet> implements IMessageColumnSetService {
}
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
File was renamed from ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java
@@ -27,7 +27,7 @@
 * @since 2022-10-08
 */
@Service
public class IMessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements IMessageService {
public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements IMessageService {
    @Autowired
    private UmsAdminService adminService;
ycl-platform/src/main/java/com/ycl/service/task/ITaskService.java
New file
@@ -0,0 +1,17 @@
package com.ycl.service.task;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.task.Task;
/**
 * <p>
 *  任务管理服务类
 * </p>
 *
 * @author mg
 * @since 2022-10-13
 */
public interface ITaskService extends IService<Task> {
    IPage<Task> list(Task task);
}
ycl-platform/src/main/java/com/ycl/service/task/impl/TaskServiceImpl.java
New file
@@ -0,0 +1,29 @@
package com.ycl.service.task.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.task.Task;
import com.ycl.mapper.task.TaskMapper;
import com.ycl.service.task.ITaskService;
import org.springframework.stereotype.Service;
/**
 * <p>
 *  任务管理 服务实现类
 * </p>
 *
 * @author mg
 * @since 2022-10-13
 */
@Service
public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements ITaskService {
    @Override
    public IPage<Task> list(Task task) {
        Page<Task> page = new Page<>(task.getCurrent(), task.getPageSize());
        LambdaQueryWrapper<Task> queryWrapper = new LambdaQueryWrapper<>();
        Page<Task> result = baseMapper.selectPage(page, queryWrapper);
        return result;
    }
}
ycl-platform/src/main/resources/mapper/caseHandler/DispatchInfoMapper.xml
New file
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.mapper.caseHandler.DispatchInfoMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.caseHandler.DispatchInfo">
        <id column="id" property="id"/>
        <result column="base_case_id" property="baseCaseId"/>
        <result column="law_enforcer" property="lawEnforcer"/>
        <result column="law_enforcer_name" property="lawEnforcerName"/>
        <result column="enforcement_car" property="enforcementCar"/>
        <result column="enforcement_team" property="enforcementTeam"/>
        <result column="contact_way" property="contactWay"/>
        <result column="distance" property="distance"/>
        <result column="dispose_date" property="disposeDate"/>
        <result column="dispatch_opinion" property="dispatchOpinion"/>
        <result column="create_user" property="createUser"/>
        <result column="create_time" property="createTime"/>
    </resultMap>
    <resultMap type="com.ycl.entity.caseHandler.DispatchInfo" id="CondMapResultMap" extends="BaseResultMap">
            <result column="create_user_text" property="createUserText" />
            <result column="enforcement_car_text" property="enforcementCarText" />
    </resultMap>
    <select id="selectCondMap" parameterType="map" resultMap="CondMapResultMap">
        SELECT
            udi.*,
            ua.username create_user_text,
            uce.car_number enforcement_car_text
        FROM
            ums_dispatch_info udi
                LEFT JOIN ums_admin ua on udi.create_user = ua.id
                LEFT JOIN ums_car_enforcecar uce on udi.enforcement_car = uce.id
        WHERE
            udi.`base_case_id` = #{baseCaseId}
    </select>
</mapper>
ycl-platform/src/main/resources/mapper/caseHandler/PartyInfoMapper.xml
@@ -19,10 +19,30 @@
        <result column="create_user" property="createUser" />
        <result column="create_time" property="createTime" />
    </resultMap>
    <resultMap type="com.ycl.entity.caseHandler.PartyInfo" id="CondMapResultMap" extends="BaseResultMap">
        <result column="certificate_type_text" property="certificateTypeText" />
        <result column="education_degree_text" property="educationDegreeText" />
        <result column="nation_text" property="nationText" />
    </resultMap>
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, name, phone_code, certificate_type, certificate_code, education_degree, career, work, nation, native_place, live_address, register_address, create_user, create_time
    </sql>
    <select id="selectCondMap" parameterType="map" resultMap="CondMapResultMap">
        SELECT
            upi.*,
            udd.name certificate_type_text,
            udd2.name education_degree_text,
            udd3.name nation_text
        FROM
            ums_party_info upi
                LEFT JOIN ums_data_dictionary udd on upi.certificate_type = udd.id and udd.type_code = '03'
                LEFT JOIN ums_data_dictionary udd2 on upi.education_degree = udd2.id and udd2.type_code = '04'
                LEFT JOIN ums_data_dictionary udd3 on upi.nation = udd3.id and udd3.type_code = '05'
        WHERE
            upi.`id` = #{id}
    </select>
</mapper>
ycl-platform/src/main/resources/mapper/caseHandler/ViolationsMapper.xml
@@ -35,8 +35,8 @@
        FROM
            ums_violations uv
                LEFT JOIN ums_data_dictionary udd on uv.category_id = udd.id and udd.type_code = '01'
                LEFT JOIN ums_data_dictionary udd2 on uv.type_id = udd2.id and udd.type_code = '01'
                LEFT JOIN ums_data_dictionary udd3 on uv.grade_id = udd3.id and udd.type_code = '01'
                LEFT JOIN ums_data_dictionary udd2 on uv.type_id = udd2.id and udd2.type_code = '01'
                LEFT JOIN ums_data_dictionary udd3 on uv.grade_id = udd3.id and udd3.type_code = '02'
        WHERE
            uv.`id` =  #{id}
    </select>