农三轮预警信息模块开发

master
Zangzhipeng 1 year ago
parent 45a91d0af6
commit 4283337724
  1. 2
      hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/GovernmentController.java
  2. 8
      hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java
  3. 147
      hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/TricycleController.java
  4. 2
      hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ConfigMapper.java
  5. 2
      hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ThtTricycleInfoBaseMapper.java
  6. 22
      hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/ThtTricycleWarningBaseMapper.java
  7. 11
      hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/TricycleService.java
  8. 37
      hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/service/impl/TricycleServiceImpl.java
  9. 10
      hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ConfigMapper.xml
  10. 17
      hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml
  11. 59
      hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ThtTricycleInfoBaseMapper.xml
  12. 64
      hiatmp-hidden-danger-server/src/main/resources/sql-mapper/ThtTricycleWarningBaseMapper.xml
  13. 2
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/ThtSectionInfoDTO.java
  14. 1
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/BasicInfoVO.java
  15. 6
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/TricycleListVO.java
  16. 33
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/TricycleWarningDetailVO.java
  17. 5
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/TricycleWarningListVO.java
  18. 31
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/VO/TricycleWarningResultsVO.java
  19. 10
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/enum/HiddenDangerStatus
  20. 21
      hiatmp-model/src/main/java/com/hisense/hiatmp/model/common/enums/HandleEnum.java

@ -174,8 +174,6 @@ public class GovernmentController {
return ServerResponse.ok("治理提交成功");
}
@GetMapping("/getAttachsByGov")
public ServerResponse<?> getAttachsByGov(@RequestParam String businessId) {

@ -935,6 +935,13 @@ public class HighDangerController {
// } else {
// if(!sectionInfo.isEmpty()){
for (int i = 0; i < sectionInfo.size(); i++) {
if(Objects.equals(sectionInfo.get(i).getIfCross(), "2")){
SectionDTO sectionByCode = highDangerMapper.getSectionByCode(sectionInfo.get(i).getSectionCode());
sectionInfo.get(i).setSectionName(sectionByCode.getSectionName());
}
if(Objects.equals(sectionInfo.get(i).getIfCross(), "1")){
sectionInfo.get(i).setSectionCode(sectionInfo.get(i).getRoadCode());
}
// 是否该排查有绑定的辖区街道信息,有则展示
List<StreetCommunity> communityByRoad = highDangerMapper.getCommunityByRoad(businessId);
if (communityByRoad != null && !communityByRoad.isEmpty()) {
@ -1178,6 +1185,7 @@ public class HighDangerController {
} else {
// 保存基础数据(步骤1)
for (BasicInfoVO basicInfoVO : manualInvestigation.getBasicInfo()) {
basicInfoVO.setIfCross(manualInvestigation.getIfCross());
// 路口类型,将路口code存入 bis_section_info 表中
if(manualInvestigation.getIfCross() != null && manualInvestigation.getIfCross().equals("1")){
basicInfoVO.setRoadCode(manualInvestigation.getSectionCode());

@ -7,9 +7,14 @@ import com.hisense.hiatmp.model.common.HighDangerBase;
import com.hisense.hiatmp.model.common.Operator;
import com.hisense.hiatmp.model.common.ServerResponse;
import com.hisense.hiatmp.model.common.VO.TricycleListVO;
import com.hisense.hiatmp.model.common.VO.TricycleWarningDetailVO;
import com.hisense.hiatmp.model.common.VO.TricycleWarningListVO;
import com.hisense.hiatmp.model.common.VO.TricycleWarningResultsVO;
import com.hisense.hiatmp.model.common.enums.HandleEnum;
import com.hisense.hiatmp.model.common.enums.RoleEnum;
import com.hisense.hiatmp.model.dmr.EnumType;
import com.hisense.hiatmp.server_api.mapper.ConfigMapper;
import com.hisense.hiatmp.server_api.model.StreetCommunity;
import com.hisense.hiatmp.server_api.service.OperatorService;
import com.hisense.hiatmp.server_api.service.TricycleService;
import io.swagger.annotations.ApiOperation;
@ -18,8 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.format.DateTimeFormatter;
import java.util.*;
/*
* @ClassName TricycleController
@ -40,7 +47,10 @@ public class TricycleController {
@Autowired
private OperatorService operatorService;
@Autowired
private ConfigMapper configMapper;
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@GetMapping("getTricycleList")
@ApiOperation("获取信息登记列表")
@ -71,7 +81,15 @@ public class TricycleController {
} else {
return ServerResponse.error("当前用户无权限");
}
if (Objects.equals(operatorById.getNlevel(), "2")) {
roleFlag = 3;
// 取部门的前六位
// cdepartmentid = cdepartmentid.substring(0, Math.min(cdepartmentid.length(), 6));
}
// PageHelper.startPage(pageNum, pageSize);
log.info("/getTricycleList(【三轮车】获取信息登记列表))mapper入参:{},{},{},{}", roleFlag,cdepartmentid,status,search);
List<TricycleListVO> tricycleList = tricycleService.getTricycleList(roleFlag,cdepartmentid,status,search);
// PageInfo<TricycleListVO> pageInfo = new PageInfo<>(tricycleList);
log.info("/getTricycleList(【三轮车】获取信息登记列表))接口数据返回,调用ip: {}, 出参:{}", request.getRemoteAddr(), tricycleList);
@ -90,7 +108,7 @@ public class TricycleController {
int affect = tricycleService.saveTricycleInfo(tricycleInfo);
if(affect > 0 ){
log.info("/saveTricycleInfo(【三轮车】保存登记数据))接口数据返回,调用ip: {}, 出参:{}", request.getRemoteAddr(), tricycleInfo);
return ServerResponse.ok("登记信息数据提交成功");
return ServerResponse.ok("登记信息数据提交成功",tricycleInfo);
}else{
return ServerResponse.error("新增/保存数据失败");
}
@ -139,18 +157,19 @@ public class TricycleController {
* 获取预警处理列表
* @param request
* @param nuserId
* @param distributionStatus
* @param completeStatus
* @return
*/
@GetMapping("/getTricycleWarningList")
@ApiOperation(value = "获取预警处理列表")
public ServerResponse<?> getTricycleWarningList(HttpServletRequest request,
@RequestParam String nuserId,
@RequestParam String distributionStatus, // 分配状态
@RequestParam String completeStatus // 完成状态
@RequestParam(defaultValue = "1") Integer pageNum,
@RequestParam(defaultValue = "10") Integer pageSize,
// @RequestParam String distributionStatus, // 分配状态
@RequestParam String status, // 数据状态 0 待处理 1 已分配 2 已完成
@RequestParam(defaultValue = "") String search // 模糊查询
){
log.info("/getTricycleWarningList(【三轮车】获取预警处理列表)接口被调用, 调用ip: {},入参:{}", request.getRemoteAddr(),nuserId);
log.info("/getTricycleWarningList(【三轮车】获取预警处理列表)接口被调用, 调用ip: {},入参:{}", request.getRemoteAddr(),nuserId,search);
int roleFlag = 0;
// 权限判断
@ -159,9 +178,10 @@ public class TricycleController {
List<String> roleById = operatorService.getRoleById(nuserId);
if (!roleById.isEmpty()) {
for (String role : roleById){
// 村干部权限
if(RoleEnum.VILLAGE_CADRE.getName().equals(role)){
roleFlag = 1;
break;
// 中队权限
}else if(RoleEnum.TRICYCLE_SQUADRON_POLICE_OFFICERS.getName().equals(role)){
roleFlag = 2;
break;
@ -170,10 +190,113 @@ public class TricycleController {
} else {
return ServerResponse.error("当前用户无权限");
}
// 中队民警展示 未分配 未完成 状态的数据
List<TricycleWarningListVO> tricycleWarningListList = tricycleService.getTricycleWarningList(roleFlag,distributionStatus,completeStatus);
// 分页展示
PageHelper.startPage(pageNum, pageSize);
/*
中队民警待处理展示 未分配 未完成 状态的数据
农三轮村干部待处理展示 已分配 未完成 状态的数据
*/
List<TricycleWarningListVO> tricycleWarningListList = tricycleService.getTricycleWarningList(cdepartmentid,roleFlag,status,search);
tricycleWarningListList.forEach(item -> {
// 使用预留字段 ctime 接收 createtime 格式化的时间(Date->String)
item.setWarningTimeFormat(dateFormat.format(item.getWarningTime()));
});
// for (int i = 0; i < tricycleWarningListList.size(); i++) {
// tricycleWarningListList.get(i).getWarningTime();
// }
PageInfo<TricycleWarningListVO> pageInfo = new PageInfo<>(tricycleWarningListList);
log.info("/getTricycleWarningList(【三轮车】获取预警处理列表)接口数据返回,调用ip: {}, 出参:{}", request.getRemoteAddr(), tricycleWarningListList);
return ServerResponse.ok(tricycleWarningListList);
return ServerResponse.ok(pageInfo);
}
@GetMapping("/getSquadronVillageList")
@ApiOperation(value = "获取中队绑定村庄列表")
public ServerResponse<?> getSquadronVillageList(@RequestParam String nuserId){
List<StreetCommunity> streetCommunityBySquadron = configMapper.getStreetCommunityBySquadron(nuserId);
return ServerResponse.ok(streetCommunityBySquadron);
}
@GetMapping("/getWarningDetails")
@ApiOperation(value = "预警处理/分配操作详情页")
public ServerResponse<?> getWarningDetails(@RequestParam String warningId){
List<TricycleWarningDetailVO> warningDetails = tricycleService.getWarningDetails(warningId);
warningDetails.forEach(item ->{
// 格式化时间
item.setWarningTimeFormat(dateFormat.format(item.getWarningTime()));
});
return ServerResponse.ok(warningDetails);
}
@GetMapping("/submitDistributionStatus")
@ApiOperation(value = "中队民警提交预警分配状态")
public ServerResponse<?> submitDistributionStatus(@RequestParam String warningId, @RequestParam String sqCode){
int affectRows = tricycleService.submitDistributionStatus(warningId, sqCode);
if(affectRows > 0){
// 变更分配状态为已分配
tricycleService.updateWarningDistributionStatus("1", warningId);
return ServerResponse.ok("提交分配状态成功");
}else{
return ServerResponse.error("提交分配状态失败");
}
}
@PostMapping("/saveTricycleWarningHandle")
@ApiOperation(value = "提交预警处理内容")
public ServerResponse<?> saveTricycleWarningHandle(@RequestBody TricycleWarningResultsVO resultsVO){
int affectRows = tricycleService.saveTricycleWarningHandle(resultsVO);
if(affectRows > 0){
// 更新数据处理状态为已处理
tricycleService.updateWarningStatus("1", resultsVO.getWarningId());
return ServerResponse.ok("提交预警处理数据成功");
}else{
return ServerResponse.error("提交预警处理数据失败");
}
}
@GetMapping("/getHandleTypeEnum")
@ApiOperation(value = "处理类型字典")
public ServerResponse<?> getHandleTypeEnum(@RequestParam String nuserId){
int roleFlag = 0;
List<String> handleType = new ArrayList<>();
// 权限判断
List<String> roleById = operatorService.getRoleById(nuserId);
if (!roleById.isEmpty()) {
for (String role : roleById){
// 村干部权限
if(RoleEnum.VILLAGE_CADRE.getName().equals(role)){
roleFlag = 1;
// 中队权限
}else if(RoleEnum.TRICYCLE_SQUADRON_POLICE_OFFICERS.getName().equals(role)){
roleFlag = 2;
break;
}
}
} else {
return ServerResponse.error("当前用户无权限");
}
if(roleFlag == 1){
handleType.add(HandleEnum.PUBLICITY_AND_EDUCATION.getName());
} else if (roleFlag == 2) {
handleType.add(HandleEnum.PUBLICITY_AND_EDUCATION.getName());
handleType.add(HandleEnum.ILLEGAL_PUNISHMENT.getName());
}
return ServerResponse.ok(handleType);
}
}

@ -20,6 +20,8 @@ public interface ConfigMapper {
List<StreetCommunity> getStreetCommunityByJd(String jdcode);
List<StreetCommunity> getStreetCommunityBySquadron(String nuserId);
StreetCommunity getStreetCommunityBySq(String sqcode);
List<LineInfo> getDangerBaseData(@Param("sectionCode") String sectionCode,@Param("crossingCode") String crossingCode);

@ -18,7 +18,7 @@ public interface ThtTricycleInfoBaseMapper extends BaseMapper<ThtTricycleInfoBas
List<TricycleListVO> getTricycleList(@Param("roleFlag") int roleFlag,@Param("cdepartmentid") String cdepartmentid,@Param("status") String status,@Param("search") String search);
List<TricycleWarningListVO> getTricycleWarningList(@Param("roleFlag") int roleFlag, @Param("distributionStatus") String distributionStatus, @Param("completeStatus") String completeStatus);
// List<TricycleWarningListVO> getTricycleWarningList(@Param("roleFlag") int roleFlag, @Param("distributionStatus") String distributionStatus, @Param("completeStatus") String completeStatus);
// int saveTricycleInfo(ThtTricycleInfoBaseDTO infoBaseDTO);
ThtTricycleInfoBaseDTO getTricycleInfoBaseById(String vehicleId);

@ -2,13 +2,33 @@ package com.hisense.hiatmp.server_api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hisense.hiatmp.model.common.DTO.ThtTricycleWarningBaseDTO;
import com.hisense.hiatmp.model.common.VO.TricycleWarningDetailVO;
import com.hisense.hiatmp.model.common.VO.TricycleWarningListVO;
import com.hisense.hiatmp.model.common.VO.TricycleWarningResultsVO;
import io.lettuce.core.dynamic.annotation.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface ThtTricycleWarningBaseMapper extends BaseMapper<ThtTricycleWarningBaseDTO> {
TricycleWarningListVO getTricycleWarningList();
List<TricycleWarningListVO> getTricycleWarningList(@Param("cdepartmentid") String cdepartmentid,
@Param("roleFlag") int roleFlag,
@Param("status") String status,
@Param("search") String search
);
int submitDistributionStatus(@Param("warningId") String warningId, @Param("sqCode") String sqCode);
int saveTricycleWarningHandle(TricycleWarningResultsVO resultsVO);
List<TricycleWarningDetailVO> getWarningDetails(String warningId);
int updateWarningStatus(@Param("handleStatus") String handleStatus,
@Param("warningId") String warningId);
int updateWarningDistributionStatus(@Param("distributionStatus") String distributionStatus,
@Param("warningId") String warningId);
}

@ -2,7 +2,9 @@ package com.hisense.hiatmp.server_api.service;
import com.hisense.hiatmp.model.common.DTO.ThtTricycleInfoBaseDTO;
import com.hisense.hiatmp.model.common.VO.TricycleListVO;
import com.hisense.hiatmp.model.common.VO.TricycleWarningDetailVO;
import com.hisense.hiatmp.model.common.VO.TricycleWarningListVO;
import com.hisense.hiatmp.model.common.VO.TricycleWarningResultsVO;
import com.hisense.hiatmp.model.dmr.EnumType;
import java.util.List;
@ -12,7 +14,7 @@ public interface TricycleService {
List<TricycleListVO> getTricycleList(int roleFlag,String cdepartmentid,String status,String search);
List<TricycleWarningListVO> getTricycleWarningList(int roleFlag, String distributionStatus, String completeStatus);
List<TricycleWarningListVO> getTricycleWarningList(String cdepartmentid, int roleFlag, String status,String search);
int saveTricycleInfo(ThtTricycleInfoBaseDTO infoBaseDTO);
@ -20,7 +22,14 @@ public interface TricycleService {
ThtTricycleInfoBaseDTO getTricycleInfoBaseById(String id);
int submitDistributionStatus(String warningId, String sqCode);
int saveTricycleWarningHandle(TricycleWarningResultsVO resultsVO);
List<TricycleWarningDetailVO> getWarningDetails(String warningId);
int updateWarningStatus(String handleStatus, String warningId);
int updateWarningDistributionStatus(String distributionStatus, String warningId);
}

@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.hisense.hiatmp.model.common.DTO.ThtTricycleInfoBaseDTO;
import com.hisense.hiatmp.model.common.VO.TricycleListVO;
import com.hisense.hiatmp.model.common.VO.TricycleWarningDetailVO;
import com.hisense.hiatmp.model.common.VO.TricycleWarningListVO;
import com.hisense.hiatmp.model.common.VO.TricycleWarningResultsVO;
import com.hisense.hiatmp.model.dmr.EnumType;
import com.hisense.hiatmp.server_api.mapper.ConfigMapper;
import com.hisense.hiatmp.server_api.mapper.EnumTypeMapper;
@ -40,7 +42,7 @@ public class TricycleServiceImpl implements TricycleService {
EnumTypeMapper enumTypeMapper;
@Autowired
ThtTricycleWarningBaseMapper warningBaseMapper;
ThtTricycleWarningBaseMapper tricycleWarningBaseMapper;
@Override
public List<TricycleListVO> getTricycleList(int roleFlag,String cdepartmentid,String stauts,String search) {
@ -61,9 +63,9 @@ public class TricycleServiceImpl implements TricycleService {
@Override
public List<TricycleWarningListVO> getTricycleWarningList(int roleFlag, String distributionStatus, String completeStatus) {
public List<TricycleWarningListVO> getTricycleWarningList(String cdepartmentid, int roleFlag, String status,String search) {
warningBaseMapper.getTricycleWarningList();
List<TricycleWarningListVO> tricycleWarningList = tricycleWarningBaseMapper.getTricycleWarningList(cdepartmentid, roleFlag, status,search);
// List<TricycleListVO> tricycleList = tricycleInfoBaseMapper.getTricycleList(roleFlag, cdepartmentid,stauts);
//
@ -77,7 +79,7 @@ public class TricycleServiceImpl implements TricycleService {
// tricycleList.get(i).setStreetCommunity(streetCommunityBySq.getJdname());
// }
return null;
return tricycleWarningList;
}
@Override
@ -128,4 +130,31 @@ public class TricycleServiceImpl implements TricycleService {
public ThtTricycleInfoBaseDTO getTricycleInfoBaseById(String id) {
return tricycleInfoBaseMapper.selectById(id);
}
@Override
public int submitDistributionStatus(String warningId, String sqCode) {
return tricycleWarningBaseMapper.submitDistributionStatus(warningId,sqCode);
}
@Override
public int saveTricycleWarningHandle(TricycleWarningResultsVO resultsVO) {
return tricycleWarningBaseMapper.saveTricycleWarningHandle(resultsVO);
}
public List<TricycleWarningDetailVO> getWarningDetails(String warningId){
return tricycleWarningBaseMapper.getWarningDetails(warningId);
}
@Override
public int updateWarningStatus(String handleStatus,String warningId) {
return tricycleWarningBaseMapper.updateWarningStatus(handleStatus,warningId);
// return 0;
}
@Override
public int updateWarningDistributionStatus(String distributionStatus,String warningId) {
return tricycleWarningBaseMapper.updateWarningDistributionStatus(distributionStatus,warningId);
// return 0;
}
}

@ -46,6 +46,16 @@
</if>
</select>
<select id="getStreetCommunityBySquadron" resultType="com.hisense.hiatmp.server_api.model.StreetCommunity">
select DISTINCT
*
from
tlv_street_community
<if test="nuserId != ''">
where zdcode = #{nuserId}
</if>
</select>
<select id="getStreetCommunityBySq" resultType="com.hisense.hiatmp.server_api.model.StreetCommunity">
select DISTINCT xqcode,xqname,jdcode,jdname,sqcode,sqname from tlv_street_community where sqcode = #{sqcode};
</select>

@ -487,10 +487,6 @@
AND hdb.approve_status in ('1','2')
</if>
<if test="status == 10 and approve == 2">
and hdb.business_id in(
select ta.business_id from tht_approve ta
@ -527,8 +523,8 @@
</if>
<if test="startTime != null and startTime !=''">
and COALESCE(hdb.last_mod_date, hdb.insert_time) &gt;=to_date(#{startTime}, 'yyyy-MM-DD')
and COALESCE(hdb.last_mod_date, hdb.insert_time) &lt;=to_date(#{endTime}, 'yyyy-MM-DD')
and COALESCE(hdb.last_mod_date, hdb.insert_time) &gt;= to_date(#{startTime}, 'yyyy-MM-DD')
and COALESCE(hdb.last_mod_date, hdb.insert_time) &lt;= to_date(#{endTime}, 'yyyy-MM-DD') + 1
</if>
<if test="classification == 2">
@ -803,8 +799,12 @@
"CENTER_SEPARATE",
"DESIGN_SPEED",
"LIMIT_SPEED",
"SECTION_CODE",
<if test="ifCross == 1">
"ROAD_CODE"
</if>
<if test="ifCross == 2">
"SECTION_CODE"
</if>
)
values (nextval('test_id_seq'),
#{businessId},
@ -816,8 +816,7 @@
#{centerSeparate},
#{designSpeed},
#{limitSpeed},
#{sectionCode},
#{roadCode}
#{sectionCode}
);
</insert>

@ -4,21 +4,40 @@
<mapper namespace="com.hisense.hiatmp.server_api.mapper.ThtTricycleInfoBaseMapper">
<select id="getTricycleList" resultType="com.hisense.hiatmp.model.common.VO.TricycleListVO">
select DISTINCT ttib.id,
select ttib.id,
ttib.*
<if test="roleFlag != 3">
,jd.jdname,sq.sqname
</if>
from
tht_tricycle_info_base ttib
<if test="roleFlag != 3">
left join (
select distinct jdcode,jdname from
tlv_street_community
) jd on jd.jdcode=ttib.street_community
left join (
select distinct sqcode,sqname from
tlv_street_community
) sq on sq.sqcode=ttib.village_community
</if>
where
1 = 1
<if test="roleFlag == 1">
INNER JOIN tlv_street_community tsc on tsc.sqcode = #{cdepartmentid}
and ttib.village_community = tsc.sqcode
-- 村干部权限
and ttib.village_community = #{cdepartmentid}
</if>
<if test="roleFlag == 2">
INNER JOIN tlv_street_community tsc on tsc.zdcode = #{cdepartmentid}
and ttib.village_community = tsc.sqcode
-- 中队民警权限
and ttib.street_community in
(
select jdcode from tlv_street_community
where zdcode = #{cdepartmentid}
or xqcode = #{cdepartmentid}
)
</if>
where
1 = 1
<if test="status != 0">
-- 0 全部 1 已补录 2 未补录
AND ttib.status = #{status}
</if>
<if test="search != null and search != ''">
@ -26,6 +45,32 @@
</if>
</select>
<!-- <select id="getTricycleList" resultType="com.hisense.hiatmp.model.common.VO.TricycleListVO">-->
<!-- select DISTINCT ttib.id,-->
<!-- ttib.*-->
<!-- from-->
<!-- tht_tricycle_info_base ttib-->
<!-- <if test="roleFlag == 1">-->
<!--&#45;&#45; 村干部权限-->
<!-- INNER JOIN tlv_street_community tsc on tsc.sqcode = #{cdepartmentid}-->
<!-- and ttib.village_community = tsc.sqcode-->
<!-- </if>-->
<!-- <if test="roleFlag == 2">-->
<!--&#45;&#45; 中队民警权限-->
<!-- INNER JOIN tlv_street_community tsc on tsc.zdcode = #{cdepartmentid}-->
<!-- and ttib.village_community = tsc.sqcode-->
<!-- </if>-->
<!-- where-->
<!-- 1 = 1-->
<!-- <if test="status != 0">-->
<!--&#45;&#45; 0 全部 1 已补录 2 未补录-->
<!-- AND ttib.status = #{status}-->
<!-- </if>-->
<!-- <if test="search != null and search != ''">-->
<!-- AND ttib.vehicle_license like concat(concat('%',#{search}),'%')-->
<!-- </if>-->
<!-- </select>-->
<select id="getTricycleInfoBaseById" resultType="com.hisense.hiatmp.model.common.DTO.ThtTricycleInfoBaseDTO">
select * from tht_tricycle_info_base where vehicle_id = #{vehicleId}

@ -6,25 +6,69 @@
select
*
from
tht_tricycle_warning_base
<if test="roleFlag == 1">
INNER JOIN tlv_street_community tsc on tsc.sqcode = #{cdepartmentid}
and ttib.village_community = tsc.sqcode
</if>
<if test="roleFlag == 2">
INNER JOIN tlv_street_community tsc on tsc.zdcode = #{cdepartmentid}
and ttib.village_community = tsc.sqcode
tht_tricycle_warning_base ttwb
<if test="roleFlag == 1 and status == 0">
INNER JOIN tht_tricycle_warning_distribution ttwd on ttwd.warning_id = ttwb.warning_id AND ttwd.community_id = #{cdepartmentid}
</if>
where
1 = 1
<if test="status != ''">
AND ttib.status = #{status}
<if test="roleFlag == 1 and status == 0">
-- 村干部权限
AND ttwb.handle_status = '0'
AND ttwb.distribution_status = '1'
</if>
<if test="roleFlag == 2 and status == 0">
-- 中队民警权限
AND ttwb.handle_status = '0'
AND ttwb.distribution_status = '0'
AND ttwb.handle_unit = #{cdepartmentid}
</if>
<if test="status == 1">
AND ttwb.handle_status = '0' AND ttwb.distribution_status = '1'
</if>
<if test="status == 2">
AND ttwb.handle_status = '1'
</if>
AND ttwb.vehicle_license like concat(concat('%',#{search}),'%')
</select>
<select id="getTricycleInfoBaseById" resultType="com.hisense.hiatmp.model.common.DTO.ThtTricycleInfoBaseDTO">
select * from tht_tricycle_info_base where vehicle_id = #{vehicleId}
</select>
<insert id="submitDistributionStatus">
insert into tht_tricycle_warning_distribution(warning_id,community_id) VALUES (#{warningId},#{sqCode})
</insert>
<insert id="saveTricycleWarningHandle">
insert into tht_tricycle_warning_handle
(warning_id,
handle_type,
handle_result,
handle_personnel,
handle_time,
handle_img)
VALUES (#{warningId},
#{handleType},
#{handleResult},
#{handlePersonnel},
#{handleTime},
#{handleImg})
</insert>
<select id="getWarningDetails" resultType="com.hisense.hiatmp.model.common.VO.TricycleWarningDetailVO">
select * from tht_tricycle_warning_base where warning_id = #{warningId}
</select>
<update id="updateWarningStatus">
update tht_tricycle_warning_base
set handle_status = #{handleStatus}
where warning_id = #{warningId}
</update>
<update id="updateWarningDistributionStatus">
update tht_tricycle_warning_base
set distribution_status = #{distributionStatus}
where warning_id = #{warningId}
</update>
</mapper>

@ -82,5 +82,7 @@ public class ThtSectionInfoDTO implements Serializable {
private String ifCross;
private String roadCode;
public ThtSectionInfoDTO() {}
}

@ -20,4 +20,5 @@ public class BasicInfoVO implements Serializable {
private String designSpeed;
private String limitSpeed;
private String roadCode;
private String ifCross;
}

@ -21,4 +21,10 @@ public class TricycleListVO {
private String streetCommunity;
private String vehicleId;
private String drivingImg;
private String sqname;
private String jdname;
}

@ -0,0 +1,33 @@
package com.hisense.hiatmp.model.common.VO;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.util.Date;
/*
三轮车模块列表展示
*/
@Data
public class TricycleWarningDetailVO {
// 主键
private String id;
// 驾驶号牌
private String vehicleLicense;
// 驾驶人姓名
private String driverName;
// 预警ID
private String warningId;
// 违法行为
private String illegalActivities;
// 预警时间
@JsonIgnore
private Date warningTime;
private String warningTimeFormat;
// 违法图片
private String illegalImg;
// 问题描述
private String problemDescription;
}

@ -1,5 +1,7 @@
package com.hisense.hiatmp.model.common.VO;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jdk.nashorn.internal.ir.annotations.Ignore;
import lombok.Data;
import java.util.Date;
@ -21,5 +23,8 @@ public class TricycleWarningListVO {
// 违法行为
private String illegalActivities;
// 预警时间
@JsonIgnore
private Date warningTime;
private String warningTimeFormat;
}

@ -0,0 +1,31 @@
package com.hisense.hiatmp.model.common.VO;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/*
三轮车模块处理页实体类
*/
@Data
public class TricycleWarningResultsVO {
// 主键
private String id;
// 预警ID
private String warningId;
// 处理类型
private String handleType;
// 处理人员
private String handlePersonnel;
// 处理时间
// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm")
private Date handleTime;
// 处理照片
private String handleImg;
// 处理结果
private String handleResult;
}

@ -1,10 +0,0 @@
public class EnumExample {
public enum Day {
MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY
}
public static void main(String[] args) {
Day today = Day.MONDAY;
System.out.println("Today is " + today);
}
}

@ -0,0 +1,21 @@
package com.hisense.hiatmp.model.common.enums;
import com.sun.org.apache.xpath.internal.operations.And;
import lombok.Data;
public enum HandleEnum {
ILLEGAL_PUNISHMENT("违法处罚"),
PUBLICITY_AND_EDUCATION("宣传教育")
;
private String name;
HandleEnum(String handleEnum) {
this.name = handleEnum;
}
public String getName() {
return name;
}
}
Loading…
Cancel
Save