Merge branch 'dev' of liubing/wlyy2.0 into dev

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/job/sim/UpdateSimsJob.java

@@ -96,14 +96,18 @@ public class UpdateSimsJob implements Job {
                                    if ("Y".equals(lastFlag)){
                                        forFlag = -1;
                                    }
                                }else {
                                    forFlag=-1;
                                }
                            }
                        } catch (Exception e) {
                            e.printStackTrace();
                        }
                    }
                    wlyySimDao.deleteAll();
                    wlyySimDao.save(simDos);
                    if (simDos.size()>0){
                        wlyySimDao.deleteAll();
                        wlyySimDao.save(simDos);
                    }
                }
            }
            logger.info(" UPDATE_SIMS_JOB end");

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

@@ -41,24 +41,16 @@ public class WlyysimFlowVoiceService{
    @Autowired
    private HttpClientUtil httpClientUtil;
    public String initData() throws InterruptedException {
        Date date = new Date();
        Date month = new Date();
        for (int i=1;i<=7;i++){
            date = DateUtil.getPreDays(date,-1);
            String dateTime = DateUtil.dateToStr(date,DateUtil.YYYYMMDD);
            System.out.println("day"+dateTime);
            initDay(dateTime);
            TimeUnit.SECONDS.sleep(10);
            Calendar cal = Calendar.getInstance();
            cal.setTime(month);
            cal.set(Calendar.DAY_OF_MONTH,1);
            cal.add(Calendar.MONTH,-1*(i-1));
            dateTime = DateUtil.dateToStr(cal.getTime(),DateUtil.YYYYMM);
            System.out.println("mon"+dateTime);
            initMonth(dateTime);
            TimeUnit.SECONDS.sleep(10);
        }
    public String initData(String time) throws InterruptedException {
        Date date = DateUtil.strToDate(time);
        String dateTime =DateUtil.dateToStr(date,DateUtil.YYYYMMDD);
        System.out.println("day"+dateTime);
        initDay(dateTime);
        TimeUnit.SECONDS.sleep(10);
        dateTime = DateUtil.dateToStr(date,DateUtil.YYYYMM);
        System.out.println("mon"+dateTime);
        initMonth(dateTime);
        System.out.println("success");
        return "success";
    }
@@ -123,8 +115,14 @@ public class WlyysimFlowVoiceService{
                        }
                    }
                    wlyySimVoiceDao.save(wlyySimVoicesDos);
                    wlyySimFlowDao.save(wlyySimFlowDos);
                    if (wlyySimVoicesDos.size()>0){
                        wlyySimVoiceDao.deleteByDayAndType(dateTime,2);
                        wlyySimVoiceDao.save(wlyySimVoicesDos);
                    }
                    if (wlyySimFlowDos.size()>0){
                        wlyySimFlowDao.deleteByDayAndType(dateTime,2);
                        wlyySimFlowDao.save(wlyySimFlowDos);
                    }
                }catch (Exception e){
                    e.printStackTrace();
@@ -195,9 +193,14 @@ public class WlyysimFlowVoiceService{
                            wlyySimFlowDos.add(wlyySimFlowDo);
                        }
                    }
                    wlyySimVoiceDao.save(wlyySimVoicesDos);
                    wlyySimFlowDao.save(wlyySimFlowDos);
                    if (wlyySimVoicesDos.size()>0){
                        wlyySimVoiceDao.deleteByDayAndType(dateTime,1);
                        wlyySimVoiceDao.save(wlyySimVoicesDos);
                    }
                   if (wlyySimFlowDos.size()>0){
                       wlyySimFlowDao.deleteByDayAndType(dateTime,1);
                       wlyySimFlowDao.save(wlyySimFlowDos);
                   }
                }catch (Exception e){
                    e.printStackTrace();
                }

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/service/device/NetworkCardService.java

@@ -45,7 +45,7 @@ public class NetworkCardService {
        if (responseBody.getInteger("status")==0){
            JSONObject tmp = responseBody.getJSONArray("result").getJSONObject(0);
            assToken = tmp.getString("token");
            Long expireTime =Long.parseLong(tmp.getString("ttl"));//token有效期
            Long expireTime =Long.parseLong(tmp.getString("ttl"))-600;//token有效期
            redisTemplate.opsForValue().set(NetworkCardConfig.redisKey,assToken,expireTime, TimeUnit.SECONDS);
        }else {
            throw new Exception(response);

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

@@ -325,9 +325,10 @@ public class JobController extends BaseController {
    @RequestMapping(value = "/wlyySimFlowVoice", method = RequestMethod.POST)
    @ApiOperation("物联网卡流量语音初始化查询")
    public String wlyySimFlowVoice() {
    public String wlyySimFlowVoice(@ApiParam(name = "time",required = false)
                                  @RequestParam(value = "time")String time) {
        try {
            return write(200, wlyysimFlowVoiceService.initData());
            return write(200, wlyysimFlowVoiceService.initData(time));
        } catch (Exception e) {
            error(e);
            return error(-1, e.getMessage());
@@ -335,7 +336,7 @@ public class JobController extends BaseController {
    }
    @RequestMapping(value = "/yxDeviceSetPhone", method = RequestMethod.POST)
    @ApiOperation("物联网卡流量语音初始化查询")
    @ApiOperation("拐杖手动设置联系人")
    public String yxDeviceSetPhone(
            @ApiParam(name = "device_sn",required = false)
            @RequestParam(value = "device_sn")String device_sn,