Merge branch '20210204' into 20210223

smart-city-platform/src/main/java/com/bz/smart_city/controller/ExternalApiController.java

@@ -34,10 +34,7 @@ public class ExternalApiController {
 
     @Autowired
     private ValveService valveService;
-    @Autowired
-    private DeviceMapper deviceMapper;
-    @Autowired
-    private MeterReadRecordMapper meterReadRecordMapper;
+
 
     DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
@@ -48,7 +45,7 @@ public class ExternalApiController {
             @ApiParam(value = "水表表号", required = true) @RequestParam(required = true) String meterNo
     ) {
         ;
-        return new AjaxMessage(ResultStatus.OK,valveService.valveState(meterNo));
+        return new AjaxMessage<>(ResultStatus.OK,valveService.valveState(meterNo));
     }
 
     @ResponseBody
@@ -61,86 +58,4 @@ public class ExternalApiController {
         return new AjaxMessage(ResultStatus.OK);
     }
 
-    @ResponseBody
-    @PostMapping("updateUserCode")
-    @ApiOperation(value = "回写水表对应的用户编号")
-    public RequestDto updateUserCode(
-            @ApiParam(value = "结果", required = true) @RequestBody(required = true) RequestDto result
-    ) {
-        RequestDto requestDto = new RequestDto();
-        requestDto.setHead(result.getHead());
-        requestDto.getHead().setTime(LocalDateTime.now().format(df));
-        try {
-            log.info("updateUserCode result = " + result);
-            Map<String,Object> map = (LinkedHashMap<String, Object>) result.getBody();
-            List<LinkedHashMap<String, Object>> list = (List<LinkedHashMap<String, Object>>) map.get("request");
-            if (list != null && list.size() > 0) {
-                for (Map<String, Object> m : list) {
-                    String meterFileNo =(String) m.get("ciid");
-                    String meterNo = (String) m.get("miid");
-                    List<Long> deviceList = deviceMapper.findDeviceIdByWaterMeterNo(null,meterNo);
-                    if (deviceList == null || deviceList.size() == 0) {
-                        throw new ServiceException(-900,"该水表表号不存在");
-                    }
-                    if (deviceList.size() > 1) {
-                        throw new ServiceException(-900,"该水表表号出现重复");
-                    }
-                    Device device = new Device();
-                    device.setId(deviceList.get(0));
-                    device.setWaterMeterFileNo(meterFileNo);
-                    device.setDateUpdate(LocalDateTime.now());
-                    deviceMapper.updateByPrimaryKeySelective(device);
-                }
-            }
-            RequestBodyDto requestBodyDto = new RequestBodyDto<>();
-            requestBodyDto.setState("success");
-            requestDto.setBody(requestBodyDto);
-            return requestDto;
-        }catch (Exception e){
-            RequestBodyDto requestBodyDto = new RequestBodyDto<>();
-            requestBodyDto.setState("fail");
-            requestBodyDto.setErrMsg(e.getMessage());
-
-            requestDto.setBody(requestBodyDto);
-            return requestDto;
-        }
-
-    }
-
-    @ResponseBody
-    @PostMapping("getMeterReadList")
-    @ApiOperation(value = "获取抄表信息")
-    public RequestDto getMeterReadList(
-            @ApiParam(value = "结果", required = true) @RequestBody(required = true) RequestDto result
-    ) {
-        Integer customerId = 46;
-        RequestDto requestDto = new RequestDto();
-        requestDto.setHead(result.getHead());
-        requestDto.getHead().setTime(LocalDateTime.now().format(df));
-        try {
-            log.info("getMeterReadList result = " + result);
-            Map<String,Object> map = (LinkedHashMap<String, Object>) result.getBody();
-            Object miid = map.get("miid");
-            String meterNo = null;
-            if (miid != null) {
-                meterNo = (String) miid;
-            }
-
-
-            Integer date = Integer.valueOf(LocalDate.now().plusDays(-1).format(DateTimeFormatter.ofPattern("yyyyMMdd")));;
-            List<RequestMaterInfo> list = meterReadRecordMapper.getReadingMeter(customerId,date,meterNo);
-            RequestBodyDto requestBodyDto = new RequestBodyDto<>();
-            requestBodyDto.setState("success");
-            requestBodyDto.setResult(list);
-            requestDto.setBody(requestBodyDto);
-            return requestDto;
-        }catch (Exception e){
-            RequestBodyDto requestBodyDto = new RequestBodyDto<>();
-            requestBodyDto.setState("fail");
-            requestBodyDto.setErrMsg(e.getMessage());
-
-            requestDto.setBody(requestBodyDto);
-            return requestDto;
-        }
-    }
 }

smart-city-platform/src/main/java/com/bz/smart_city/kafka/consumer/ValveStatusReceiver.java

@@ -32,7 +32,7 @@ public class ValveStatusReceiver {
         operatingValveRecord.setStatus(1);
         List<OperatingValveRecord> operatingValveRecords = operatingValveRecordMapper.selectList(operatingValveRecord);
         OperatingValveRecord operatingValveRecordMessage=null;
-        log.info("上报水表信息={}",message);
+        log.debug("上报水表信息={}",message);
         ValveControlDataDto valveControlDataDto = JSONUtils.json2pojo(message, ValveControlDataDto.class);
         if(operatingValveRecords.size()>0){
 
@@ -60,7 +60,7 @@ public class ValveStatusReceiver {
         }
         Device device=operatingValveRecordMapper.getDevice(operatingValveRecordMessage);
         if(device!=null){
-            log.info("同步水表阀门状态 电子号={}",device.getMetercode());
+            log.debug("同步水表阀门状态 电子号={}",device.getMetercode());
             Map<String,Object>valveMessage=new HashMap<>();
             valveMessage.put("meterNo",device.getMetercode());
             valveMessage.put("meterStatus",Integer.parseInt(valveControlDataDto.getValve()));

smart-city-platform/src/main/java/com/bz/smart_city/service/DeviceService.java

@@ -143,5 +143,5 @@ public interface DeviceService{
 
     void batchSetValve(LoginUser loginUser, Integer valveStatus, InputDeviceDto inputDeviceDto);
 
-    void setValveV2(Long aLong, String valve);
+    Boolean setValveV2(Long aLong, String valve);
 }

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/BPMNServiceImpl.java

@@ -99,7 +99,7 @@ public class BPMNServiceImpl implements BPMNService {
 	 */
 	@Override
 	public ProcessDef findProccessDefByAlarm(DeviceError alarm) {
-		logger.info("begin findProccessDefByAlarm ,alarm = " + JSON.toJSONString(alarm));
+		logger.debug("begin findProccessDefByAlarm ,alarm = " + JSON.toJSONString(alarm));
 		Integer siteId = alarm.getSiteId(); // 报警所属站点
 		Integer sysId = alarm.getSysId(); // 报警所属场景
 

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/DeviceServiceImpl.java

@@ -1271,7 +1271,8 @@ public  class DeviceServiceImpl implements DeviceService {
 
     }
 
-    public void setValveV2(Long deviceId, String valve) {
+    public Boolean setValveV2(Long deviceId, String valve) {
+        log.info("setValveV2 deviceId={} valve={}",deviceId,valve);
         Device device = deviceMapper.findByDeviceId(deviceId);
         DeviceTypeDto deviceTypeDto = deviceTypeMapper.getById(device.getDeviceType());
 
@@ -1279,56 +1280,89 @@ public  class DeviceServiceImpl implements DeviceService {
         valveCommandRequest.setValveStatus(valve);
 
         //1、执行开关阀门
-        executeValveCommand(device,deviceTypeDto,valveCommandRequest);
+        Boolean executeResult = executeValveCommand(device,deviceTypeDto,valveCommandRequest);
+
+        //2、更换阀门按钮状态
+        if(executeResult) replaceValveButtonStatus(deviceId,valve);
+
+        return executeResult;
     }
 
-    private void executeValveCommand(Device device,DeviceTypeDto deviceTypeDto,ValveCommandRequestDTO valveCommandRequest){
+    private void replaceValveButtonStatus(Long deviceId, String valve){
+        WaterMeterErrorDays waterMeterErrorDays = waterMeterErrorDaysMapper.findByDeviceId(deviceId);
+        Integer valveButtonStatus = 0;
+        if("1".equals(valve))valveButtonStatus = 1;
+
+        if (waterMeterErrorDays != null) {
+            waterMeterErrorDays.setValveButtonStatus(valveButtonStatus);
+            waterMeterErrorDays.setDateUpdate(LocalDateTime.now());
+            waterMeterErrorDaysMapper.updateByPrimaryKeySelective(waterMeterErrorDays);
+        }else {
+            waterMeterErrorDays = new WaterMeterErrorDays();
+            waterMeterErrorDays.setDeviceId(deviceId);
+            waterMeterErrorDays.setValveButtonStatus(valveButtonStatus);
+            waterMeterErrorDaysMapper.insert(waterMeterErrorDays);
+        }
+    }
+
+    private Boolean executeValveCommand(Device device,DeviceTypeDto deviceTypeDto,ValveCommandRequestDTO valveCommandRequest){
+
+        String commandId = null;
+        Integer sendValveStatus = Integer.valueOf(valveCommandRequest.getValveStatus());
+        String commandStatus = null;
+        String remark = "";
+        Boolean executeResult = false;
+        JSONObject commandResult = null;
+
         if(StringUtils.equals("lora188",deviceTypeDto.getEnModel())){
             valveCommandRequest.setMeterCode(device.getWaterMeterNo());
             easylinkinUtils.sendDownlink(device.getDeviceNo(),valveCommandRequest);
+            executeResult = true;
         }else if(StringUtils.equals("hxgd",deviceTypeDto.getEnModel()))
         {
             valveCommandRequest.setMeterCode(String.valueOf(device.getId()));
             gdAgentUtils.setMeterValve(valveCommandRequest);
+            executeResult = true;
         }
         else if(StringUtils.equals("hengxin-nb",deviceTypeDto.getEnModel()))
         {
             valveCommandRequest.setMeterCode(device.getWaterMeterNo());
-            udipEtlDataCommandService.defaultCommandSend(device.getUdipId(),valveCommandRequest);
+            commandResult = udipEtlDataCommandService.defaultCommandSend(device.getUdipId(),valveCommandRequest);
         }
         else if(StringUtils.equals("ningbo-nb",deviceTypeDto.getEnModel()))
         {
             valveCommandRequest.setMeterCode(device.getWaterMeterNo());
-            JSONObject commandResult = udipEtlDataCommandService.defaultCommandSend(device.getUdipId(),valveCommandRequest);
-
-            //2、插入开关阀门记录
-            DeviceValveRecord deviceValveRecord = new DeviceValveRecord();
-            deviceValveRecord.setDeviceId(device.getId());
-            deviceValveRecord.setSendValveStatus(Integer.valueOf(valveCommandRequest.getValveStatus()));
-            deviceValveRecord.setSendStatus(1);
-            deviceValveRecord.setCommandId(commandResult.getString("commandId"));
-            deviceValveRecord.setRemark("");
-            deviceValveRecordService.insertSelective(deviceValveRecord);
+            commandResult = udipEtlDataCommandService.defaultCommandSend(device.getUdipId(),valveCommandRequest);
         }else if(StringUtils.equals("NB-TJ2.0",deviceTypeDto.getEnModel()))
         {
             if (device.getUdipId() != null && !"".equals(device.getUdipId())) {
                 valveCommandRequest.setMeterCode(device.getDeviceNo());
-                JSONObject commandResult = udipEtlDataCommandService.commandSend(device.getUdipId(),valveCommandRequest);
-
-                //2、插入开关阀门记录
-                DeviceValveRecord deviceValveRecord = new DeviceValveRecord();
-                deviceValveRecord.setDeviceId(device.getId());
-                deviceValveRecord.setSendValveStatus(Integer.valueOf(valveCommandRequest.getValveStatus()));
-                deviceValveRecord.setSendStatus(1);
-                deviceValveRecord.setCommandId(commandResult.getString("commandId"));
-                deviceValveRecord.setCommandStatus(commandResult.getString("status"));
-                deviceValveRecord.setRemark("");
-                deviceValveRecordService.insertSelective(deviceValveRecord);
+                commandResult = udipEtlDataCommandService.commandSend(device.getUdipId(),valveCommandRequest);
             }
         }else {
             valveCommandRequest.setMeterCode(device.getWaterMeterNo());
-            udipEtlDataCommandService.defaultCommandSend(device.getUdipId(),valveCommandRequest);
+            commandResult = udipEtlDataCommandService.defaultCommandSend(device.getUdipId(),valveCommandRequest);
+        }
+
+        if (commandResult != null) {
+            commandId = commandResult.getString("commandId");
+            commandStatus = commandResult.getString("status");
+            //判断指令执成功
+            if (commandId != null && !"".equals(commandId)) executeResult = true;
         }
+
+
+        //1、插入开关阀门记录
+        DeviceValveRecord deviceValveRecord = new DeviceValveRecord();
+        deviceValveRecord.setDeviceId(device.getId());
+        deviceValveRecord.setSendValveStatus(sendValveStatus);
+        deviceValveRecord.setSendStatus(1);
+        deviceValveRecord.setCommandId(commandId);
+        deviceValveRecord.setCommandStatus(commandStatus);
+        deviceValveRecord.setRemark(remark);
+        deviceValveRecordService.insertSelective(deviceValveRecord);
+
+        return executeResult;
     }
 
     @Override

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/ValveServiceImpl.java

@@ -75,7 +75,10 @@ public class ValveServiceImpl implements ValveService {
         if (list.size() > 1) {
             throw new ServiceException(-900,"该水表表号出现重复");
         }
-        deviceService.setValveV2(list.get(0),result.getValve());
+        Boolean executeResult = deviceService.setValveV2(list.get(0),result.getValve());
+        if(!executeResult){
+            throw new ServiceException(-900,"执行指令失败");
+        }
         log.info("end  valveControl");
     }
 }

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/WechatNotifyServiceImpl.java

@@ -41,7 +41,7 @@ public class WechatNotifyServiceImpl implements WechatNotifyService {
         if (user != null && StringUtils.isNotBlank(user.getOpenid())) {
         	sendWorkOrderNotice(handleResult,user.getOpenid(), url, pagepath, first, keyword1,  keyword2, keyword3, keyword4, keyword5, remark);
         } else {
-            log.info("该用户未绑定微信openid");
+            log.debug("该用户未绑定微信openid");
         }
 	}
 
@@ -52,7 +52,7 @@ public class WechatNotifyServiceImpl implements WechatNotifyService {
 		if(member != null && StringUtils.isNotBlank(member.getOpenid())) {
 			sendWorkOrderNotice(handleResult,member.getOpenid(), url,  pagepath, first, keyword1, keyword2, keyword3, keyword4, keyword5,remark);
 		}else {
-            log.info("该人员未绑定微信openid");
+            log.debug("该人员未绑定微信openid");
         }
 	}
 	
@@ -70,7 +70,7 @@ public class WechatNotifyServiceImpl implements WechatNotifyService {
             }
 
         } else {
-            log.info("该用户未绑定微信openid");
+            log.debug("该用户未绑定微信openid");
         }
     }
 
@@ -83,7 +83,7 @@ public class WechatNotifyServiceImpl implements WechatNotifyService {
             String result = SendWechatPush.sendUniformNoticeTranspondOrder(accessToken, oaAppid, user.getOpenid(), url, mpAppid, pagepath, first, keyword1, keyword2, keyword3, keyword4, keyword5, remark);
             log.info("end transmitSendWechatMsg wechat msg result=" + result);
         } else {
-            log.info("该用户未绑定微信openid");
+            log.debug("该用户未绑定微信openid");
         }
     }
 
@@ -96,7 +96,7 @@ public class WechatNotifyServiceImpl implements WechatNotifyService {
             String result = SendWechatPush.sendAttedNotice(accessToken, user.getOpenid(), url, first, keyword1, keyword2, remark);
             log.info("end send wechat msg result=" + result);
         } else {
-            log.info("该用户未绑定微信openid");
+            log.debug("该用户未绑定微信openid");
         }
     }
 
@@ -111,7 +111,7 @@ public class WechatNotifyServiceImpl implements WechatNotifyService {
             String result = SendWechatPush.sendUniformNoticeRejectOrder(accessToken, oaAppid, user.getOpenid(), url, mpAppid, pagepath, first, keyword1, keyword2, keyword3, keyword4, remark);
             log.info("end send wechat msg result=" + result);
         } else {
-            log.info("该用户未绑定微信openid");
+            log.debug("该用户未绑定微信openid");
         }
     }
 
@@ -126,7 +126,7 @@ public class WechatNotifyServiceImpl implements WechatNotifyService {
             String result = SendWechatPush.sendMaintainNotice(accessToken, oaAppid, user.getOpenid(), url, mpAppid, pagepath, first, keyword1, keyword2, keyword3, remark);
             log.info("end send wechat msg result=" + result);
         } else {
-            log.info("该用户未绑定微信openid");
+            log.debug("该用户未绑定微信openid");
         }
     }
 }

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/WorkOrderServiceImpl.java

@@ -245,7 +245,7 @@ public class WorkOrderServiceImpl implements WorkOrderService {
      * @param sendContent 内容
      */
     protected void sendWechatMsg(String handleResult, String handleUsername, String userId, String type , Map<String, Object> sendContent) {
-        log.info("begin send wechat msg ! userid = " + userId + " message = " + JSON.toJSONString(sendContent)+" handleResult=" + handleResult+" type=" + type);
+        log.debug("begin send wechat msg ! userid = " + userId + " message = " + JSON.toJSONString(sendContent)+" handleResult=" + handleResult+" type=" + type);
         //发送微信公众号消息推送
         WorkOrder workOrder = workOrderMapper.findbyOrderNo((String) sendContent.get("order_no"));
 
@@ -549,7 +549,7 @@ public class WorkOrderServiceImpl implements WorkOrderService {
                 content.put("order_no", orderNo);
                 Set<String>  userIds = workOrderUserService.findUsersWithList(execution, Arrays.asList(users));
                 for (String user : userIds) {
-                    log.info("微信通知用户,user=" + user);
+                    log.debug("微信通知用户,user=" + user);
                     if(user.startsWith("member-")) {
                     	sendWechatMsg(handleResult,handleUsername,user.split("-")[1],"2",content);
                     }

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/AmountSynByDayServiceImpl.java

@@ -75,7 +75,7 @@ public class AmountSynByDayServiceImpl implements AmountSynByDayService, Initial
         boolean exists = jobAndTriggerService.isExists(entity);
         if(!exists){
             String cron = "0 * */1 * * ?";
-            log.info("水量每天同步:" + cron);
+            log.debug("水量每天同步:" + cron);
             entity.setCronExpression(cron);
             entity.setJobClassName(AmountSyncByDayJob.class.getName());
             jobAndTriggerService.save(entity);
@@ -114,12 +114,12 @@ public class AmountSynByDayServiceImpl implements AmountSynByDayService, Initial
         log.info("抄表计划生成开始：" + LocalDateTime.now() + ",计划条数" + totalNum);
         for (int i = 0; i < num; i++) {
             int a = amountWaterUsedAmountMapper.createdAmountByDay(siteId, customerId);
-            log.info("成功条数" + i + ":" + a);
+            log.debug("成功条数" + i + ":" + a);
         }
 
-        log.info("抄表计划生成完成：" + LocalDateTime.now());
+        log.debug("抄表计划生成完成：" + LocalDateTime.now());
 
-        log.info("每天水量同步开始：" + LocalDateTime.now());
+        log.debug("每天水量同步开始：" + LocalDateTime.now());
 
         //获取设备id
         List<BigInteger> idList = amountWaterUsedAmountMapper.getWaterMeterIdByDay(siteId, customerId);
@@ -268,7 +268,7 @@ public class AmountSynByDayServiceImpl implements AmountSynByDayService, Initial
                 }
             }
         }
-        log.info("每天水量同步结束：" + LocalDateTime.now());
+        log.debug("每天水量同步结束：" + LocalDateTime.now());
 
 
 
@@ -276,15 +276,15 @@ public class AmountSynByDayServiceImpl implements AmountSynByDayService, Initial
 
     //未开户用户抄表数据
     public void noOpenUpdateByDay(Integer siteId, Integer customerId){
-        log.info(String.format("未开户用户数据同步开始:siteId=%s,customerId=%s",siteId.toString(),customerId.toString()));
+        log.debug(String.format("未开户用户数据同步开始:siteId=%s,customerId=%s",siteId.toString(),customerId.toString()));
         //产生未开户的day基础计划
         Integer totalNum = amountWaterUsedAmountMapper.getNoOpenAmountCountByDay(siteId, customerId);
 
         Integer num = totalNum / 500 + (totalNum % 500 > 0 ? 1 : 0);
-        log.info("抄表计划生成开始：" + LocalDateTime.now() + ",计划条数" + totalNum);
+        log.debug("抄表计划生成开始：" + LocalDateTime.now() + ",计划条数" + totalNum);
         for (int i = 0; i < num; i++) {
             int a = amountWaterUsedAmountMapper.createdNoOpenAmountByDay(siteId, customerId);
-            log.info("成功条数" + i + ":" + a);
+            log.debug("成功条数" + i + ":" + a);
         }
         //获取设备id
         List<BigInteger> idList = amountWaterUsedAmountMapper.getNoOpenWaterMeterIdByDay(siteId, customerId);
@@ -318,7 +318,7 @@ public class AmountSynByDayServiceImpl implements AmountSynByDayService, Initial
                 }
             }
         }
-        log.info(String.format("未开户用户数据同步结束:siteId=%s,customerId=%s",siteId.toString(),customerId.toString()));
+        log.debug(String.format("未开户用户数据同步结束:siteId=%s,customerId=%s",siteId.toString(),customerId.toString()));
     }
 
 

smart-city-platform/src/main/java/com/bz/smart_city/service/udip/UdipEtlDataCommandService.java

@@ -43,7 +43,7 @@ public class UdipEtlDataCommandService {
         String url = unitUrl+"/center/command/send";
         try {
             String json = objectMapper.writeValueAsString(dataCommandRequest);
-            log.info("udipUnit json:"+ json);
+            log.info("commandSend json:"+ json);
             //String result = HttpRequest.doPost(url, JSON.toJSONString(json));
             String result = HttpClientUtils.doPostWithJson(url, json);
             log.info("msg result=" + result);
@@ -55,7 +55,7 @@ public class UdipEtlDataCommandService {
                 return data;
             }else {
                 log.info(jsonObject.getString("msg"));
-                throw new ServiceException(-900, jsonObject.getString("msg"));
+                return null;
             }
         } catch (Exception e) {
             log.info(e.getMessage());
@@ -78,7 +78,7 @@ public class UdipEtlDataCommandService {
         String url = unitUrl+"/center/command/send";
         try {
             String json = objectMapper.writeValueAsString(dataCommandRequest);
-            log.info("udipUnit json:"+ json);
+            log.info("defaultCommandSend json:"+ json);
             //String result = HttpRequest.doPost(url, JSON.toJSONString(json));
             String result = HttpClientUtils.doPostWithJson(url, json);
             log.info("msg result=" + result);
@@ -90,7 +90,7 @@ public class UdipEtlDataCommandService {
                 return data;
             }else {
                 log.info(jsonObject.getString("msg"));
-                throw new ServiceException(-900, jsonObject.getString("msg"));
+                return null;
             }
         } catch (Exception e) {
             log.info(e.getMessage());

smart-city-platform/src/main/resources/application-prd.properties

@@ -186,4 +186,7 @@ sync.customer.wuhan.id=26
 spring.data.mongodb.uri=mongodb://water:zcxk100@114.135.61.189:27071/meter-reading-database?authSource=meter-reading-database
 logging.level.org.springframework.data.mongodb.core=INFO
 account_userInfo_url=http://114.135.61.188:58084/api/pay/getAccountInfoByMetercode
-sync_customer_no_url=http://114.135.61.188:58084/api/customer/synCustomer
+sync_customer_no_url=http://114.135.61.188:58084/api/customer/synCustomer
+platform_appid=1001
+platform_appSecret=123456
+platform_url=http://114.135.61.187:38081/user-auth/user/getUniqId?appId={appId}&appSecret={appSecret}&code={code}

smart-city-platform/src/main/resources/application.properties

@@ -1,2 +1,2 @@
 #开发环境：dev  测试环境：sit  线上环境：prd  演示环境：uat
-spring.profiles.active=dev
+spring.profiles.active=prd