wl
2022-10-31 f12cbc3122950bcff273a9697e5159c0387520e5
案卷详情和 队伍建设
6个文件已修改
6个文件已添加
310 ■■■■■ 已修改文件
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-generator/src/main/java/com/ycl/controller/cockpitManage/TeamConstructionController.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-generator/src/main/resources/mapper/cockpitManage/TeamConstructionMapper.xml 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java 146 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/mapper/cockpitManage/TeamConstructionMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/cockpitManage/ITeamConstructionService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/cockpitManage/impl/TeamConstructionServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -182,7 +182,7 @@
            token = jwtTokenUtil.generateToken(userDetails.getUserId(), userDetails.getUsername());
            redisService.set(RedisKey.PLATFORM_TOKEN_KEY.concat(username), token, LiveTimeMillisecond.s7200.time);
//            updateLoginTimeByUsername(username);
            insertLoginLog(username);
            //insertLoginLog(username);
        } catch (AuthenticationException e) {
            LOGGER.warn("登录异常:{}", e.getMessage());
        }
ycl-generator/src/main/java/com/ycl/controller/cockpitManage/TeamConstructionController.java
New file
@@ -0,0 +1,21 @@
package com.ycl.controller.cockpitManage;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ycl.base.BaseController;
/**
 * <p>
 * 队伍建设表 前端控制器
 * </p>
 *
 * @author zhanghua
 * @since 2022-10-31
 */
@RestController
@RequestMapping("/team-construction")
public class TeamConstructionController extends BaseController {
}
ycl-generator/src/main/resources/mapper/cockpitManage/TeamConstructionMapper.xml
New file
@@ -0,0 +1,30 @@
<?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.cockpitManage.TeamConstructionMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.cockpitManage.TeamConstruction">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="people_number" property="peopleNumber" />
        <result column="up_undergraduate_people_number" property="upUndergraduatePeopleNumber" />
        <result column="under_forty_five_people_number" property="underFortyFivePeopleNumber" />
        <result column="legal_professional_qualification_certificate_people_number" property="legalProfessionalQualificationCertificatePeopleNumber" />
        <result column="report_number" property="reportNumber" />
        <result column="disciplinary_offence_number" property="disciplinaryOffenceNumber" />
        <result column="criminal_offense_number" property="criminalOffenseNumber" />
        <result column="month_case_number" property="monthCaseNumber" />
        <result column="no_timeout_case_number" property="noTimeoutCaseNumber" />
        <result column="review_or_lawsuit_number" property="reviewOrLawsuitNumber" />
        <result column="status" property="status" />
        <result column="is_delete" property="isDelete" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
    </resultMap>
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, name, people_number, up_undergraduate_people_number, under_forty_five_people_number, legal_professional_qualification_certificate_people_number, report_number, disciplinary_offence_number, criminal_offense_number, month_case_number, no_timeout_case_number, review_or_lawsuit_number, status, is_delete, create_time, update_time
    </sql>
</mapper>
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -1,9 +1,8 @@
package com.ycl.controller.caseHandler;
import com.alibaba.druid.util.StringUtils;
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;
@@ -181,6 +180,7 @@
        baseCase.setCode(utilNumber.createCaseCode());
        baseCase.setState(BaseCaseStatus.PENDING);
        baseCase.setAlarmTime(LocalDateTime.parse(violationParam.getAlarmTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
        baseCase.setCreateTime(LocalDateTime.now());
        baseCaseService.save(baseCase);
        return CommonResult.success(baseCaseService.saveViolationCase(violationParam, baseCase.getId()));
    }
@@ -203,6 +203,7 @@
        baseCase.setCode(utilNumber.createCaseCode());
        baseCase.setState(BaseCaseStatus.PENDING);
        baseCase.setAlarmTime(LocalDateTime.parse(illegalBuildingParam.getAlarmTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
        baseCase.setCreateTime(LocalDateTime.now());
        baseCaseService.save(baseCase);
        return CommonResult.success(baseCaseService.saveIllegalBuildingCase(illegalBuildingParam, baseCase.getId()));
    }
@@ -269,5 +270,16 @@
        return CommonResult.success("end case success~!");
    }
    @ApiOperation(value = "查询案卷")
    @GetMapping("/query_case")
    public CommonResult queryCase(@RequestParam Integer pageSize,
                                  @RequestParam Integer current,
                                  @RequestParam(required = false) String number,
                                  @RequestParam(required = false) Integer communityId,
                                  @RequestParam(required = false) Integer categories,
                                  @RequestParam(required = false) String startTime,
                                  @RequestParam(required = false) String endTime,
                                  @RequestParam(required = false) String site) {
        return CommonResult.success(baseCaseService.selectPage(new Page<BaseCase>().setCurrent(current).setSize(pageSize), number, communityId, categories, startTime, endTime, site));
    }
}
ycl-platform/src/main/java/com/ycl/controller/cockpit/teamConstruction/TeamConstructionController.java
New file
@@ -0,0 +1,146 @@
package com.ycl.controller.cockpit.teamConstruction;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.read.listener.ReadListener;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.controller.BaseController;
import com.ycl.entity.cockpitManage.TeamConstruction;
import com.ycl.service.cockpitManage.ITeamConstructionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
/**
 * <p>
 * 队伍建设表 前端控制器
 * </p>
 *
 * @author zhanghua
 * @since 2022-10-31
 */
@RestController
@RequestMapping("/team_construction")
@Api(tags = "队伍建设")
public class TeamConstructionController extends BaseController {
    @Autowired
    ITeamConstructionService iTeamConstructionService;
    @GetMapping("/query")
    @ApiOperation("查询")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "size", required = true, value = "页面数量"),
            @ApiImplicitParam(name = "current", required = true, value = "页码"),
            @ApiImplicitParam(name = "departName", value = "部门名称"),
            @ApiImplicitParam(name = "status", value = "状态")}
    )
    public CommonResult search(@RequestParam(name = "size") Integer size,
                               @RequestParam(name = "current") Integer current,
                               @RequestParam(name = "departName", required = false) String departName,
                               @RequestParam(name = "status", required = false) Integer status) {
        Integer isDelete = 0;
        return CommonResult.success(iTeamConstructionService
                .page(new Page<TeamConstruction>().setSize(size).setCurrent(current), new LambdaQueryWrapper<TeamConstruction>()
                        .like(StringUtils.isNotBlank(departName), TeamConstruction::getName, departName)
                        .eq( status != null, TeamConstruction::getStatus, status)
                        .eq(TeamConstruction::getIsDelete, isDelete)));
    }
    @PostMapping("/addition")
    @ApiOperation("添加")
    @LogSave(operationType = "队伍建设管理",contain = "添加")
    public CommonResult add(@RequestBody TeamConstruction teamConstruction) {
        return CommonResult.success(iTeamConstructionService.save(teamConstruction));
    }
    @PutMapping("/modification")
    @ApiOperation("修改")
    @LogSave(operationType = "队伍建设管理",contain = "修改")
    public CommonResult modify(@RequestBody TeamConstruction teamConstruction) {
        return CommonResult.success(iTeamConstructionService.updateById(teamConstruction));
    }
    @DeleteMapping("/deletion")
    @ApiOperation("删除")
    @LogSave(operationType = "队伍建设管理",contain = "删除")
    public CommonResult delete(@RequestParam Long id) {
        Integer isDelete = 1;
        TeamConstruction teamConstruction = new TeamConstruction();
        teamConstruction.setIsDelete(isDelete);
        teamConstruction.setId(id);
        return CommonResult.success(iTeamConstructionService.updateById(teamConstruction));
    }
    @PostMapping("/export")
    @ApiOperation("导出")
    @LogSave(operationType = "队伍建设管理",contain = "导出")
    @ApiImplicitParams(
            {
                    @ApiImplicitParam(name = "size", required = true, value = "页面数量"),
                    @ApiImplicitParam(name = "current", required = true, value = "页码"),
                    @ApiImplicitParam(name = "departName", value = "部门名称"),
                    @ApiImplicitParam(name = "status", value = "状态")}
    )
    @SneakyThrows
    public void export(@RequestParam() Integer size,
                       @RequestParam() Integer current,
                       @RequestParam(name = "departName", required = false) String departName,
                       @RequestParam(name = "status", required = false) Integer status,
                       HttpServletResponse response) {
        Integer isDelete = 0;
        response.setContentType("application/vnd.ms-excel");
        response.setCharacterEncoding("utf-8");
        response.setHeader("Content-disposition", "attachment;filename=" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + ".xlsx");
        EasyExcel
                .write(response.getOutputStream(), TeamConstruction.class)
                .sheet("数据")
                .doWrite(iTeamConstructionService
                        .page(new Page<TeamConstruction>().setSize(size).setCurrent(current), new LambdaQueryWrapper<TeamConstruction>()
                                .like(StringUtils.isNotBlank(departName), TeamConstruction::getName, departName)
                                .eq(status != null, TeamConstruction::getStatus, status)
                                .eq(TeamConstruction::getIsDelete, isDelete))
                        .getRecords());
    }
    @PostMapping("/import")
    @ApiOperation("导入")
    @SneakyThrows
    @LogSave(operationType = "队伍建设管理",contain = "导入")
    public CommonResult export(MultipartFile multipartFile) {
        EasyExcel.read(multipartFile.getInputStream(), TeamConstruction.class, new ReadListener() {
            @Override
            public void invoke(Object o, AnalysisContext analysisContext) {
                if (o != null) {
                    TeamConstruction teamConstruction = new TeamConstruction();
                    BeanUtils.copyProperties(o, teamConstruction);
                    teamConstruction.setCreateTime(LocalDateTime.now());
                    iTeamConstructionService.save(teamConstruction);
                }
            }
            @Override
            public void doAfterAllAnalysed(AnalysisContext analysisContext) {
            }
        }).doReadAll();
        return CommonResult.success("import ok");
    }
}
ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
@@ -7,7 +7,9 @@
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.vo.casePool.CasePoolIllegalBuildingVO;
import com.ycl.vo.casePool.CasePoolViolationVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
@@ -24,4 +26,6 @@
    Page<CasePoolIllegalBuildingVO> listIllegalBuildingsPage(Page page, Integer state, Integer type, Integer resource);
    BaseCase selectCondMap(Map map);
    List<BaseCase> selectBaseCasePage(Page<BaseCase> page, @Param("code") String number,@Param("communityId") Integer communityId, @Param("categories") Integer categories, @Param("startTime") String startTime,@Param("endTime") String endTime,@Param("site") String site);
}
ycl-platform/src/main/java/com/ycl/mapper/cockpitManage/TeamConstructionMapper.java
New file
@@ -0,0 +1,16 @@
package com.ycl.mapper.cockpitManage;
import com.ycl.entity.cockpitManage.TeamConstruction;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
 * <p>
 * 队伍建设表 Mapper 接口
 * </p>
 *
 * @author zhanghua
 * @since 2022-10-31
 */
public interface TeamConstructionMapper extends BaseMapper<TeamConstruction> {
}
ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
@@ -8,6 +8,7 @@
import com.ycl.entity.caseHandler.BaseCaseDetail;
import java.util.ArrayList;
import java.util.List;
/**
 * <p>
@@ -50,4 +51,6 @@
    ArrayList<String> listCaseImages(Integer id, Integer type);
    void endCase(Long caseId, String result,String opinion);
    List<BaseCase> selectPage(Page<BaseCase> setSize, String number, Integer communityId, Integer categories, String startTime, String endTime, String site);
}
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -374,4 +374,9 @@
        disposeRecord.setHandlerId(user.getUserId());
        disposeRecordMapper.update(disposeRecord, updateWrapper);
    }
    @Override
    public List<BaseCase> selectPage(Page<BaseCase> page, String number, Integer communityId, Integer categories, String startTime, String endTime, String site) {
        return baseCaseMapper.selectBaseCasePage(page,number,communityId,categories,startTime,endTime,site);
    }
}
ycl-platform/src/main/java/com/ycl/service/cockpitManage/ITeamConstructionService.java
New file
@@ -0,0 +1,16 @@
package com.ycl.service.cockpitManage;
import com.ycl.entity.cockpitManage.TeamConstruction;
import com.baomidou.mybatisplus.extension.service.IService;
/**
 * <p>
 * 队伍建设表 服务类
 * </p>
 *
 * @author zhanghua
 * @since 2022-10-31
 */
public interface ITeamConstructionService extends IService<TeamConstruction> {
}
ycl-platform/src/main/java/com/ycl/service/cockpitManage/impl/TeamConstructionServiceImpl.java
New file
@@ -0,0 +1,20 @@
package com.ycl.service.cockpitManage.impl;
import com.ycl.entity.cockpitManage.TeamConstruction;
import com.ycl.mapper.cockpitManage.TeamConstructionMapper;
import com.ycl.service.cockpitManage.ITeamConstructionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
 * <p>
 * 队伍建设表 服务实现类
 * </p>
 *
 * @author zhanghua
 * @since 2022-10-31
 */
@Service
public class TeamConstructionServiceImpl extends ServiceImpl<TeamConstructionMapper, TeamConstruction> implements ITeamConstructionService {
}
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -83,7 +83,7 @@
        ubc.event_source,
        t1.name as category,
        ubc.site,
        t2.region_name  as community,
        t2.region_name as community,
        uib.building_high,
        uib.building_width,
        uib.building_length,
@@ -123,4 +123,29 @@
        WHERE ubc.`code` = #{code}
    </select>
</mapper>
    <select id="selectBaseCasePage" resultType="com.ycl.entity.caseHandler.BaseCase">
        select t1.*,
        t2.name category_text,
        t3.region_name community_text
        from ums_base_case t1
        left join ums_data_dictionary t2 on t1.category = t2.id
        left join ums_sccg_region t3 on t1.community_id=t3.id
        <where>
            <if test="category != null">
                category = #{categories}
            </if>>
            <if test="community_id != null">
                and community_id = #{communityId}
            </if>
            <if test="code != null and code !=''">
                and code like contact('%',#{code},'%')
            </if>
            <if test="site != null and site!=''">
                and site like contact('%',#{site},'%')
            </if>
            <if test="startTime !='' and endTime !=''">
                and create_time between #{startTime} and #{endTime}
            </if>
        </where>
    </select>
</mapper>