springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitCompleteDTO.java
@@ -24,7 +24,7 @@ @ApiModelProperty("经纬度（,隔开）") @NotEmpty(message = "经纬度不能为空") private String lat_lng; private String latLng; @ApiModelProperty("地址") @NotEmpty(message = "地址不能为空") @@ -39,6 +39,9 @@ @ApiModelProperty("异常描述") private String dellDesc; @ApiModelProperty("异常选择") private String option; @ApiModelProperty("家庭联系方式") @NotEmpty(message = "家庭联系方式不能为空") private String familyPhone; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java
@@ -1,5 +1,6 @@ package com.panzhihua.common.model.vos.visit; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.model.vos.grid.EventResourceVO; import io.swagger.annotations.ApiModel; @@ -117,7 +118,7 @@ private Boolean exception; @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据") private String tableContentJson; private JSONObject tableContentJson; @ApiModelProperty(value = "创建人") private Long createBy; @@ -133,6 +134,9 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateAt; @ApiModelProperty(value = "异常选项") private List<String> optionList; @ApiModelProperty(value = "音频列表") List<String> vosList;
@@ -94,4 +94,6 @@ Integer cancel(@Param("id")Long id,@Param("status") Integer status); Map<String, Object> findUserById(Long userId); String getLabel(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventVisitingTasksDO.java
@@ -186,4 +186,20 @@ */ private String familySource; /** * 访问后的填写的地址 */ private String address; /** * 访问后的经纬度 */ private String latLng; /** * 本地或外地：1本地2外地 */ private Integer outOrLocal; } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_grid.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -26,14 +27,7 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import javax.crypto.BadPaddingException; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.util.Date; import java.util.List; import java.util.Map; import java.util.*; /** * @auther lyq @@ -179,8 +173,8 @@ if(eventVisitingTasksDO!=null) { EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO(); BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO); ; eventVisitingTasksDetailsVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(), aesKey)); eventVisitingTasksDetailsVO.setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson())); return R.ok(eventVisitingTasksDetailsVO); } return R.fail(); @@ -247,7 +241,47 @@ visitingTasksDO.setUrgent(false); visitingTasksDO.setUrgentDell(false); visitingTasksDO.setCreateBy(userId); visitingTasksDO.setOutOrLocal(map.get("out_or_local") == null?null:Integer.valueOf(map.get("out_or_local").toString())); if(map.get("label") != null){ List<String> option = getOption(map.get("label").toString()); if(!CollectionUtils.isEmpty(option)){ JSONObject json = new JSONObject(); json.put("option",option); visitingTasksDO.setTableContentJson(json.toJSONString()); } } eventVisitingTasksMapper.insert(visitingTasksDO); } private List<String> getOption(String label) { List<String> option = new ArrayList<>(); if(!Objects.isNull(label)) { if (label.contains("精神障碍")) { option.add("精神障碍异常1"); option.add("精神障碍异常2"); option.add("精神障碍异常3"); option.add("精神障碍异常4"); } else if (label.contains("吸毒")) { option.add("疑似复吸"); option.add("失联"); option.add("复吸"); option.add("空挂户"); } else if (label.contains("刑满释放")) { option.add("刑满释放异常1"); option.add("刑满释放异常2"); option.add("刑满释放异常3"); option.add("刑满释放异常4"); } else if (label.contains("社区矫正")) { option.add("社区矫正异常1"); option.add("社区矫正异常2"); option.add("社区矫正异常3"); option.add("社区矫正异常4"); } } return option; } @Transactional(rollbackFor = Exception.class) @@ -316,6 +350,10 @@ taskCompleteDTO.setEventStatus(EventTasksStatusEnum.YC.getCode()); } JSONObject json = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()); json.put("check",taskCompleteDTO.getOption()); taskCompleteDTO.setOption(json.toJSONString()); if(!CollectionUtils.isEmpty(taskCompleteDTO.getImgList())){ taskCompleteDTO.getImgList().forEach(e->{ createResource(eventVisitingTasksDO.getId(),eventVisitingTasksDO.getDellUserId(),2,1,e); @@ -331,6 +369,7 @@ createResource(eventVisitingTasksDO.getId(),eventVisitingTasksDO.getDellUserId(),2,3,e); }); } int rt = eventVisitingTasksMapper.complete(taskCompleteDTO); if(rt > 0){ return R.ok(); springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml
@@ -137,7 +137,7 @@ </select> <select id="findPopulationById" resultType="java.util.Map"> SELECT p.id,p.name,p.sex,p.phone,p.road,p.door_no,p.floor,p.unit_no,p.house_no,v.address,v.lng,v.lat FROM com_mng_population p SELECT p.id,p.name,p.sex,p.phone,p.road,p.door_no,p.floor,p.unit_no,p.house_no,v.address,v.lng,v.lat,p.label,p.out_or_local FROM com_mng_population p LEFT JOIN com_mng_village v ON p.village_id = v.village_id WHERE p.id = #{id} </select> @@ -162,8 +162,13 @@ <update id="complete" parameterType="com.panzhihua.common.model.vos.visit.EventVisitCompleteDTO"> update event_visiting_tasks set event_status = #{eventStatus},address = #{address},address_remark=#{addressRemark}, family_phone =#{familyPhone},family_source = #{familySource},lat_lng=#{lat_lng},dell_desc = #{dellDesc},exception = #{exception},submit_date = NOW() family_phone =#{familyPhone},family_source = #{familySource},lat_lng=#{latLng},dell_desc = #{dellDesc},table_content_json = #{option} exception = #{exception},submit_date = NOW() where id = #{id} </update> <select id="getLabel" parameterType="java.lang.Long" resultType="java.lang.String"> select label from com_mng_population where id = #{id} </select> </mapper>
