接受市里评价接口

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";
+
+
+
 
 }

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;
-    }
 }

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;
+    }
+}

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);
+    }
+
+
+
     /**
      * 市级平台驳回区（市）上报的吹哨诉求
      *

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<ItemEntity> {
     List<ItemToEpmetDTO> selectItemList(Map<String, Object> params);
 
     List<ItemEntity> getNoSqidList();
+
+
 }

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<ItemEntity> {
     Boolean changeHotLineToFZItem(ItemHotlineDTO dto);
 
     Boolean changeHotLineToZFItem(ItemHotlineDTO dto);
+
+    Result updataCaseEvaluation(QsjbEvaluation formDTO);
 }

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<ItemDao, ItemEntity> 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() {
 

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<CenterData> 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;
     }
 
 

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

@@ -4320,4 +4320,5 @@
 
 
     </select>
+
 </mapper>

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
+    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
+    username: epmet_gov_project_user
-    password: EpmEt_UsEr@sAAs
+    password: EpmEt-db-UsEr
     #oracle配置
 #    driverClassName: oracle.jdbc.OracleDriver
 #    url: jdbc:oracle:thin:@192.168.10.10:1521:helowin