From 74d499b7d3b21a7857912cc7dbc8cf21bf651b60 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Thu, 1 Aug 2024 11:05:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=97=E5=B8=82=E9=87=8C=E8=AF=84?= =?UTF-8?q?=E4=BB=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/constant/PushToCityGridConstant.java | 7 ++ .../epdc/dto/item/form/HotLineFromDTO.java | 40 ++++----- .../epdc/dto/item/result/QsjbEvaluation.java | 90 +++++++++++++++++++ .../item/controller/ItemController.java | 17 ++++ .../esua/epdc/modules/item/dao/ItemDao.java | 2 + .../modules/item/service/ItemService.java | 2 + .../item/service/impl/ItemServiceImpl.java | 20 +++++ .../impl/PushToCityGridServiceImpl.java | 11 ++- .../main/resources/mapper/item/ItemDao.xml | 1 + .../src/main/resources/application.yml | 6 +- 10 files changed, 165 insertions(+), 31 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/QsjbEvaluation.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java index 2abcbc564..caf961fa9 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java @@ -173,5 +173,12 @@ public interface PushToCityGridConstant { + /** + * 2.32热线数据评价接口（备用） + */ + String byEVALUATION = BASTURL + "/evaluation"; + + + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotLineFromDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotLineFromDTO.java index 558b82748..263cf5ab7 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotLineFromDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/HotLineFromDTO.java @@ -1,11 +1,14 @@ package com.elink.esua.epdc.dto.item.form; +import lombok.Data; + /** * @ClassName HotLineFromDTO * @Description TODO * @Author Mia * @Date 11:10 2024/6/26 * @Version 1.0 **/ +@Data public class HotLineFromDTO { @@ -13,32 +16,19 @@ public class HotLineFromDTO { * count : 100 * userName : qds * pwd : qds + * 测试环境 */ +// private Integer count; +// private String userName; +// private String pwd; + /** + * flag : qds + * ssqs : qds + * count : 100 + * 正式环境 + */ + private String flag; + private String ssqs; 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; - } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/QsjbEvaluation.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/QsjbEvaluation.java new file mode 100644 index 000000000..6ab92aba1 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/QsjbEvaluation.java @@ -0,0 +1,90 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @ClassName QsjbEvaluation * @Description TODO + * @Author Mia + * @Date 10:25 2024/8/1 + * @Version 1.0 + * 青诉即办评价接口 + **/ +@Data +public class QsjbEvaluation implements Serializable { + + + /** + * clrId : 评价人唯一标识 + * pjjg : 01 + * pjsj : 2022-09-01 18:23:00 + * clr : 评价人姓名 + * pjnr : 评价内容 + * jjqk : 01 + * sqid : e2d096bd7e62462ebc28bb89bde737c0 + */ + private String clrId; + private String pjjg; + private String pjsj; + private String clr; + private String pjnr; + private String jjqk; + private String sqid; + + public void setClrId(String clrId) { + this.clrId = clrId; + } + + public void setPjjg(String pjjg) { + this.pjjg = pjjg; + } + + public void setPjsj(String pjsj) { + this.pjsj = pjsj; + } + + public void setClr(String clr) { + this.clr = clr; + } + + public void setPjnr(String pjnr) { + this.pjnr = pjnr; + } + + public void setJjqk(String jjqk) { + this.jjqk = jjqk; + } + + public void setSqid(String sqid) { + this.sqid = sqid; + } + + public String getClrId() { + return clrId; + } + + public String getPjjg() { + return pjjg; + } + + public String getPjsj() { + return pjsj; + } + + public String getClr() { + return clr; + } + + public String getPjnr() { + return pjnr; + } + + public String getJjqk() { + return jjqk; + } + + public String getSqid() { + return sqid; + } +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index a48025d74..e6d5e152a 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -641,6 +641,23 @@ public class ItemController { return itemService.supervise(formDTO); } + + /** + * 市级青诉即办平台对区（市）诉求进行在线督办 + * + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2022/10/21 16:13 + */ + @PostMapping("gov/case/evaluation") + public Result caseEvaluation(@RequestBody QsjbEvaluation formDTO) { +// ValidatorUtils.validateEntity(formDTO); + return itemService.updataCaseEvaluation(formDTO); + } + + + /** * 市级平台驳回区（市）上报的吹哨诉求 * diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index 8333565cb..66ef08fa1 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -578,4 +578,6 @@ public interface ItemDao extends BaseDao { List selectItemList(Map params); List getNoSqidList(); + + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 71926d895..5fc3be079 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -859,4 +859,6 @@ public interface ItemService extends BaseService { Boolean changeHotLineToFZItem(ItemHotlineDTO dto); Boolean changeHotLineToZFItem(ItemHotlineDTO dto); + + Result updataCaseEvaluation(QsjbEvaluation formDTO); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index cf63bab23..f71ad2212 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -18,6 +18,7 @@ package com.elink.esua.epdc.modules.item.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -6653,6 +6654,25 @@ public class ItemServiceImpl extends BaseServiceImpl implem return null; } + @Override + public Result updataCaseEvaluation(QsjbEvaluation formDTO) { + ItemEntity itemBySqid = baseDao.getItemBySqid(formDTO.getSqid()); + + itemBySqid.setEvaluationState("0"); + if("01".equals(formDTO.getPjsj())){ + itemBySqid.setEvaluationState("2"); + }else if("03".equals(formDTO.getPjsj())){ + itemBySqid.setEvaluationState("0"); + }else{ + itemBySqid.setEvaluationState("1"); + } + itemBySqid.setEvaluationTime(DateUtil.parse(formDTO.getPjsj())); + itemBySqid.setEvaluationContent(formDTO.getPjnr()); + itemBySqid.setSolutionInfo(formDTO.getJjqk()); + baseDao.updateById(itemBySqid); + return new Result(); + } + @Override public Result pushToCityAgain() { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java index b2c1d047d..e811db1e3 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java @@ -1604,8 +1604,12 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { public List getCenterHotLine() { HotLineFromDTO hotLineFromDTO = new HotLineFromDTO(); hotLineFromDTO.setCount(2); - hotLineFromDTO.setPwd("sbq2024"); - hotLineFromDTO.setUserName("sbq"); + // 正式环境 + hotLineFromDTO.setFlag("sbq"); + hotLineFromDTO.setSsqs("sbq2024"); + // 测试环境 +// hotLineFromDTO.setPwd("sbq2024"); +// hotLineFromDTO.setUserName("sbq"); //拉取12345 数据 String resultString = cityGridApi.sendItemToCity(hotLineFromDTO, PushToCityGridConstant.SENDLIST, "青岛12345热线数据接收"); @@ -1640,7 +1644,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { @Override - public void sendAppealState(UpdateAppealSendDTO dto) { + public String sendAppealState(UpdateAppealSendDTO dto) { //发送到市平台 String resultString = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.UPDATEAPPEALSEND, "设置诉求信息已接收接口"); JSONObject res = JSONObject.parseObject(resultString); @@ -1649,6 +1653,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { successFlag = YesOrNoEnum.YES.value(); } this.saveInterfaceLog("12345","告知市里",PushToCityGridConstant.UPDATEAPPEALSEND,successFlag,JSONObject.toJSONString(dto),resultString); + return resultString; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index b080d3205..f3cd88e3b 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -4320,4 +4320,5 @@ + diff --git a/renren-cloud-generator/src/main/resources/application.yml b/renren-cloud-generator/src/main/resources/application.yml index 7d9d8ffbd..22be7ccd2 100644 --- a/renren-cloud-generator/src/main/resources/application.yml +++ b/renren-cloud-generator/src/main/resources/application.yml @@ -9,9 +9,9 @@ spring: type: com.alibaba.druid.pool.DruidDataSource #MySQL配置 driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://192.168.1.144:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: epmet - password: EpmEt_UsEr@sAAs + url: jdbc:mysql://172.22.76.6:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + username: epmet_gov_project_user + password: EpmEt-db-UsEr #oracle配置 # driverClassName: oracle.jdbc.OracleDriver # url: jdbc:oracle:thin:@192.168.10.10:1521:helowin