Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/service/hz/HzInterfaceService.java

@@ -56,10 +56,12 @@ public class HzInterfaceService {
        try {
            List<BaseDeviceElectricRecordDO> list = new ArrayList<>();
            if(StringUtils.isBlank(queryDate)){
                queryDate = DateUtil.getStringDateShort();
                //电表数据每天凌晨0点到点30分 开始更新前一天的数据
                queryDate = DateUtil.getNextDay(DateUtil.getStringDateShort(),-1);
            }
            list = baseDeviceElectricRecordDao.findByStatDate(queryDate);
            if(list.size()>0){
            String sql = "select count(*) from base_device_electric_record where stat_date='"+queryDate+"'";
            Integer count = jdbcTemplate.queryForObject(sql,Integer.class);
            if(count>0){
                logger.info("当天数据已同步，请勿重复操作："+queryDate);
                return;
            }

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/web/JobController.java

@@ -57,10 +57,10 @@ public class JobController extends BaseController {
    public String electricityTable(String queryDate) {
        try {
            hzInterfaceService.electricityTable(queryDate);
            return success("删除成功！");
            return success("更新成功！");
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "删除失败:" + e.getMessage());
            return error(-1, "更新失败:" + e.getMessage());
        }
    }