Browse Source

拉取12345数据

master
qushutong 1 year ago
parent
commit
a0ba02a6dd
  1. 15
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java
  2. 122
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/ItemHotlineDTO.java
  3. 44
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotLineFromDTO.java
  4. 14
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/UpdateAppealSendDTO.java
  5. 193
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/CenterData.java
  6. 16
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/oss/UploadFormDTO.java
  7. 96
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/ItemHotlineController.java
  8. 33
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/ItemHotlineDao.java
  9. 122
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/ItemHotlineEntity.java
  10. 102
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ItemHotlineService.java
  11. 138
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java
  12. 18
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/OssFeignClient.java
  13. 6
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/OssFeignClientFallback.java
  14. 32
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java
  15. 102
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
  16. 27
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHotlineDao.xml
  17. 14
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java
  18. 5
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java
  19. 10
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/events/ItemHotLineTask.java
  20. 30
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/events/ItemHotLineTaskImpl.java
  21. 0
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/dao/CentralHouseHoldDao.java
  22. 38
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/CentralHouseHoldEntity.java
  23. 0
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/CentralHouseHoldService.java
  24. 0
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/CentralHouseHoldServiceImpl.java

15
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java

@ -14,6 +14,8 @@ public interface PushToCityGridConstant {
//String URL_PREFIX = "http://60.166.25.58:6140/sjgl/a/case";
String URL_PREFIX = "http://120.221.72.162:6140/sjgl/a/case";
String BASTURL = "http://60.166.25.58:6140/sjgl/a/case";
/**
* 民生诉求上报
*/
@ -158,5 +160,18 @@ public interface PushToCityGridConstant {
/**
* 热线数据接收接口
*/
String SENDLIST = BASTURL + "/sendList";
/**
* 设置诉求信息已接收接口
*/
String UPDATEAPPEALSEND = BASTURL + "/updateAppealSend";
}

122
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/ItemHotlineDTO.java

@ -0,0 +1,122 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.dto;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import java.math.BigDecimal;
/**
* 12345热线数据
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2024-06-26
*/
@Data
public class ItemHotlineDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* ID
*/
private String id;
/**
* 申请时返回的sqid
*/
private String code;
/**
* 诉求来源 01:12345热线
*/
private String sjly;
/**
* 所属机构编码
*/
private String orgid;
/**
* 所属机构名称
*/
private String orgname;
/**
* 诉求状态字典3.5
*/
private String sjzt;
/**
* 是否保密
*/
private String isbm;
/**
* 是否公开
*/
private String ispublic;
/**
* 诉求标题
*/
private String sqbt;
/**
* 诉求内容
*/
private String sjnr;
/**
* 诉求ID 青诉即办诉求唯一标识
*/
private String sqid;
/**
* 所属专题 01民生诉求 02发展诉求 03执法诉求 字典3.11
*/
private String sszt;
/**
* 登记人ID
*/
private String djr;
/**
* 登记人姓名
*/
private String djrxm;
/**
* 地理位置
*/
private String dlwzmc;
/**
* 议题位置纬度
*/
private BigDecimal latitude;
/**
* 议题位置经度
*/
private BigDecimal longitude;
}

44
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotLineFromDTO.java

@ -0,0 +1,44 @@
package com.elink.esua.epdc.dto.item.form;
/**
* @ClassName HotLineFromDTO * @Description TODO
* @Author Mia
* @Date 11:10 2024/6/26
* @Version 1.0
**/
public class HotLineFromDTO {
/**
* count : 100
* userName : qds
* pwd : qds
*/
private Integer count;
private String userName;
private String pwd;
public void setCount(Integer count) {
this.count = count;
}
public void setUserName(String userName) {
this.userName = userName;
}
public void setPwd(String pwd) {
this.pwd = pwd;
}
public Integer getCount() {
return count;
}
public String getUserName() {
return userName;
}
public String getPwd() {
return pwd;
}
}

14
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/UpdateAppealSendDTO.java

@ -0,0 +1,14 @@
package com.elink.esua.epdc.dto.item.form;
import lombok.Data;
/**
* @ClassName UpdateAppealSendDTO * @Description TODO
* @Author Mia
* @Date 15:32 2024/6/26
* @Version 1.0
**/
@Data
public class UpdateAppealSendDTO {
private String id;
}

193
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/CenterData.java

@ -0,0 +1,193 @@
package com.elink.esua.epdc.dto.item.result;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @ClassName CenterData * @Description TODO 拉取12345 数据
* @Author Mia
* @Date 17:57 2024/6/25
* @Version 1.0
**/
public class CenterData implements Serializable {
/**
* code : MS370202001-20240624-00001
* orgName : 香港中路街道办事处
* sjzt : 03
* isBm : 0
* sqbt : 诉求标题
* sqid : fc474b6fe3a64889a0e64faaf5801d21
* sszt : 01
* djr : 登记人ID
* orgId : 370214
* sjnr : 诉求内容
* dlwzmc : 地理位置
* sjly : 01
* djrxm : 登记人姓名
* isPublic : 1
* fileList : [{"name":"附件名称","value":"base64"}]
*/
private String code;
private String orgName;
private String sjzt;
private String isBm;
private String sqbt;
private String sqid;
private String sszt;
private String djr;
private String orgId;
private String sjnr;
private String dlwzmc;
private String sjly;
private String djrxm;
private String isPublic;
private List<FileListEntity> fileList;
public void setCode(String code) {
this.code = code;
}
public void setOrgName(String orgName) {
this.orgName = orgName;
}
public void setSjzt(String sjzt) {
this.sjzt = sjzt;
}
public void setIsBm(String isBm) {
this.isBm = isBm;
}
public void setSqbt(String sqbt) {
this.sqbt = sqbt;
}
public void setSqid(String sqid) {
this.sqid = sqid;
}
public void setSszt(String sszt) {
this.sszt = sszt;
}
public void setDjr(String djr) {
this.djr = djr;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public void setSjnr(String sjnr) {
this.sjnr = sjnr;
}
public void setDlwzmc(String dlwzmc) {
this.dlwzmc = dlwzmc;
}
public void setSjly(String sjly) {
this.sjly = sjly;
}
public void setDjrxm(String djrxm) {
this.djrxm = djrxm;
}
public void setIsPublic(String isPublic) {
this.isPublic = isPublic;
}
public void setFileList(List<FileListEntity> fileList) {
this.fileList = fileList;
}
public String getCode() {
return code;
}
public String getOrgName() {
return orgName;
}
public String getSjzt() {
return sjzt;
}
public String getIsBm() {
return isBm;
}
public String getSqbt() {
return sqbt;
}
public String getSqid() {
return sqid;
}
public String getSszt() {
return sszt;
}
public String getDjr() {
return djr;
}
public String getOrgId() {
return orgId;
}
public String getSjnr() {
return sjnr;
}
public String getDlwzmc() {
return dlwzmc;
}
public String getSjly() {
return sjly;
}
public String getDjrxm() {
return djrxm;
}
public String getIsPublic() {
return isPublic;
}
public List<FileListEntity> getFileList() {
return fileList;
}
public class FileListEntity {
/**
* name : 附件名称
* value : base64
*/
private String name;
private String value;
public void setName(String name) {
this.name = name;
}
public void setValue(String value) {
this.value = value;
}
public String getName() {
return name;
}
public String getValue() {
return value;
}
}
}

16
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/oss/UploadFormDTO.java

@ -0,0 +1,16 @@
package com.elink.esua.epdc.dto.oss;
import lombok.Data;
import java.io.Serializable;
/**
* @Author LC
* @Date 2019/9/11 19:22
*/
@Data
public class UploadFormDTO implements Serializable {
private static final long serialVersionUID = -3595962954673866413L;
private String base64String;
}

96
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/ItemHotlineController.java

@ -0,0 +1,96 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.modules.events.controller;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.dto.ItemHotlineDTO;
import com.elink.esua.epdc.modules.events.service.ItemHotlineService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
/**
* 12345热线数据
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2024-06-26
*/
@RestController
@RequestMapping("itemhotline")
public class ItemHotlineController {
@Autowired
private ItemHotlineService itemHotlineService;
@GetMapping("page")
public Result<PageData<ItemHotlineDTO>> page(@RequestParam Map<String, Object> params){
PageData<ItemHotlineDTO> page = itemHotlineService.page(params);
return new Result<PageData<ItemHotlineDTO>>().ok(page);
}
@GetMapping("{id}")
public Result<ItemHotlineDTO> get(@PathVariable("id") String id){
ItemHotlineDTO data = itemHotlineService.get(id);
return new Result<ItemHotlineDTO>().ok(data);
}
@PostMapping
public Result save(@RequestBody ItemHotlineDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
itemHotlineService.save(dto);
return new Result();
}
@PutMapping
public Result update(@RequestBody ItemHotlineDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
itemHotlineService.update(dto);
return new Result();
}
@DeleteMapping
public Result delete(@RequestBody String[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
itemHotlineService.delete(ids);
return new Result();
}
// @GetMapping("export")
// public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
// List<ItemHotlineDTO> list = itemHotlineService.list(params);
// ExcelUtils.exportExcelToTarget(response, null, list, ItemHotlineExcel.class);
// }
@PostMapping("getHotLine")
public void getHotLine(){
itemHotlineService.getHotLine();
}
}

33
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/ItemHotlineDao.java

@ -0,0 +1,33 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.modules.events.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.modules.events.entity.ItemHotlineEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 12345热线数据
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2024-06-26
*/
@Mapper
public interface ItemHotlineDao extends BaseDao<ItemHotlineEntity> {
}

122
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/ItemHotlineEntity.java

@ -0,0 +1,122 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.modules.events.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
/**
* 12345热线数据
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2024-06-26
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("epdc_item_hotline")
public class ItemHotlineEntity extends BaseEpdcEntity {
private static final long serialVersionUID = 1L;
/**
* 申请时返回的sqid
*/
private String code;
/**
* 诉求来源 01:12345热线
*/
private String sjly;
/**
* 所属机构编码
*/
private String orgid;
/**
* 所属机构名称
*/
private String orgname;
/**
* 诉求状态字典3.5
*/
private String sjzt;
/**
* 是否保密
*/
private String isbm;
/**
* 是否公开
*/
private String ispublic;
/**
* 诉求标题
*/
private String sqbt;
/**
* 诉求内容
*/
private String sjnr;
/**
* 诉求ID 青诉即办诉求唯一标识
*/
private String sqid;
/**
* 所属专题 01民生诉求 02发展诉求 03执法诉求 字典3.11
*/
private String sszt;
/**
* 登记人ID
*/
private String djr;
/**
* 登记人姓名
*/
private String djrxm;
/**
* 地理位置
*/
private String dlwzmc;
/**
* 议题位置纬度
*/
private BigDecimal latitude;
/**
* 议题位置经度
*/
private BigDecimal longitude;
}

102
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/ItemHotlineService.java

@ -0,0 +1,102 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.modules.events.service;
import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.dto.ItemHotlineDTO;
import com.elink.esua.epdc.modules.events.entity.ItemHotlineEntity;
import java.util.List;
import java.util.Map;
/**
* 12345热线数据
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2024-06-26
*/
public interface ItemHotlineService extends BaseService<ItemHotlineEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<ItemHotlineDTO>
* @author generator
* @date 2024-06-26
*/
PageData<ItemHotlineDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<ItemHotlineDTO>
* @author generator
* @date 2024-06-26
*/
List<ItemHotlineDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return ItemHotlineDTO
* @author generator
* @date 2024-06-26
*/
ItemHotlineDTO get(String id);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2024-06-26
*/
void save(ItemHotlineDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2024-06-26
*/
void update(ItemHotlineDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2024-06-26
*/
void delete(String[] ids);
void getHotLine();
}

138
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java

@ -0,0 +1,138 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.modules.events.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.constant.PushToCityGridConstant;
import com.elink.esua.epdc.dto.ItemHotlineDTO;
import com.elink.esua.epdc.dto.item.form.UpdateAppealSendDTO;
import com.elink.esua.epdc.dto.item.result.CenterData;
import com.elink.esua.epdc.dto.oss.UploadFormDTO;
import com.elink.esua.epdc.modules.events.dao.ItemHotlineDao;
import com.elink.esua.epdc.modules.events.entity.ItemHotlineEntity;
import com.elink.esua.epdc.modules.events.service.ItemHotlineService;
import com.elink.esua.epdc.modules.feign.OssFeignClient;
import com.elink.esua.epdc.modules.item.service.impl.PushToCityGridServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* 12345热线数据
*
* @author elink elink@elink-cn.com
* @since v1.0.0 2024-06-26
*/
@Service
public class ItemHotlineServiceImpl extends BaseServiceImpl<ItemHotlineDao, ItemHotlineEntity> implements ItemHotlineService {
@Autowired
private PushToCityGridServiceImpl pushToCityGridServiceImpl;
@Autowired
private OssFeignClient ossFeignClient;
@Override
public PageData<ItemHotlineDTO> page(Map<String, Object> params) {
IPage<ItemHotlineEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, ItemHotlineDTO.class);
}
@Override
public List<ItemHotlineDTO> list(Map<String, Object> params) {
List<ItemHotlineEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, ItemHotlineDTO.class);
}
private QueryWrapper<ItemHotlineEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper<ItemHotlineEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
public ItemHotlineDTO get(String id) {
ItemHotlineEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, ItemHotlineDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(ItemHotlineDTO dto) {
ItemHotlineEntity entity = ConvertUtils.sourceToTarget(dto, ItemHotlineEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(ItemHotlineDTO dto) {
ItemHotlineEntity entity = ConvertUtils.sourceToTarget(dto, ItemHotlineEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除(@TableLogic 注解)
baseDao.deleteBatchIds(Arrays.asList(ids));
}
@Override
public void getHotLine() {
List<CenterData> centerHotLine = pushToCityGridServiceImpl.getCenterHotLine();
List<ItemHotlineEntity> itemHotlineDTOList = ConvertUtils.sourceToTarget(centerHotLine, ItemHotlineEntity.class);
// 插入12345 数据
// insertBatch(itemHotlineDTOList);
UploadFormDTO dto = new UploadFormDTO();
UpdateAppealSendDTO appealSendDTO = new UpdateAppealSendDTO();
for (CenterData item : centerHotLine) {
ItemHotlineEntity itemHotlineEntity = ConvertUtils.sourceToTarget(item, ItemHotlineEntity.class);
// 存入12345表
baseDao.insert(itemHotlineEntity);
// 存入之后 告知市里
appealSendDTO.setId(item.getSqid());
pushToCityGridServiceImpl.sendAppealState(appealSendDTO);
for (CenterData.FileListEntity entity : item.getFileList()) {
// 存附件
dto.setBase64String(entity.getValue());
ossFeignClient.uploadBase64(dto);
}
}
}
}

18
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/OssFeignClient.java

@ -2,10 +2,13 @@ package com.elink.esua.epdc.modules.feign;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.oss.UploadFormDTO;
import com.elink.esua.epdc.modules.feign.fallback.OssFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@ -44,4 +47,19 @@ public interface OssFeignClient {
*/
@GetMapping(value = "oss/file/uploadXxxdVoice")
Result<String> uploadXxxdVoice(@RequestParam("itemVoiceUrl") String itemVoiceUrl);
/**
*
* @description: 上传头像base64
* @author qushutong
* @date 2024/6/26 15:00
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
* @Version1.0
**/
@PostMapping(value = "oss/file/uploadBase64", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<String> uploadBase64(UploadFormDTO dto);
}

6
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/OssFeignClientFallback.java

@ -3,6 +3,7 @@ package com.elink.esua.epdc.modules.feign.fallback;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.oss.UploadFormDTO;
import com.elink.esua.epdc.modules.feign.OssFeignClient;
import org.springframework.stereotype.Component;
@ -30,4 +31,9 @@ public class OssFeignClientFallback implements OssFeignClient {
return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "uploadXxxdVoice", itemVoiceUrl);
}
@Override
public Result<String> uploadBase64(UploadFormDTO dto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "uploadBase64", dto);
}
}

32
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java

@ -19,11 +19,16 @@ package com.elink.esua.epdc.modules.item.service;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.ItemHotlineDTO;
import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
import com.elink.esua.epdc.dto.item.form.AppealAuditFormDTO;
import com.elink.esua.epdc.dto.item.form.GetAbnormalDataFormDTO;
import com.elink.esua.epdc.dto.item.form.ItemWhistle2GovFormDTO;
import com.elink.esua.epdc.dto.item.form.UpdateAppealSendDTO;
import com.elink.esua.epdc.dto.item.result.AppealFormDTO;
import com.elink.esua.epdc.dto.item.result.CenterData;
import java.util.List;
/**
* 青岛市青诉即办平台接入
@ -271,4 +276,31 @@ public interface PushToCityGridService {
* 诉求申诉
*/
void appeal(AppealFormDTO appealFormDTO);
/**
*
* @description: 青岛12345热线数据接收接口
* @author qushutong
* @date 2024/6/26 10:57
* @param
* @return com.elink.esua.epdc.dto.ItemHotlineDTO
* @Version1.0
**/
List<CenterData> getCenterHotLine();
/**
*
* @description: 设置诉求信息已接收接口
* @author qushutong
* @date 2024/6/26 15:35
* @param
* @return void
* @Version1.0
**/
void sendAppealState(UpdateAppealSendDTO dto);
}

102
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java

@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.item.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -27,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.constant.StrConstant;
import com.elink.esua.epdc.commons.tools.enums.CityPushEnum;
import com.elink.esua.epdc.commons.tools.enums.CityPushLinkEnum;
import com.elink.esua.epdc.commons.tools.enums.CityPushStateEnum;
import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
@ -35,15 +37,14 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.constant.PushToCityGridConstant;
import com.elink.esua.epdc.dto.CityCenterFromDTO;
import com.elink.esua.epdc.dto.CompleteDeptDTO;
import com.elink.esua.epdc.dto.ItemHotlineDTO;
import com.elink.esua.epdc.dto.SysDeptDTO;
import com.elink.esua.epdc.dto.epdc.result.SysDeptAreaCodeResultDTO;
import com.elink.esua.epdc.dto.events.PushToCityGridCaseClosedDTO;
import com.elink.esua.epdc.dto.events.result.PushToCityResultDTO;
import com.elink.esua.epdc.dto.item.ItemDTO;
import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
import com.elink.esua.epdc.dto.item.form.AppealAuditFormDTO;
import com.elink.esua.epdc.dto.item.form.GetAbnormalDataFormDTO;
import com.elink.esua.epdc.dto.item.form.ItemWhistle2GovFormDTO;
import com.elink.esua.epdc.dto.item.form.*;
import com.elink.esua.epdc.dto.item.result.*;
import com.elink.esua.epdc.enums.ItemGridPlatformHandleStatusEnum;
import com.elink.esua.epdc.enums.ItemHandleCategoryEnum;
@ -52,12 +53,19 @@ import com.elink.esua.epdc.gird.shibei.contants.ApiConstants;
import com.elink.esua.epdc.modules.events.dao.ImgDao;
import com.elink.esua.epdc.modules.events.entity.ImgEntity;
import com.elink.esua.epdc.modules.feign.AdminFeignClient;
import com.elink.esua.epdc.modules.interfacelog.entity.InterfaceLogEntity;
import com.elink.esua.epdc.modules.interfacelog.entity.InterfaceLogErrorEntity;
import com.elink.esua.epdc.modules.interfacelog.service.InterfaceLogErrorService;
import com.elink.esua.epdc.modules.interfacelog.service.InterfaceLogService;
import com.elink.esua.epdc.modules.item.dao.*;
import com.elink.esua.epdc.modules.item.entity.*;
import com.elink.esua.epdc.modules.item.service.ItemService;
import com.elink.esua.epdc.modules.item.service.PushToCityGridService;
import com.elink.esua.epdc.modules.screen.dao.MetaSysDeptDao;
import com.elink.esua.epdc.modules.screen.entity.MetaSysDeptEntity;
import com.elink.esua.httpclient.HttpClientUtils;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
@ -87,6 +95,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
* 初验申请工作人员ID
*/
private static final String SQ_MEMBER_ID = "af652257fdb8436fbcbbec72ec9255e3";
private Logger LOGGER = LogManager.getLogger(HttpClientUtils.class);
/**
* 诉求初验工作人员ID
*/
@ -113,6 +123,12 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
@Resource
private MetaSysDeptDao metaSysDeptDao;
@Autowired
private InterfaceLogService interfaceLogService;
@Autowired
private InterfaceLogErrorService interfaceLogErrorService;
@Override
public void appealDispatch(ItemHandleProcessDTO formDTO) {
List<ItemHandleProcessDTO> list = new ArrayList<>();
@ -643,7 +659,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 当前处理环节
data.setDqclhj(CityPushLinkEnum.SQSH.getCode());
//处置标识 01 社区处置 02 街道处置
data.setCzbs(item.getHandlerDeptId()==0?"02":"01");
data.setCzbs(item.getHandlerDeptId() == 0 ? "02" : "01");
// 执法类型添加类型,纪要,进度字段
if (item.getPeopleFlag().equals(NumConstant.TWO_STR)) {
//办理进度 诉求分类是执法的时候
@ -1062,13 +1078,13 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
//评价人员
EvaluationResultDTO.CzrBean czr = new EvaluationResultDTO.CzrBean();
czr.setId(item.getUserId());
if (item.getEvaluationSystemFlag()!=null){
if (item.getEvaluationSystemFlag() == 1){
if (item.getEvaluationSystemFlag() != null) {
if (item.getEvaluationSystemFlag() == 1) {
czr.setXm("系统评价人员");
}else {
} else {
czr.setXm(item.getNickName());
}
}else{
} else {
czr.setXm(item.getNickName());
}
czr.setSsbmbm(item.getGridId().toString());
@ -1441,10 +1457,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
return;
}
LambdaQueryWrapper<ItemHandleProcessEntity> entityLambdaQueryWrapper = new LambdaQueryWrapper<ItemHandleProcessEntity>().eq(ItemHandleProcessEntity::getItemId,item.getItemId()).eq(ItemHandleProcessEntity::getState,ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_JS.getValue());
LambdaQueryWrapper<ItemHandleProcessEntity> entityLambdaQueryWrapper = new LambdaQueryWrapper<ItemHandleProcessEntity>().eq(ItemHandleProcessEntity::getItemId, item.getItemId()).eq(ItemHandleProcessEntity::getState, ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_JS.getValue());
List<ItemHandleProcessEntity> list = itemHandleProcessDao.selectList(entityLambdaQueryWrapper);
if (list.size()>0){
if (list.size() > 0) {
return;
}
@ -1531,8 +1547,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
}
private void extracted(List<String> sqIdList, Integer itemState) {
//50个一组
List<List<String>> partList = ListUtils.partition(sqIdList, NumConstant.FIFTY);
@ -1577,8 +1591,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
}
@Override
public void appeal(AppealFormDTO appealFormDTO) {
@ -1586,4 +1598,66 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
saveLog(appealFormDTO.getCzr().getId(), "", "诉求申诉", PushToCityGridConstant.APPEAL_AUDIT, JSONObject.toJSONString(appealFormDTO), result);
}
@Override
public List<CenterData> getCenterHotLine() {
HotLineFromDTO hotLineFromDTO = new HotLineFromDTO();
hotLineFromDTO.setCount(2);
hotLineFromDTO.setPwd("sbq2024");
hotLineFromDTO.setUserName("sbq");
//发送到市平台
String resultString = cityGridApi.sendItemToCity(hotLineFromDTO, PushToCityGridConstant.SENDLIST, "青岛12345热线数据接收");
JSONObject res = JSONObject.parseObject(resultString);
// 存日志
String successFlag = YesOrNoEnum.NO.value();
if (NumConstant.ZERO_STR.equals(res.get("code").toString())) {
successFlag = YesOrNoEnum.YES.value();
}
this.saveInterfaceLog("12345","拉取12345数据",PushToCityGridConstant.SENDLIST,successFlag,JSONObject.toJSONString(hotLineFromDTO),resultString);
JSONArray dataList = JSONObject.parseArray(res.get("data").toString());
List<CenterData> results = new ArrayList<>();
try {
results = dataList.toJavaList(CenterData.class);
} catch (Exception e) {
e.printStackTrace();
LOGGER.error("获取事件处理结果异常:" + e.getMessage());
}
return results;
}
@Override
public void sendAppealState(UpdateAppealSendDTO dto) {
//发送到市平台
cityGridApi.sendItemToCity(dto, PushToCityGridConstant.UPDATEAPPEALSEND, "设置诉求信息已接收接口");
}
/**
* 保存接口调用日志
*
* @return void
* @params [referenceId, businessType, interfaceName, successFlag, callMsgBody, returnMsgBody]
* @author liuchuang
* @since 2019/12/26 11:08
*/
private void saveInterfaceLog(String referenceId, String businessType, String interfaceName,
String successFlag, String callMsgBody, String returnMsgBody) {
InterfaceLogEntity interfaceLogEntity = new InterfaceLogEntity();
interfaceLogEntity.setReferenceId(referenceId);
interfaceLogEntity.setBusinessType(businessType);
interfaceLogEntity.setInterfaceName(interfaceName);
interfaceLogEntity.setSuccessFlag(successFlag);
interfaceLogEntity.setCallMsgBody(callMsgBody);
interfaceLogEntity.setReturnMsgBody(returnMsgBody);
if (YesOrNoEnum.YES.value().equals(successFlag)) {
interfaceLogService.insert(interfaceLogEntity);
} else {
InterfaceLogErrorEntity interfaceLogErrorEntity = ConvertUtils.sourceToTarget(interfaceLogEntity, InterfaceLogErrorEntity.class);
interfaceLogErrorService.insert(interfaceLogErrorEntity);
}
}
}

27
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHotlineDao.xml

@ -0,0 +1,27 @@
<?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.elink.esua.epdc.modules.events.dao.ItemHotlineDao">
<resultMap type="com.elink.esua.epdc.modules.events.entity.ItemHotlineEntity" id="itemHotlineMap">
<result property="id" column="ID"/>
<result property="code" column="code"/>
<result property="sjly" column="sjly"/>
<result property="orgid" column="orgId"/>
<result property="orgname" column="orgName"/>
<result property="sjzt" column="sjzt"/>
<result property="isbm" column="isBm"/>
<result property="ispublic" column="isPublic"/>
<result property="sqbt" column="sqbt"/>
<result property="sjnr" column="sjnr"/>
<result property="sqid" column="sqid"/>
<result property="sszt" column="sszt"/>
<result property="djr" column="djr"/>
<result property="djrxm" column="djrxm"/>
<result property="dlwzmc" column="dlwzmc"/>
<result property="latitude" column="LATITUDE"/>
<result property="longitude" column="LONGITUDE"/>
</resultMap>
</mapper>

14
esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java

@ -94,4 +94,18 @@ public interface ItemFeignClient {
@PostMapping("events/xxxd/question/xxxdFeedBackQuestionTask")
Result xxxdFeedBackQuestionTask(@RequestBody XxxdFeedBackQuestionTaskFormDTO formDTO);
/**
*
* @description: 青岛12345热线数据接收接口
* @author qushutong
* @date 2024/6/26 16:24
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Version1.0
**/
@PostMapping("events/itemhotline/getHotLine")
Result getHotLine();
}

5
esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java

@ -84,4 +84,9 @@ public class ItemFeignClientFallback implements ItemFeignClient {
public Result xxxdFeedBackQuestionTask(XxxdFeedBackQuestionTaskFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "xxxdFeedBackQuestionTask", formDTO);
}
@Override
public Result getHotLine() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "xxxdFeedBackQuestionTask");
}
}

10
esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/events/ItemHotLineTask.java

@ -0,0 +1,10 @@
package com.elink.esua.epdc.task.events;
/**
* 定时任务青岛12345热线数据接收接口
*/
public interface ItemHotLineTask {
void run(String param);
}

30
esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/events/ItemHotLineTaskImpl.java

@ -0,0 +1,30 @@
package com.elink.esua.epdc.task.events;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.feign.ItemFeignClient;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* 定时任务(半小时一执行)青岛12345热线数据接收接口
*/
@Component("ItemHotLineTask")
@Slf4j
public class ItemHotLineTaskImpl implements ItemHotLineTask {
@Autowired
private ItemFeignClient itemFeignClient;
@Override
public void run(String param) {
log.info("ItemHotLineTaskImpl定时任务开始执行,参数为:{}", param);
Result result = itemFeignClient.getHotLine();
if (result.success()) {
log.info("{}定时任务执行成功,{}", getClass().getSimpleName(), param);
} else {
log.error("{}定时任务执行失败:{},param:{}", getClass().getSimpleName(), result.getMsg(), param);
}
}
}

0
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/dao/CentralHouseholdDao.java → esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/dao/CentralHouseHoldDao.java

38
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/CentralHouseholdEntity.java → esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/CentralHouseHoldEntity.java

@ -33,51 +33,51 @@ import lombok.EqualsAndHashCode;
@TableName("central_house_hold")
public class CentralHouseHoldEntity extends BaseEpdcEntity {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
/**
* 用户ID
*/
private String userId;
private String userId;
/**
* 申请人姓名
*/
private String realName;
/**
* 申请人姓名
*/
private String realName;
/**
* 联系电话
*/
private String mobile;
/**
* 联系电话
*/
private String mobile;
/**
* 0待审核 1已审核
*/
private Integer pass;
private Integer pass;
/**
* 人员类别
*/
private String personnelCategory;
private String personnelCategory;
/**
* 居住地址
*/
private String homeAddr;
private String homeAddr;
/**
* 意向服务类型
*/
private String serviceType;
private String serviceType;
/**
* 服务范围
*/
private String serviceScope;
private String serviceScope;
/**
* 头像
*/
private String faceImg;
/**
* 头像
*/
private String faceImg;
}

0
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/CentralHouseholdService.java → esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/CentralHouseHoldService.java

0
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/CentralHouseholdServiceImpl.java → esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/CentralHouseHoldServiceImpl.java

Loading…
Cancel
Save