消息反馈

water_query_api/src/main/java/com/zcxk/controller/WaterApiController.java

@@ -182,5 +182,34 @@ public class WaterApiController {
         Double deviceVolume = warningRuleService.delWaringRule(id,userName);
         return new AjaxMessage<>(ResultStatus.OK, deviceVolume);
     }
+    /**
+     * 删除警告规则
+     *
+     * @param
+     *
+     * @return Response对象
+     */
+    @RequestMapping(value = "setWaringData", method = RequestMethod.POST)
+    @ApiOperation(value = "用水量")
+    public AjaxMessage< Double> setWaringData(
+
+    ) {
+        //warningMessageJob.warningMessage();
+        return new AjaxMessage<>(ResultStatus.OK);
+    }
+    @ResponseBody
+    @PostMapping("/feedback")
+    @ApiOperation(value = "反馈")
+    public AjaxMessage feedback(
+            @ApiParam(value = "id", required = true) @RequestParam(required = true) Integer id,
+            @ApiParam(value = "反馈状态 0：待反馈 1：已确认无异常 2：已反馈信息", required = true) @RequestParam(required = true) Integer feedbackStatus,
+            @ApiParam(value = "反馈内容", required = false) @RequestParam(required = false) String feedbackContent,
+            @ApiParam(value = "反馈内容", required = false) @RequestParam(required = false) String phoneNumber,
+            @ApiParam(value = "反馈内容", required = false) @RequestParam(required = false) String accountNumber,
+            @ApiParam(value = "反馈内容", required = false) @RequestParam(required = false) String userName
+    ){
+        warningRuleService.feedback(userName,id,feedbackStatus,feedbackContent,phoneNumber,accountNumber);
+        return new AjaxMessage<>(ResultStatus.OK);
+    }
 
 }

water_query_api/src/main/java/com/zcxk/entity/WarningLog.java

@@ -63,4 +63,7 @@ public class WarningLog {
 
     @ApiModelProperty(value="")
     private LocalDateTime dateUpdate;
+    private String userName;
+    private String phoneNumber;
+    private String accountNumber;
 }

water_query_api/src/main/java/com/zcxk/service/WarningRuleService.java

@@ -22,4 +22,5 @@ public interface WarningRuleService {
 
     Double delWaringRule(Integer id, String userName);
 
+    void feedback(String name, Integer id, Integer feedbackStatus, String content, String phoneNumber, String accountNumber);
 }

water_query_api/src/main/java/com/zcxk/service/impl/WarningRuleServiceImpl.java

@@ -1,12 +1,17 @@
 package com.zcxk.service.impl;
 
+import com.zcxk.dao.WarningLogMapper;
+import com.zcxk.dao.WarningMessageMapper;
 import com.zcxk.dao.WarningRuleMapper;
 import com.zcxk.entity.Device;
+import com.zcxk.entity.WarningLog;
+import com.zcxk.entity.WarningMessage;
 import com.zcxk.entity.WarningRule;
 import com.zcxk.service.WarningRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -21,6 +26,10 @@ import java.util.List;
 public class WarningRuleServiceImpl implements WarningRuleService {
     @Autowired
     private WarningRuleMapper warningRuleMapper;
+    @Autowired
+    private WarningLogMapper warningLogMapper;
+    @Autowired
+    private WarningMessageMapper warningMessageMapper;
 
 
     @Override
@@ -73,4 +82,22 @@ public class WarningRuleServiceImpl implements WarningRuleService {
         warningRuleMapper.updateByPrimaryKeySelective(warningRule);
         return null;
     }
+
+    @Override
+    public void feedback(String name, Integer id, Integer feedbackStatus, String feedbackContent, String phoneNumber
+            , String accountNumber) {
+
+        WarningMessage warningMessage = warningMessageMapper.findById(id);
+
+        WarningLog warningLog = new WarningLog();
+        warningLog.setId(warningMessage.getWarningLogId());
+        warningLog.setFeedbackStatus(feedbackStatus);
+        warningLog.setFeedbackContent(feedbackContent);
+        warningLog.setUpdateBy(name);
+        warningLog.setDateUpdate(LocalDateTime.now());
+        warningLog.setUserName(name);
+        warningLog.setAccountNumber(accountNumber);
+        warningLog.setPhoneNumber(phoneNumber);
+        warningLogMapper.updateByPrimaryKeySelective(warningLog);
+    }
 }

water_query_api/src/main/resources/application-dev.properties

@@ -41,6 +41,10 @@ spring.redis.jedis.pool.max-wait=-1s
 spring.redis.jedis.pool.max-idle=8
 ##½Ó³ØÖеÄ×îС¿ÕÏÐÁ¬½Ó
 spring.redis.jedis.pool.min-idle=0
+myapp=1001
+appsecret=123456
+getUniqIdUrl=http://192.168.0.113:8081/user-auth/user/getUniqId?appId={appId}&appSecret={appSecret}&code={code}
+
 
 
 

water_query_api/src/main/resources/application-prd.properties

@@ -0,0 +1,55 @@
+server.port=9002
+server.servlet.context-path=/api
+logging.file.path=./logs
+spring.thymeleaf.prefix=classpath:/templates/
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+#spring.datasource.url=jdbc:mysql://10.0.0.161:3306/smart_city_sit_6_10?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+#spring.datasource.url=jdbc:mysql://114.135.61.188:33306/smart_city_sit_6_10?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.url=jdbc:mysql://47.112.217.10:3306/smart_city?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+spring.datasource.username=root
+spring.datasource.password=100Zone@123
+spring.datasource.hikari.max-lifetime=30000
+# mybatis_config
+mybatis.mapper-locations=classpath*:mapper/*.xml
+mybatis.type-aliases-package=com.zcxk.entity
+mybatis.configuration.map-underscore-to-camel-case=true
+mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis.configuration.use-column-label=true
+
+spring.jackson.time-zone=GMT+8
+
+
+
+
+spring.servlet.multipart.max-file-size=100MB
+spring.servlet.multipart.max-request-size=100MB
+spring.servlet.multipart.location=e:/test/files
+
+#spring.redis.password=123456
+spring.redis.sentinel.master=mymaster
+spring.redis.sentinel.nodes=10.0.0.71:26379,10.0.0.72:26379,10.0.0.73:26379
+#连接超时时间
+spring.redis.timeout=6000ms
+##Redis数据库索引（默认为0）
+spring.redis.database=0
+## 连接池配置，springboot2.0中直接使用jedis或者lettuce配置连接池，默认为lettuce连接池
+##连接池最大连接数（使用负值表示没有限制）
+spring.redis.jedis.pool.max-active=8
+##连接池最大阻塞等待时间（使用负值表示没有限制）
+spring.redis.jedis.pool.max-wait=-1s
+##连接池中的最大空闲连接
+spring.redis.jedis.pool.max-idle=8
+##接池中的最小空闲连接
+spring.redis.jedis.pool.min-idle=0
+
+
+
+
+
+
+
+
+
+
+
+